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

@@ -371,6 +371,7 @@ public class MesEnumUtil {
             return valueOf(val);
         }
     }
+
     /**
      * JIS发运是否按主队列顺序扫描
      */
@@ -5482,7 +5483,6 @@ public class MesEnumUtil {
     }
 
 
-
     /**
      * 运算对象代码
      */
@@ -5730,4 +5730,42 @@ public class MesEnumUtil {
         }
     }
 
+
+    /**
+     * MES_PLC 数据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_DATA_TYPE {
+
+        INT("int", "数字"),
+        STRING("string", "字符串"),
+        BOOLEAN("boolean", "布尔");
+
+        private String value;
+        private String description;
+
+        PLC_DATA_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.wms.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
-import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -11,7 +10,12 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 库存移动单主表信息
@@ -235,6 +239,28 @@ public class WmsMoveMaster extends BaseBean {
         this.orderStatus = orderStatus;
     }
 
+
+    public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage,
+                         Integer isUrgent, String carNo, Integer busiTypeCode, String refOrderNo, String remark,
+                         String organizeCode, String createDatetime, String createUser, String modifyDatetime, String modifyUser, String fixId
+    ) {
+        this.orderNo = orderNo;
+        this.orderStatus = orderStatus;
+        this.remark = remark;
+        this.isUrgent = isUrgent;
+        this.transTypeCode = transTypeCode;
+        this.errorMessage = errorMessage;
+        this.busiTypeCode = busiTypeCode;
+        this.refOrderNo = refOrderNo;
+        this.carNo = carNo;
+        this.organizeCode = organizeCode;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+        this.fixId = fixId;
+    }
+
     public Double getTransQty() {
         return this.transQty == null ? 0 : this.transQty.doubleValue();
     }