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/SwebEnumUtil.java

@@ -139,4 +139,49 @@ public class SwebEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 订单类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_TYPE {
+        CREATE(10, "标准包装"),
+        RECEIPT(20, "非标包装");
+
+        private int value;
+        private String description;
+
+        ORDER_TYPE(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;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -2031,4 +2031,38 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 单据是否指定条码
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_IS_SN {
+        IS_APPOINT_SN(1, "指定条码"), APPOINT_SN(2, "不指定条码");
+
+        private int value;
+        private String description;
+
+        ORDER_IS_SN(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/WmsDocMovementMaster.java

@@ -126,4 +126,8 @@ public class WmsDocMovementMaster extends BaseBean {
     @Transient
     @ApiParam(value = "打印时间")
     private String printDate;
+
+    public Integer getIsSn() {
+        return isSn == null ? 0 : this.getIsSn();
+    }
 }

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

@@ -111,4 +111,7 @@ public class WmsLocate extends BaseBean {
         return this.partQty == null ? 0 : this.partQty.doubleValue();
     }
 
+    public Integer getLocateType() {
+        return this.locateType== null ? 0 : this.locateType.intValue();
+    }
 }