bug修改

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

@@ -1082,7 +1082,8 @@ public class WmsEnumUtil {
         CREATE(10, "创建"),
         BE_HANDLE(20, "待处理"),
         FINISH(30, "已处理"),
-        HANDLE_ERROR(40, "处理出错");
+        HANDLE_ERROR(40, "处理出错"),
+        TEST(50, "调试");
 
         private int value;
         private String description;
@@ -2505,7 +2506,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_PART_TYPE {
-        RAW_MATERIAL(1, "原材料"), PARTIALLY_PREPARED_PRODUCTS(2, "半成品"), FINISHED_PRODUCT(3, "成品");
+        RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品");
 
         private int value;
         private String description;
@@ -2693,7 +2694,7 @@ public class WmsEnumUtil {
     public enum SRC_STATUS {
         ZMMES("ZMMES", "知明MES"),
         TBMES("TBMES", "MES接口"),
-        AMP("AMP","AMP系统");
+        AMP("AMP", "AMP系统");
 
         private String value;
         private String description;

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

@@ -99,8 +99,16 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam("源仓库编号")
     public String srcWhNo;
 
+    @Column
+    @ApiParam("是否范围内")
+    public Integer isScope;
+
     public WmsCSFactTrans(){}
 
+    public Integer getIsScopeVal() {
+        return isScope== null ? 0 : this.isScope.intValue();
+    }
+
     public WmsCSFactTrans(Double factQty, String partNo){
         if(factQty == null) {
             this.factQty = 0d;
@@ -109,4 +117,20 @@ public class WmsCSFactTrans extends BaseBean {
         }
         this.partNo = partNo;
     }
+
+    public WmsCSFactTrans(String orderNo, String whNo, String zoneNo, String locateNo,Double factQty, String partNo, String partNameRdd, String sn, Double qty, String unit, String srcLocateNo, String srcZoneNo, String srcWhNo) {
+        this.orderNo = orderNo;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.factQty = factQty;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sn = sn;
+        this.qty = qty;
+        this.unit = unit;
+        this.srcLocateNo = srcLocateNo;
+        this.srcZoneNo = srcZoneNo;
+        this.srcWhNo = srcWhNo;
+    }
 }

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

@@ -122,56 +122,47 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "报废数量", example = "0")
     private Double scrapQty;
 
-    @Transient
+    public Double getQtyVal() {
-    @ApiParam(value = "总数量")
-    private Double totalQty;
-
-    public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }
 
-    public Double getFailQty() {
+    public Double getFailQtyVal() {
         return this.failQty == null ? 0 : this.failQty;
     }
 
-    public Double getHoldQty() {
+    public Double getHoldQtyVal() {
         return this.holdQty == null ? 0 : this.holdQty;
     }
 
-    public Double getQcQty() {
+    public Double getQcQtyVal() {
         return this.qcQty == null ? 0 : this.qcQty;
     }
 
-    public Double getRinQty() {
+    public Double getRinQtyVal() {
         return this.rinQty == null ? 0 : this.rinQty;
     }
 
-    public Double getFreezeQty() {
+    public Double getFreezeQtyVal() {
         return this.freezeQty == null ? 0 : this.freezeQty;
     }
 
-    public Double getConsignQty() {
+    public Double getConsignQtyVal() {
         return this.consignQty == null ? 0 : this.consignQty;
     }
 
-    public Double getLockQty() {
+    public Double getLockQtyVal() {
         return this.lockQty == null ? 0 : this.lockQty;
     }
 
-    public Double getScrapQty() {
+    public Double getScrapQtyVal() {
         return this.scrapQty == null ? 0 : this.scrapQty;
     }
 
-    public Double getTotalQty() {
-        return this.totalQty == null ? 0 : this.totalQty;
-    }
-
     public WmsStockQuan() {
     }
 
     public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName,
-                        Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
+                        Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty) {
-                        Double consignQty, Double lockQty) {
         this.whNo = whNo;
         this.zoneNo = zoneNo;
         this.partNo = partNo;