From a1ec8d7293b5069e0857a8e7a2535232d78eb572 Mon Sep 17 00:00:00 2001
From: qianhs <huasheng.qian@estsh.com>
Date: Wed, 15 Jan 2020 19:52:49 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83=E5=B7=AE?=
 =?UTF-8?q?=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A(C2020010?=
 =?UTF-8?q?70020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314=09?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java    | 9 +++++++++
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java  | 5 ++++-
 .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java   | 2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
index b12010a..1f2f1d4 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
@@ -207,4 +207,13 @@ public class WmsCSOrderDetails extends BaseBean {
         this.organizeCode = organizeCode;
         this.qty=qty;
     }
+
+    public WmsCSOrderDetails (String orderNo, String partNo,String partNameRdd, String locateNo, double qty, double factQty){
+    	this.orderNo=orderNo;
+        this.partNo=partNo;
+        this.partNameRdd=partNameRdd;
+        this.qty=qty;
+        this.factQty=factQty;
+        this.locateNo=locateNo;
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java
index dac3089..755a876 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -52,6 +53,7 @@ public class WmsCSRange extends BaseBean {
 
     @Column(name = "LOCATE_NO")
     @ApiParam("库位编号")
+    @AnnoOutputColumn(hidden = true)
     public String locateNo;
 
     @Column(name = "UNIT")
@@ -59,7 +61,8 @@ public class WmsCSRange extends BaseBean {
     public String unit;
 
     @Transient
-    @ApiParam("存储区编号")
+    @ApiParam("存储区编号组")
+    @AnnoOutputColumn(hidden = true)
     public String[] zoneNos;
 
     public WmsCSRange(){}
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 0572e84..deee914 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
@@ -1387,6 +1387,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result);
         DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 
         getStringBuilderPack(wmsCSOrderDetails, result);