Merge branch '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/MesEnumUtil.java

@@ -881,15 +881,17 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STEP_PARAM_TYPE {
 
-        QUALIFIED(10, "数字"),
-        DEFECTED(20, "字符串"),
-        SCRAPED(30, "可选值");
+        QUALIFIED(10,"number", "数字"),
+        DEFECTED(20, "text","字符串"),
+        SCRAPED(30,"select", "可选值");
 
         private int value;
+        private String code;
         private String description;
 
-        STEP_PARAM_TYPE(int value, String description) {
+        STEP_PARAM_TYPE(int value,String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -897,6 +899,8 @@ public class MesEnumUtil {
             return value;
         }
 
+        public String getCode(){return code;}
+
         public String getDescription() {
             return description;
         }

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

@@ -146,6 +146,28 @@ public class WmsMoveMaster extends BaseBean {
 
     public WmsMoveMaster(){};
 
+    public WmsMoveMaster(String orderNo, Integer orderStatus,  String transTypeCode, String errorMessage,
+                         Integer isUrgent,String carNo, Integer busiTypeCode, String refOrderNo, String refSrc,String partNo, Integer itemStatus,String remark,
+                         String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser) {
+        this.orderNo = orderNo;
+        this.orderStatus = orderStatus;
+        this.remark = remark;
+        this.isUrgent=isUrgent;
+        this.transTypeCode = transTypeCode;
+        this.errorMessage = errorMessage;
+        this.busiTypeCode = busiTypeCode;
+        this.partNo = partNo;
+        this.itemStatus = itemStatus;
+        this.refOrderNo = refOrderNo;
+        this.carNo = carNo;
+        this.refSrc = refSrc;
+        this.organizeCode =organizeCode;
+        this.createDatetime= createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime =modifyDatetime;
+        this.modifyUser =modifyUser;
+    }
+
     public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
                          String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc) {
         this.id = id;