Jenkins自动合并

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;
+}

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;
+    }
+
 }