From f800d3dd7b18a7250f5d16c3e38175a3babda066 Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Tue, 17 Dec 2019 21:16:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E6=88=90=E5=93=81=E5=8F=91?=
 =?UTF-8?q?=E8=BF=90=EF=BC=8C=E8=8E=B7=E5=8F=96=E5=9C=A8=E9=80=94=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/model/wms/WmsStockFifoModel.java   | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
new file mode 100644
index 0000000..48e8954
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 条码FIFO推荐
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-12-17 20:41
+ * @Modify:
+ **/
+@Data
+public class WmsStockFifoModel {
+
+    @ApiParam(value = "工厂代码")
+    String organizeCode;
+
+    @ApiParam(value = "物料集合")
+    List<String> partNos;
+
+    @ApiParam(value = "存储区集合")
+    List<String> zoneNos;
+
+    @ApiParam(value = "物料对应的存储区")
+    Map<String, String> partToZoneMap;
+
+    @ApiParam(value = "单据号")
+    String orderNo;
+
+    @ApiParam(value = "物料对应的存储区集合")
+    Map<String,List<String>> partToZonesMap;
+}

From 4f1455012f467b29ee13e22fa7c45257d4c4bf2a Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Tue, 17 Dec 2019 21:21:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E9=A2=86=E6=96=99=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=BF=E6=89=AB=E6=8F=8F=E6=97=B6=EF=BC=8C=E5=9C=A8=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E5=AE=8C=E6=9D=A1=E7=A0=81=E5=90=8E=E5=B0=86=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E5=BA=93=E4=BD=8D=E5=B8=A6=E5=87=BA=E3=80=82=20?=
 =?UTF-8?q?=E3=80=91bug7024?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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 6711728..312209b 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
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.Objects;
 
 /**
  * @Description :移库单明细实体(用于转储类业务)
@@ -258,4 +259,17 @@ public class WmsDocMovementDetails extends BaseBean {
     @Column(name = "IS_SN")
     @ApiParam(value = "条码生成状态", example = "20")
     public Integer isSn;
+
+
+    public WmsDocMovementDetails () {
+
+    }
+
+    public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) {
+        this.orderNo = orderNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.destLocateNo = destLocateNo;
+    }
+
 }