From 611fb5b601eac26c69aabf9b2f8a422064e2a4a6 Mon Sep 17 00:00:00 2001
From: jimmy <1622218722@qq.com>
Date: Thu, 15 Nov 2018 09:46:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=89=E6=95=88=E6=80=A7?=
 =?UTF-8?q?=E7=AD=89=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  | 19 ++++++++++++++++---
 1 file changed, 16 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 ca8a649..909efab 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
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
@@ -29,7 +30,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result);
         HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result);
         HqlPack.getNumEqualPack(wmsPOMasterDetails.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(wmsPOMasterDetails.getIsDeleted(), "isDeleted", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrganizeCode(), "organizeCode", result);
 
         return result.toString();
@@ -85,7 +86,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result);
         HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(wmsPOMaster.getIsDeleted(), "isDeleted", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        HqlPack.getStringEqualPack(wmsPOMaster.getOrganizeCode(), "organizeCode", result);
 
         return result.toString();
     }
@@ -178,6 +180,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(),"organizeCode",result);
 
         return result.toString();
     }
@@ -196,6 +200,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsLocatePart.getPartName(), "partName", result);
         HqlPack.getNumEqualPack(wmsLocatePart.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(),"organizeCode",result);
 
         return result.toString();
     }
@@ -216,6 +222,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
         HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
         HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(),"organizeCode",result);
 
         return result.toString();
     }
@@ -300,7 +308,9 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsTransType.getProgCode(), "progCode", result);
         HqlPack.getStringLikerPack(wmsTransType.getOrganizeCode(), "organizeCode", result);
         HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(wmsTransType.getIsDeleted(), "isDeleted", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        HqlPack.getStringEqualPack(wmsTransType.getOrganizeCode(),"organizeCode",result);
+
         return result.toString();
     }
 
@@ -317,6 +327,9 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result);
         HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result);
         HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true);
+        HqlPack.getNumEqualPack(wmsTrans.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+
         return result.toString();
     }