Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -1961,8 +1961,10 @@ public class CommonEnumUtil {
             return null;
         }
 
+
+        // cn.estsh.i3plus.mes.pcn.util.BsJdbcTemplateConfigTest
         private String getJDBCUrlMySQL(String database,String host,Integer port){
-            //TODO 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST
+            // 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST
             return "jdbc:mysql://"+host+":"+port+"/"+database+
                     "?autoReconnect=true" +
                     "&useSSL=false" +

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -84,7 +84,7 @@ public class MesWorkOrder extends BaseBean implements Serializable {
 
     @Column(name = "IS_PULL")
     @ApiParam("是否投料")
-    private Integer isPull = 2;
+    private Integer isPull = 1;
 
     @Column(name = "WO_TYPE")
     @ApiParam("工单类型")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnBoardListColorModel {
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("颜色")
+    private String color;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java

@@ -53,4 +53,7 @@ public class MgnBoardListModel {
     @ApiParam("车间")
     private String areaCode;
 
+    @ApiParam("产线集合")
+    private List<MgnBoardListColorModel> workCenterList;
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java

@@ -470,7 +470,8 @@ public class WmsDocMovementDetails extends BaseBean {
     }
 
 
-    public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) {
+    public WmsDocMovementDetails (String createDatetime, String srcZoneNo,String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) {
+        System.out.println("=======参数方法");
         this.createDatetime = createDatetime;
         this.srcLocateNo = srcLocateNo;
         this.destLocateNo = destLocateNo;
@@ -478,6 +479,7 @@ public class WmsDocMovementDetails extends BaseBean {
         this.itemStatus= itemStatus;
         this.orderNo = orderNo;
         this.partNo=partNo;
+        this.srcZoneNo = srcZoneNo;
     }
 
     public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) {

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java

@@ -162,6 +162,10 @@ public class WmsPOMasterDetails extends BaseBean {
     private String dateCode;
 
     @Transient
+    @ApiParam(value = "颜色控制")
+    private String color;
+
+    @Transient
     @ApiParam("前端表格编辑使用")
     private Boolean isSet = false;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java

@@ -16,6 +16,7 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.Version;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : 库存信息
@@ -169,6 +170,10 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "应有数量")
     private Double theoryQty;
 
+    @Transient
+    @ApiParam(value = "差异数量MAP")
+    private Map<String, Map<String,Double>> differenceQtyMap;
+
 
     public Integer getIsSnapshot() {
         return this.isSnapshot == null ? 0 : this.isSnapshot;
@@ -362,4 +367,11 @@ public class WmsStockQuan extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.qty = qty;
     }
+    public WmsStockQuan(String whNo, String zoneNo, String locateNo, String partNo, String partNameRdd) {
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+    }
 }