From c66edabb7f51f6856e471e3aa5e6504f8bb6bcbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= <hansen.ke@estsh.com>
Date: Wed, 14 Nov 2018 17:08:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 2995c26..ff97444 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -420,6 +420,7 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsZones(WmsZones wmsZones) {
         StringBuffer result = new StringBuffer();
+
         //有效性
         HqlPack.getNumEqualPack(wmsZones.getIsValid(), "isValid", result);
         //仓库代码
@@ -428,6 +429,9 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result);
         //存储区代码
         HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result);
+        //删除标记
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+
         return result.toString();
     }
 
@@ -462,8 +466,10 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) {
         StringBuffer result = new StringBuffer();
-        //有效性
+
+        //有效性,删除标记
         HqlPack.getNumEqualPack(wmsShippingFlag.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         //供应商编号
         HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result);
         //供应商简称
@@ -588,6 +594,7 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock) {
         StringBuffer result = new StringBuffer();
+
         HqlPack.getStringLikerPack(wmsFGInStock.getOrderNo(), "orderNo", result);
         HqlPack.getStringLikerPack(wmsFGInStock.getWoNo(), "woNo", result);
         HqlPack.getStringLikerPack(wmsFGInStock.getPartNo(), "partNo", result);
@@ -605,7 +612,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
         HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);
         HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(wmsFGInStock.getIsDeleted(), "isDeleted", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         return result.toString();
     }
 
@@ -623,7 +630,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result);
         HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result);
         HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(wmsTaskInfo.getIsDeleted(), "isDeleted", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         return result.toString();
     }
 }