Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

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

@@ -1349,7 +1349,8 @@ public class WmsEnumUtil {
         INVENTORY(20, "已盘"),
         FROZEN(30, "已冻结"),
         THAWING(40, "已解冻"),
-        RETURN_GOODS(50, "取消冻结");
+        RETURN_GOODS(50, "取消冻结"),
+        Unsettled_(60, "取消冻结");
 
         private int value;
         private String description;

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

@@ -99,7 +99,7 @@ public class WmsCSOrderDetails extends BaseBean {
     public Integer destSnStatus;
 
     /**
-     * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结
+     * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60-未盘解冻
      */
     @Column(name = "TRANS_STATUS")
     @ApiParam(value = "处理状态", example = "1")

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

@@ -204,7 +204,7 @@ public class WmsPart extends BaseBean {
     @ApiParam(value = "循环补货数量", example = "0")
     private Double cycleRquestQty = 0d;
 
-    public int getIqcValue(){
+    public int getIqcVal(){
         return this.iqc == null ? 0 : this.iqc.intValue();
     }
 

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

@@ -79,49 +79,40 @@ public class WmsStockQuan extends BaseBean {
     private WmsLocate wmsLocate;
 
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0")
-    @ColumnDefault("0")
+    @ApiParam(value = "可用数量")
-    @ApiParam(value = "可用数量", example = "0")
     public Double qty;
 
-    @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8) default 0")
-    @ColumnDefault("0")
+    @ApiParam(value = "不合格数量")
-    @ApiParam(value = "不合格数量", example = "0")
     private Double failQty;
 
-    @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8) default 0")
-    @ColumnDefault("0")
+    @ApiParam(value = "隔离数量")
-    @ApiParam(value = "隔离数量", example = "0")
     private Double holdQty;
 
-    @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QC_QTY", columnDefinition = "decimal(18,8) default 0")
-    @ColumnDefault("0")
+    @ApiParam(value = "质检中数量")
-    @ApiParam(value = "质检中数量", example = "0")
     private Double qcQty;
 
-    @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8) default 0")
-    @ColumnDefault("0")
+    @ApiParam(value = "待入库数量")
-    @ApiParam(value = "待入库数量", example = "0")
     private Double rinQty;
 
-    @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8) default 0")
-    @ColumnDefault("0")
+    @ApiParam(value = "冻结数量")
-    @ApiParam(value = "冻结数量", example = "0")
     private Double freezeQty;
 
-    @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8) default 0")
-    @ColumnDefault("0")
+    @ApiParam(value = "寄售数量")
-    @ApiParam(value = "寄售数量", example = "0")
     private Double consignQty;
 
-    @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8) default 0")
-    @ColumnDefault("0")
+    @ApiParam(value = "锁定数量")
-    @ApiParam(value = "锁定数量", example = "0")
     private Double lockQty;
 
-    @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8) default 0")
-    @ColumnDefault("0")
+    @ApiParam(value = "报废数量")
-    @ApiParam(value = "报废数量", example = "0")
     private Double scrapQty;
 
     @Transient

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

@@ -58,7 +58,7 @@ public class WmsTransType extends BaseBean {
     private String transTypeDesc;
 
     @Column(name = "TM_ID")
-    @ApiParam(value = "交易处理组件", example = "-1")
+    @ApiParam(value = "交易处理组件")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long tmId;
 
@@ -73,4 +73,8 @@ public class WmsTransType extends BaseBean {
     public String getMenuUrl() {
         return "/handle?transTypeCode=" + this.transTypeCode;
     }
+
+    public long getTmIdVal() {
+        return this.tmId == null ? 0 : this.tmId;
+    }
 }