From 6907ab6dc0e7c559d747fd769133ebd049c2e4cd Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Sat, 24 Oct 2020 14:02:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java | 2 ++
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java   | 7 +++++--
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java   | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
index ca619c2..5a6f7f2 100755
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
@@ -26,6 +26,8 @@ public class WmsJobParamModel implements Serializable {
     private Integer pageSize;//数据条数
     private Integer isCheckSn;//是否检查条码存在
     private Integer erpSyncFlag;//查询SHIPPING表的条件
+    private String filterZoneNos;//过滤存储区
+    private String zoneNos;//存储区
 
 
     public int getMinuteDiffVal() {
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java
index 1e157b4..1cad321 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java
@@ -75,7 +75,7 @@ public class WmsPickingWindowTime extends BaseBean {
     public WmsPickingWindowTime() {
     }
 
-    public WmsPickingWindowTime(Long id, String shiftNo, String startTime, String endTime, String latestEndTime, String shiftStartTime, String shiftEndTime) {
+    public WmsPickingWindowTime(Long id, String shiftNo, String startTime, String endTime, String latestEndTime, String shiftStartTime, String shiftEndTime, String createDatetime, String modifyDatetime, Integer isDeleted, Integer isValid) {
         this.id = id;
         this.shiftNo = shiftNo;
         this.startTime = startTime;
@@ -83,7 +83,10 @@ public class WmsPickingWindowTime extends BaseBean {
         this.latestEndTime = latestEndTime;
         this.shiftStartTime = shiftStartTime;
         this.shiftEndTime = shiftEndTime;
-
+        this.createDatetime = createDatetime;
+        this.modifyDatetime = modifyDatetime;
+        this.isDeleted = isDeleted;
+        this.isValid = isValid;
     }
 
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java
index ed602bf..0783140 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java
@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description 拉动规则实体
@@ -48,4 +49,8 @@ public class WmsPullRule extends BaseBean {
     @ApiParam(value = "尾数计算方式", example = "0")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE")
     private Integer tailQtyMode;
+
+    @Transient
+    @ApiParam(value = "通过存储区物料获取物流路线")
+    private boolean routingbyZonePartDisAble;
 }