From ba81af744bdd6d02531fe8c8aa1f89b80d5966e1 Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Thu, 22 Oct 2020 20:50:07 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java   |  3 ++-
 .../i3plus/pojo/wms/bean/WmsDocMovementDetails.java    | 18 ++++++++++++++++++
 .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java     |  1 +
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java   |  6 ++++++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index dc2fbac..58ebed3 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -9005,7 +9005,8 @@ public class WmsEnumUtil {
         FINISH(10, "已完成(绿色)"),
         OVER_TIME(20, "已超时（红色）"),
         UNRECEIVED(30, "未收货（蓝色）"),
-        VARIANT(40, "有差异（黄色）");
+        VARIANT(40, "有差异（黄色）"),
+        NORMAL(50, "正常（白色）");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index 4ea43ea..22badef 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -415,6 +415,14 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("箱数")
     private Double boxQty;
 
+    @Transient
+    @ApiParam("窗口领料开始时间")
+    private String windowPickStartTime;
+
+    @Transient
+    @ApiParam("窗口领料结束时间")
+    private String windowPickEndTime;
+
     public WmsDocMovementDetails () {
 
     }
@@ -542,4 +550,14 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.boxQty = boxQty;
         this.srcLocateNo = srcLocateNo;
     }
+
+    public WmsDocMovementDetails(String orderNo, Integer orderStatus, Double qty, Double pickQty, String modifyDatetime, String planTime) {
+        this.orderNo = orderNo;
+        this.orderStatus = orderStatus;
+        this.qty = qty;
+        this.pickQty = pickQty;
+        this.modifyDatetime = modifyDatetime;
+        this.planTime = planTime;
+    }
+
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
index d6123bd..3a7411e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
@@ -354,6 +354,7 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("目标库位代码")
     public String destLocateNo;
 
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java
index 40f637d..0e4d99f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.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 : 班次表
@@ -51,4 +52,9 @@ public class WmsShift extends BaseBean{
     @ApiParam("结束时间")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String endTime;
+
+    @Transient
+    @ApiParam("结束时间&结束时间")
+    private boolean startTimeAndEndTime;
+
 }
\ No newline at end of file