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

@@ -14,14 +14,14 @@ public class MesEnumUtil {
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum HQL_EXPRESSION {
-        GT(">",">","大于"),
-        LT("<","<","小于"),
-        EQ("=","=","等于"),
-        NEQ("!=","!=","不等于"),
-        GTE(">=",">=","大于等于"),
-        LTE("<=","<=","小于等于"),
-        LIKE("like","like","LIKE"),
-        IN("in","in","包含");
+        GT(">", ">", "大于"),
+        LT("<", "<", "小于"),
+        EQ("=", "=", "等于"),
+        NEQ("!=", "!=", "不等于"),
+        GTE(">=", ">=", "大于等于"),
+        LTE("<=", "<=", "小于等于"),
+        LIKE("like", "like", "LIKE"),
+        IN("in", "in", "包含");
 
         private String value;
         private String code;
@@ -240,7 +240,7 @@ public class MesEnumUtil {
     }
 
     /**
-     *  排序校验模式
+     * 排序校验模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CHECK_PROD_SEQ_FLAG {
@@ -307,7 +307,7 @@ public class MesEnumUtil {
     }
 
     /**
-     *  排序校验模式
+     * 排序校验模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TOOLING_ACTION_RECORD_TYPE {
@@ -371,6 +371,7 @@ public class MesEnumUtil {
             return valueOf(val);
         }
     }
+
     /**
      * JIS发运是否按主队列顺序扫描
      */
@@ -3241,7 +3242,7 @@ public class MesEnumUtil {
         BH_ORDER(40, "B&H工单"),
         JIT_ORDER(50, "JIT工单"),
         STOCK_ORDER(60, "库存工单"),
-        REPAIR(70,"返修插单");
+        REPAIR(70, "返修插单");
 
         private int value;
         private String description;
@@ -5009,7 +5010,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	作业校验模式
+     * 作业校验模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CHECK_MODEL {
@@ -5044,7 +5045,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	PLC类型
+     * PLC类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PLC_TYPE {
@@ -5079,7 +5080,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	看板类型
+     * 看板类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum BOARD_TYPE {
@@ -5124,7 +5125,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	看板类型
+     * 看板类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum BOARD_OBJECT_TYPE {
@@ -5207,7 +5208,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	界面类型
+     * 界面类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WINDOW_TYPE {
@@ -5243,7 +5244,7 @@ public class MesEnumUtil {
 
 
     /**
-     * 	运算对象属性 运算类型
+     * 运算对象属性 运算类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OPERATE_TYPE {
@@ -5279,7 +5280,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	运算对象属性 属性类型
+     * 运算对象属性 属性类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ATTRIBUTE_TYPE {
@@ -5314,7 +5315,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	运算对象属性配置 赋值类型
+     * 运算对象属性配置 赋值类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum VALUE_TYPE {
@@ -5360,7 +5361,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	运算对象 对象代码
+     * 运算对象 对象代码
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OBJECT_CODE {
@@ -5406,7 +5407,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	脚本类型（组件、表单、报表、JOB、其他）
+     * 脚本类型（组件、表单、报表、JOB、其他）
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SCRIPT_TYPE {
@@ -5444,7 +5445,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	语言类型（Groovy、Python、JavaScript、Scala、Ruby）
+     * 语言类型（Groovy、Python、JavaScript、Scala、Ruby）
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SCRIPT_LANGUAGE {
@@ -5482,9 +5483,8 @@ public class MesEnumUtil {
     }
 
 
-
     /**
-     * 	运算对象代码
+     * 运算对象代码
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OPERATE_OBJECT_CODE {
@@ -5530,7 +5530,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	oee 运算状态
+     * oee 运算状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OEE_STATUS {
@@ -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();
     }