Merge branches 'dev' and '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/WmsEnumUtil.java

@@ -2547,4 +2547,39 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+
+    /**
+     * 库存交易表状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WMS_TRANS_QUAN_STATUS {
+        CREATE(1, "创建"), SUCCESS(10, "处理成功"),FAIL(30,"处理失败");
+
+        private int value;
+        private String description;
+
+        WMS_TRANS_QUAN_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -153,4 +153,37 @@ public class WmsTransQuan extends BaseBean {
     @Transient
     @ApiParam("存储区名称")
     private String zoneName;
+
+    @Transient
+    @ApiParam("库存地代码")
+    private String areaNo;
+
+    public WmsTransQuan(){}
+
+    public WmsTransQuan(String organizeCode,String partNo,String partNameRdd,String transCode,String unit,String whNo,String zoneNo,
+                        Double qty,Double failQty,Double holdQty,Double scrapQty,Double qcQty,Double rinQty,
+                        Double freezeQty,Double consignQty,Double lockQty){
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.transCode = transCode;
+        this.unit = unit;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.qty = qty;
+        this.failQty = failQty;
+        this.holdQty = holdQty;
+        this.scrapQty = scrapQty;
+        this.qcQty = qcQty;
+        this.rinQty = rinQty;
+        this.freezeQty = freezeQty;
+        this.consignQty = consignQty;
+        this.lockQty = lockQty;
+
+    }
+
+
+    public WmsTransQuan(Integer transStatus){
+        this.transStatus = transStatus;
+    }
 }