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

 Conflicts:

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

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

@@ -6505,7 +6505,7 @@ public class WmsEnumUtil {
     public enum REWORK_STATUS {
         INIT(10, "INIT", "初始化"),
         BE_HANDLE(20, "BE_HANDLE", "待处理"),
-        HANDLE_ING(30, "HANDLE_ING", "处理中"),
+        HANDLING(30, "HANDLING", "处理中"),
         FINISH(40, "FINISH", "已处理"),
         NONE(50, "NONE", "不处理");
 
@@ -7167,86 +7167,4 @@ public class WmsEnumUtil {
             return null;
         }
     }
-
-
-    /**
-     * BH处理状态
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum BH_WORK_STATUS {
-        WAIT_CHECK(10, "WAIT_CHECK", "待检验"),
-        SUBMIT_CHECK(20, "SUBMIT_CHECK", "已送检"),
-        IN_CHECK(30, "IN_CHECK", "检验中"),
-        WAIT_CONFIRM(40, "WAIT_CONFIRM", "待确认"),
-        WAIT_REPARI(50, "WAIT_OUT", "待返修"),
-        WAIT_PICK(60, "WAIT_OUT", "待挑选"),
-        IN_REPARI(70, "WAIT_OUT", "返修中"),
-        IN_PICK(80, "WAIT_OUT", "挑选中"),
-        WAIT_OUT(90, "WAIT_OUT", "待出库"),
-        OUT(100, "WAIT_OUT", "已出库");
-
-        private int value;
-        private String code;
-        private String description;
-
-        BH_WORK_STATUS(int value, String code, String description) {
-            this.value = value;
-            this.code = code;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        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 String valueOfDescription(int val) {
-            return valueOf(val);
-        }
-
-        public static int descriptionOfValue(String desc) {
-            return descOf(desc);
-        }
-
-
-        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;
-        }
-
-        public static BH_WORK_STATUS codeOf(Integer value) {
-            if (value == null) {
-                return null;
-            } else {
-                for (int i = 0; i < values().length; i++) {
-                    if (values()[i].value == value) {
-                        return values()[i];
-                    }
-                }
-            }
-            return null;
-        }
-    }
 }

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

@@ -606,6 +606,7 @@ public class WmsStockSn extends BaseBean {
 
 
     public WmsStockSn(WmsStockSn stockSn, String batchCode) {
+        this.id = stockSn.getId();
         this.organizeCode = stockSn.getOrganizeCode();
         this.refSrc = stockSn.getRefSrc();
         this.partNo = stockSn.getPartNo();

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

@@ -74,6 +74,10 @@ public class WmsTestResultDetails extends BaseBean {
     @ApiParam("已检测数")
     private Long checkSize;
 
+    @Transient
+    @ApiParam("移动单单号")
+    private String moveNo;
+
     public WmsTestResultDetails() {
     }