Merge remote-tracking branch 'origin/test' into test

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

@@ -56,4 +56,8 @@ public class MesNumberRule extends BaseBean implements Serializable {
     @Column(name = "IS_CYCLE")
     @ApiParam("最大值后循环")
     private Integer isCycle;
+
+    @Column(name = "SPILT_RULE")
+    @ApiParam("拼接规则")
+    private String spiltRule;
 }

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

@@ -135,6 +135,14 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam(value = "包装数量")
     private Double qty2;
 
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Column(name = "VERSION_NO")
+    @ApiParam("版本号")
+    private String versionNo;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;

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

@@ -94,6 +94,12 @@ public class GenSerialNoModel {
     @ApiParam("工序代码")
     private String processCode;
 
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @ApiParam("版本号")
+    private String versionNo;
+
 
     public GenSerialNoModel(String ruleCode) {
         this.ruleCode = ruleCode;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.wms;
 
 import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails;
 import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn;
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -19,6 +20,7 @@ public class WmsMoveDetailsModel implements Serializable {
     private static final long serialVersionUID = -6968143574442339454L;
     private WmsMoveDetails details;
     private List<WmsMoveSn> moveSnList;
+    private List<WmsStockSn> wmsStockSnList;
 
     public WmsMoveDetailsModel(WmsMoveDetails details, List<WmsMoveSn> moveSnList) {
         this.details = details;

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

@@ -70,9 +70,12 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam("单位")
     public String unit;
 
+    /**
+     * 实盘数量
+     **/
     @Column(name="FACT_QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
-    @ApiParam(value = "实盘数量", example = "0")
+    @ApiParam(value = "数量", example = "0")
     public Double factQty;
 
     /**
@@ -80,7 +83,7 @@ public class WmsCSFactTrans extends BaseBean {
      */
     @Column(name="ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ITEM_STATUS.class, refForeignKey = "value", value = "description")
     public Integer itemStatus;
 
     @Column(name="REMARK")

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

@@ -53,7 +53,7 @@ public class WmsCSOrderDetails extends BaseBean {
 
     @Column(name = "QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
-    @ApiParam(value = "需求数量", example = "0")
+    @ApiParam(value = "数量", example = "0")
     public Double qty;
 
     @Column(name = "UNIT")

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

@@ -100,6 +100,7 @@ public class WmsCSRange extends BaseBean {
 
     public WmsCSRange(){}
 
+
     public WmsCSRange(String zoneNo,String partNo,String partNameRdd){
         this.zoneNo = zoneNo;
         this.partNo = partNo;
@@ -117,7 +118,6 @@ public class WmsCSRange extends BaseBean {
     public WmsCSRange(String zoneNo, String locateNo) {
         this.zoneNo = zoneNo;
         this.locateNo = locateNo;
-
     }
 
     public WmsCSRange(String orderNo, String partNo, String zoneNo, Integer orderStatus) {