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

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

@@ -2810,7 +2810,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_PART_TYPE {
-        RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品");
+        RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器");
 
         private int value;
         private String description;
@@ -2850,8 +2850,9 @@ public class WmsEnumUtil {
     }
 
 
+
     public enum WMS_PART_TYPE_STR {
-        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品");
+        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"),CONTAINER_PRODUCT("40", "容器");
 
         private String value;
         private String description;

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsPart;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -41,4 +42,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable {
      * 供应商批次
      */
     public String dateCode;
+
+    @ApiParam(value = "物料信息")
+    public WmsPart wmsPart;
 }

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

@@ -104,7 +104,7 @@ public class WmsDocMovementDetails extends BaseBean {
      */
     @Column(name = "ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     private Integer itemStatus;
 
     /**
@@ -112,7 +112,7 @@ public class WmsDocMovementDetails extends BaseBean {
      */
     @Column(name = "IS_FREE")
     @ApiParam(value = "是否免费", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer isFree;
 
     @Column(name = "REMARK")
@@ -176,25 +176,25 @@ public class WmsDocMovementDetails extends BaseBean {
     public Double inputMoveQty;
 
     @Transient
-    @ApiParam(value ="标准包装",example = "1")
+    @ApiParam(value = "标准包装", example = "1")
     private Double snp;
 
     @Transient
-    @ApiParam(value ="条码总数量",example = "1")
+    @ApiParam(value = "条码总数量", example = "1")
     private Double detailsSnCount;
 
     @Transient
-    @ApiParam(value ="余数",example = "1")
+    @ApiParam(value = "余数", example = "1")
     private Double restQty;
 
     @Transient
     @ApiParam("任务状态")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
     private Integer isTask;
 
     @Transient
     @ApiParam("主表单据状态")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     private Integer orderMasterStatus;
 
     @Transient
@@ -206,17 +206,33 @@ public class WmsDocMovementDetails extends BaseBean {
         return recommondLot == null ? "无" : this.recommondLot;
     }
 
-    public Double getQty() {return qty == null ? 0D : this.qty.doubleValue(); }
+    public Double getQty() {
+        return qty == null ? 0D : this.qty.doubleValue();
+    }
+
+    public Double getOutQty() {
+        return outQty == null ? 0D : this.outQty.doubleValue();
+    }
 
-    public Double getOutQty() {return outQty == null ? 0D : this.outQty.doubleValue(); }
+    public Double getPickQty() {
+        return pickQty == null ? 0D : this.pickQty.doubleValue();
+    }
 
-    public Double getPickQty() {return pickQty == null ? 0D : this.pickQty.doubleValue(); }
+    public Double getActualQty() {
+        return actualQty == null ? 0D : this.actualQty.doubleValue();
+    }
 
-    public Double getActualQty() {return actualQty == null ? 0D : this.actualQty.doubleValue(); }
+    public Double getRecQty() {
+        return recQty == null ? 0D : this.recQty.doubleValue();
+    }
 
-    public Integer getIsTaskVal() {return isTask == null ? 0 : this.isTask.intValue();}
+    public Integer getIsTaskVal() {
+        return isTask == null ? 0 : this.isTask.intValue();
+    }
 
-    public Integer getOrderMasterStatus() { return orderMasterStatus== null ? 0 : this.orderMasterStatus.intValue(); }
+    public Integer getOrderMasterStatus() {
+        return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue();
+    }
 
     @Version
     @Column(name = "LOCK_VERSION")
@@ -229,7 +245,7 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Transient
     @ApiParam("业务类型")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
     public Integer busiType;
 
     @Column(name = "IS_SN")

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

@@ -47,7 +47,7 @@ public class WmsPackageSpec extends BaseBean {
 
     @Column(name = "SPEC_LEVEL")
     @ApiParam(value = "规格层级")
-    private String specLevel;
+    private Integer specLevel;
 
     @Column(name = "IS_MIXED")
     @ApiParam(value = "是否混包")

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

@@ -142,6 +142,10 @@ public class WmsPoSn extends BaseBean {
     @ApiParam(value = "最晚收货时间")
     public String latestReceTime;
 
+    @Column(name = "FIX_LOT_NO", nullable = false)
+    @ApiParam(value = "特殊批次")
+    private String fixLotNo = "";
+
     public WmsPoSn(){}
 
     public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){