Merge branch 'dev' into test

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
-import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
@@ -15,7 +14,6 @@ import lombok.EqualsAndHashCode;
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 import java.util.List;
 
@@ -105,14 +103,4 @@ public class BaseOrder extends BaseCode {
     public List<WorkRelation> getPostRelations() {
         return BeanRelation.list(this, EBaseOrder.PostRelations);
     }
-
-    @JsonBackReference
-    public List<BaseOrder> getUpperOrders() {
-        return BeanRelation.list(this, EBaseOrder.UpperOrders);
-    }
-
-    @JsonBackReference
-    public List<BaseOrder> getLowerOrders() {
-        return BeanRelation.list(this, EBaseOrder.LowerOrders);
-    }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java

@@ -36,10 +36,15 @@ public class ImportDetail extends BaseAPS {
     @ApiParam(value ="内部表名")
     private String inName;
 
-    @Column(name="TYPE")
+    @Column(name="IMPORT_TYPE")
     @ApiParam(value ="导入类型")
     @FieldAnnotation(defaultValue = "REPLACE")
-    private ApsEnumUtil.IMPORT_DETAIL_TYPE type;
+    private ApsEnumUtil.IMPORT_DETAIL_TYPE importType;
+
+    @Column(name="SKIP_ROWS")
+    @ApiParam(value ="跳过行数")
+    @FieldAnnotation(defaultValue = "0")
+    private Integer skipRows;
 
     @Column(name="ORDER_NUMBER")
     @ApiParam(value ="序号")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java

@@ -5,6 +5,4 @@ public enum EBaseOrder {
     Material,
     PrevRelations,
     PostRelations,
-    UpperOrders,
-    LowerOrders
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java

@@ -10,15 +10,12 @@ import java.util.Date;
 
 @Data
 public class GanttCalendarModel {
-    private Long parent;
+    private Long resourceId;
     @JsonSerialize(using = CustomDateSerializer.class)
     @JsonDeserialize(using = CustomDateDeserializer.class)
-    private Date start_date;
+    private Date startDate;
     @JsonSerialize(using = CustomDateSerializer.class)
     @JsonDeserialize(using = CustomDateDeserializer.class)
-    private Date end_date;
+    private Date endDate;
-    private String color;
+    private String cls;
-    private Long id;
-    private Long workId;
-    private String text;
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -8,6 +8,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import org.hibernate.annotations.GenericGenerator;
+import org.springframework.data.mongodb.core.index.IndexDirection;
+import org.springframework.data.mongodb.core.index.Indexed;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -78,6 +80,7 @@ public abstract class BaseBean implements Serializable {
     @AnnoOutputColumn(hidden = true)
     public String createUser;
 
+    @Indexed(direction = IndexDirection.DESCENDING)
     @Column(name="CREATE_DATE_TIME",updatable = false)
     @ApiParam(value = "创建日期")
     public String createDatetime;

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

@@ -947,12 +947,12 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_TYPE {
-        PART("PART_ALARM", 110060205, "物料"),
+        PART("PART_ALARM", 110060104, "物料"),
-        QUALITY("QUALITY_ALARM", 110060206, "质量"),
+        QUALITY("QUALITY_ALARM", 110060105, "质量"),
-        EQUIP("EQUMENT_ALARM", 110060207, "设备"),
+        EQUIP("EQUMENT_ALARM", 110060106, "设备"),
-        PROCESS("ROUTING_ALARM", 110060208, "工艺"),
+        PROCESS("ROUTING_ALARM", 110060107, "工艺"),
-        CHECK("OTHER_ALARM", 110060209, "自处理"),
+        CHECK("OTHER_ALARM", 110060108, "自处理"),
-        FIX_ERROR("FIX_ERROR", 110060210, "自动报警");
+        FIX_ERROR("FIX_ERROR", 110060109, "自动报警");
 
         private String value;
         private Integer code;

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

@@ -221,8 +221,9 @@ public class LacEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PARAM_VALUE_TYPE{
-        NUMBER(1,"数字"),
+        INTEGER(1,"整数"),
-        STRING(2,"字符串");
+        STRING(2,"字符串"),
+        FLOAT(3,"浮点");
 
         private int value;
         private String description;
@@ -341,4 +342,116 @@ public class LacEnumUtil {
         }
     }
 
+    /**
+     * 逻辑运算符
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOGICAL_OPERATOR{
+        OR(10,"或"),
+        AND(20,"与");
+
+        private int value;
+        private String description;
+
+        LOGICAL_OPERATOR(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * 关系运算符
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RELATIONAL_OPERATOR{
+        GT(10,">"),
+        LT(20,"<"),
+        EQ(20,"=="),
+        NE(20,"!="),
+        GE(20,">="),
+        LE(20,"<=");
+
+        private int value;
+        private String description;
+
+        RELATIONAL_OPERATOR(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * 任务检查类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TASK_CHECK_TYPE{
+        MASTER(10,"主"),
+        SLAVE(20,"从");
+
+        private int value;
+        private String description;
+
+        TASK_CHECK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -12,6 +12,53 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
+    /**
+     * redis过期时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EXPIRE_TIME {
+
+        NEVER(-1, "不过期"),
+        ONE_HOUR(3600, "一小时"),
+        ONE_MIN(60, "一分钟");
+
+        private int value;
+        private String description;
+
+        EXPIRE_TIME(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(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 valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRUE_OR_FALSE {
         TRUE(1, "是"),
@@ -341,7 +388,7 @@ public class MesEnumUtil {
     public enum IF_CONNECT_TYPE {
 
         DB("10", "DB"),
-        WEBSERVICE("20", "webservice "),
+        WEBSERVICE("20", "webservice"),
         RESTFUL("30", "restful");
 
         private String value;
@@ -779,7 +826,7 @@ public class MesEnumUtil {
 
         SCRATCH(10, "划痕"),
         FRACTURE(20, "破碎"),
-        SCRAP_TYPE3(30, "缺失");
+        SCRAP_TYPE(30, "缺失");
 
         private int value;
         private String description;
@@ -1370,8 +1417,14 @@ public class MesEnumUtil {
         MES_QC_CHECK_STANDARD(250, "质量检测标准"),
         MES_FAULT_CAUSE(260,"设备故障原因"),
         MES_FAULT_METHOD(270,"设备故障处理措施"),
-        MES_FAULT_PHENOMENON(280,"设备故障现象");
+        MES_FAULT_PHENOMENON(280,"设备故障现象"),
-
+        MES_DEFECT(290,"缺陷"),
+        MES_DEFECT_CAUSE(300,"缺陷原因"),
+        MES_SCRAP(310,"报废原因"),
+        MES_REPAIR(320,"质量数据处理措施"),
+        MES_EQU_TASK_PLAN(330,"设备作业周期计划"),
+        MES_PART_OJBECT(340,"物料对象"),
+        MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元");
 
         private int value;
         private String description;

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

@@ -707,7 +707,8 @@ public class MesPcnEnumUtil {
     public enum MES_REPAIR_STATUS {
 
         REPAIRED(10, "已维修"),
-        NO_REPAIR(20, "待维修");
+        NO_REPAIR(20, "待维修"),
+        NO_CONFIRM(30, "待确认");
 
         private int value;
         private String description;

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

@@ -51,6 +51,26 @@ public class WmsEnumUtil {
             }
             return null;
         }
+
+        public static String valueOfDescription(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 descriptionOfValue(String desc) {
+            int tmp = DISABLE.value;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -1015,6 +1035,62 @@ public class WmsEnumUtil {
         }
     }
 
+
+    /**
+     * 业务表：库存条码状态
+     * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CARRIAGE_STATUS {
+        CREATE(10, "创建"),
+        PUBLISH(20, "发布"),
+        RECEIVE(30, "承运商接收"),
+        ARRIVE(40, "车辆到达"),
+        INSTALL(50, "装车完成"),
+        CARRIAGE_IN(60, "运输中"),
+        CLOSE(70, "已关单");
+
+        private int value;
+        private String description;
+
+        CARRIAGE_STATUS(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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        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;
+        }
+    }
+
     /**
      * 单据是否生成任务状态
      */
@@ -1347,6 +1423,45 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+    /**
+     * 库存移动单状态状态:10=新建,20=已处理,30=处理出错
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WMSSHIPPING_ORDER_STATUS {
+        CREATE(10, "新建"),
+        PENDING(20, "已处理"),
+        ERROR(30, "处理出错");
+
+        private int value;
+        private String description;
+
+        WMSSHIPPING_ORDER_STATUS(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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 
     /**
      * 库存移动单明细状态
@@ -1883,7 +1998,7 @@ public class WmsEnumUtil {
      * 成功标志枚举
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum RC_OK_VALUE {
+    public enum AM_OK_VALUE {
 
         IS_TRUE(10, true, "成功"),
         IS_FALSE(20, false, "失败");
@@ -1892,7 +2007,7 @@ public class WmsEnumUtil {
         private boolean codeValue;
         private String description;
 
-        RC_OK_VALUE(int value, boolean codeValue, String description) {
+        AM_OK_VALUE(int value, boolean codeValue, String description) {
             this.value = value;
             this.codeValue = codeValue;
             this.description = description;
@@ -4304,4 +4419,150 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 收货看板状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RECEIVING_GOODS_STATUS {
+        WAIT_RECEIVING(10, "待收货"),
+        RECEIVING(20, "收货中"),
+        COMPLETE_RECEIVING(30, "收货完成"),
+        UN_RECEIVED(40, "延迟未收货"),
+        ELSE(50,"其他");
+
+        private int value;
+        private String description;
+
+        RECEIVING_GOODS_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static RECEIVING_GOODS_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 发运看板状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FINAL_SHIPMENT_STATUS {
+        CREATE(10, "新建"),
+        PROCESSING(20, "处理中"),
+        COMPLETE(30, "已完成");
+
+        private int value;
+        private String description;
+
+        FINAL_SHIPMENT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static FINAL_SHIPMENT_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+
+    /**
+     * 生产计划主表状态创建
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_MASTER_STATUS {
+        CREATE(10,"CREATE", "创建"),
+        PLANNED(20,"PLANNED", "已计划"),
+        CLOSE(30,"CLOSE", "已关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        WORK_ORDER_MASTER_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 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/util/StringUtil.java

@@ -1,5 +1,10 @@
 package cn.estsh.i3plus.pojo.base.util;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
 public class StringUtil {
 
 	public static boolean isEmpty(Object obj){
@@ -10,4 +15,78 @@ public class StringUtil {
 		
 		return false;
 	}
+
+
+
+	/**
+	 * 获取对象所有属性名
+	 * @param clazz
+	 * @return
+	 */
+	public static String[] getFields(Class clazz) {
+		Field[] fields = clazz.getDeclaredFields();
+		String[] fieldNames = new String[fields.length];
+		for(int i=0;i<fields.length;i++){
+			fieldNames[i]=fields[i].getName();
+		}
+		return fieldNames;
+	}
+
+	/**
+	 * 获取对象所有属性名
+	 * @param clazz
+	 * @return
+	 */
+	public static List<String> getFieldList(Class clazz) {
+		Field[] fields = clazz.getDeclaredFields();
+		Field[] superFields = clazz.getSuperclass().getDeclaredFields();
+		List<String> fieldNames = new ArrayList<>();
+		for(int i = 0;i < fields.length; i++){
+			fieldNames.add(fields[i].getName());
+		}
+		for(int i = 0;i < superFields.length; i++){
+			fieldNames.add(superFields[i].getName());
+		}
+//		fieldNames.add("id");
+//		fieldNames.add("organizeCode");
+//		fieldNames.add("isValid");
+//		fieldNames.add("isDeleted");
+//		fieldNames.add("createUser");
+//		fieldNames.add("createDatetime");
+//		fieldNames.add("modifyUser");
+//		fieldNames.add("modifyDatetime");
+		return fieldNames;
+	}
+
+	/**
+	 * 根据属性名和对象获取属性对应的值
+	 * @param fieldName
+	 * @param o
+	 * @return
+	 */
+	public static Object getFieldValueByName(String fieldName, Object o) {
+		try {
+			String firstLetter = fieldName.substring(0, 1).toUpperCase();
+			String getter = "get" + firstLetter + fieldName.substring(1);
+			Method method = o.getClass().getMethod(getter, new Class[] {});
+			Object value = method.invoke(o, new Object[] {});
+			return value;
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+	/**
+	 * 拼接对象所有属性名
+	 * @return
+	 */
+	public static String getFieldNames(String[] fieldNames) {
+		StringBuffer stringBuffer = new StringBuffer();
+		for (String fieldName : fieldNames) {
+			stringBuffer.append(fieldName).append(",");
+		}
+		int stringBufferLength = stringBuffer.length();
+		stringBuffer.delete(stringBufferLength - 1, stringBufferLength);
+		return stringBuffer.toString();
+	}
 }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.lac.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -75,6 +77,7 @@ public class LacSuitTaskParam extends BaseBean {
 
     @Column(name="PARAM_TYPE")
     @ApiParam(value ="参数类型")
+    @AnnoOutputColumn(refClass = LacEnumUtil.PARAM_TYPE.class)
     private Integer paramType;
 
     @Column(name="PARAM_VALUE_TYPE")

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java

@@ -0,0 +1,100 @@
+package cn.estsh.i3plus.pojo.lac.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-12-09 14:47
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="LAC_TASK_CHECK")
+@Api(value="任务检查",description = "任务检查")
+public class LacTaskCheck extends BaseBean {
+
+    @Column(name="COMMAND_STACK_TEMPLATE_ID")
+    @ApiParam(value ="指令集模板ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long commandStackTemplateId;
+
+    @Column(name="STEP_ID")
+    @ApiParam(value ="步骤ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long stepId;
+
+    @Column(name="STEP_TASK_ID")
+    @ApiParam(value ="步骤ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long stepTaskId;
+
+    @Column(name="TASK_ID")
+    @ApiParam(value ="任务ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long taskId;
+
+    @Column(name="TASK_NAME_RDD")
+    @ApiParam(value ="任务名称")
+    private String taskNameRdd;
+
+    @Column(name="TASK_CHECK_TYPE")
+    @ApiParam(value ="任务检查类型")
+    @AnnoOutputColumn(refClass = LacEnumUtil.TASK_CHECK_TYPE.class)
+    private Integer taskCheckType;
+
+    @Column(name="TASK_CHECK_GROUP")
+    @ApiParam(value ="任务检查组")
+    private String taskCheckGroup;
+
+    @Column(name="PARAM_ID")
+    @ApiParam(value ="参数id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long paramId;
+
+    @Column(name="PARAM_NAME_RDD")
+    @ApiParam(value ="任务名称")
+    private String paramNameRdd;
+
+    @Column(name="PARAM_VALUE_TYPE")
+    @ApiParam(value ="参数值类型")
+    @AnnoOutputColumn(refClass = LacEnumUtil.PARAM_VALUE_TYPE.class)
+    private Integer paramValueType;
+
+    @Column(name="RELATIONAL_OPERATOR")
+    @ApiParam(value ="关系运算符")
+    @AnnoOutputColumn(refClass = LacEnumUtil.RELATIONAL_OPERATOR.class)
+    private Integer relationalOperator;
+
+    @Column(name="LOGICAL_OPERATOR")
+    @ApiParam(value ="逻辑运算符")
+    @AnnoOutputColumn(refClass = LacEnumUtil.LOGICAL_OPERATOR.class)
+    private Integer logicalOperator;
+
+    @Column(name="CHECK_VALUE")
+    @ApiParam(value ="检查值")
+    private String checkValue;
+
+    @Column(name="TARGET_STEP_ID")
+    @ApiParam(value ="目标步骤ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long targetStepId;
+}

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskCheckRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.lac.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.lac.bean.LacTaskCheck;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-12-10 15:10
+ * @Modify:
+ **/
+public interface LacTaskCheckRepository extends BaseRepository<LacTaskCheck, Long> {
+}

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java

@@ -4,17 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord;
+import cn.estsh.i3plus.pojo.lac.bean.*;
-import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep;
+
-import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask;
-import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate;
-import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType;
-import cn.estsh.i3plus.pojo.lac.bean.LacLogTask;
-import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail;
-import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask;
-import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam;
-import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter;
-import cn.estsh.i3plus.pojo.lac.bean.LacTaskType;
 import java.util.List;
 
 /**
@@ -187,4 +178,10 @@ public class LacHqlPack {
         DdlPreparedPack.getNumberSmallerPack(LacEnumUtil.STACK_STATUS.FINISH.getValue(), "stackStatus", ddlPackBean);
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlCheckLacTaskCheckMasterOnly(LacTaskCheck lacTaskCheck){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(lacTaskCheck);
+        DdlPreparedPack.getStringEqualPack(lacTaskCheck.getTaskCheckGroup(),"taskCheckGroup",ddlPackBean);
+        return ddlPackBean;
+    }
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_ACTION")
+@Api("mes系统业务动作")
+public class MesAction extends BaseBean {
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "ACTION_NAME")
+    @ApiParam("动作名称")
+    private String actionName;
+
+    @Column(name = "ACTION_TYPE")
+    @ApiParam("动作类型")
+    private Integer actionType;
+
+    public int getActionTypeVal() {
+        return this.actionType == null ? 0 : this.actionType;
+    }
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :mes系统业务动作方法
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_ACTION_METHOD")
+@Api("系统业务动作方法")
+public class MesActionMethod extends BaseBean {
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "METHOD_CODE")
+    @ApiParam("方法代码")
+    private String methodCode;
+
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
+    public int getSeqVal() {
+        return this.seq == null ? 0 : this.seq;
+    }
+
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java

@@ -63,4 +63,18 @@ public class MesDatasource extends BaseBean {
     @ApiParam("设备代码")
     private String equipmentCode;
 
+    @Override
+    public String toString() {
+        return "MesDatasource{" +
+                "dsCode='" + dsCode + '\'' +
+                ", dsName='" + dsName + '\'' +
+                ", dsType='" + dsType + '\'' +
+                ", dsHost='" + dsHost + '\'' +
+                ", dsPort=" + dsPort +
+                ", dsUser='" + dsUser + '\'' +
+                ", dsPassword='" + dsPassword + '\'' +
+                ", dsDbName='" + dsDbName + '\'' +
+                ", equipmentCode='" + equipmentCode + '\'' +
+                '}';
+    }
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -26,30 +23,33 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_DEFECT_RECORD")
+@Table(name = "MES_DEFECT_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("不良信息记录表")
 public class MesDefectRecord extends BaseBean {
-    @Column(name="SERIAL_NUMBER")
+    @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;
 
-    @Column(name="PART_NAME")
+    @Column(name = "PART_NAME")
     @ApiParam("物料名称")
     private String partName;
 
-    @Column(name="DEFECT_CODE")
+    @Column(name = "DEFECT_CODE")
     @ApiParam("缺陷代码")
     private String defectCode;
 
-    @Column(name="DEFECT_NAME")
+    @Column(name = "DEFECT_NAME")
     @ApiParam("缺陷名称")
     private String defectName;
 
-    @Column(name="DEFECT_LOCATION")
+    @Column(name = "DEFECT_LOCATION")
     @ApiParam("缺陷位置")
     private String defectLocation;
 
@@ -57,19 +57,19 @@ public class MesDefectRecord extends BaseBean {
     @ApiParam("面位")
     private String sideLocation;
 
-    @Column(name="REPAIR_STATUS")
+    @Column(name = "REPAIR_STATUS")
     @ApiParam("维修状态")
     private Integer repairStatus;
 
-    @Column(name="WORK_CENTER_CODE")
+    @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
-    @Column(name="WORK_CELL_CODE")
+    @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;
 
-    @Column(name="MEMO")
+    @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.math.BigDecimal;
 
 /**
@@ -26,7 +23,10 @@ import java.math.BigDecimal;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_DISMANTLE_RECORD")
+@Table(name = "MES_DISMANTLE_RECORD", indexes = {
+        @Index(columnList = "SN"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("物料拆解记录表")
 public class MesDismantleRecord extends BaseBean {
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java

@@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Author: Wynne.Lu
@@ -24,7 +21,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE")
+@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")})
 @Api("包装规格")
 public class MesPackage extends BaseBean {
     @Column(name = "PACKAGE_NO")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -23,7 +24,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE_DETAIL")
+@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")})
 @Api("包装规格明细")
 public class MesPackageDetail extends BaseBean {
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -23,7 +24,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE_TRAVEL")
+@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")})
 @Api("包装履历表")
 public class MesPackageTravel extends BaseBean {
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java

@@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -26,7 +23,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PLAN_ORDER")
+@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
 @Api("生产主计划")
 public class MesPlanOrder extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java

@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description :产品绑定记录表
@@ -26,7 +23,10 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PROD_BIND_RECORD")
+@Table(name = "MES_PROD_BIND_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "KP_SN")
+})
 @Api("产品绑定记录表")
 public class MesProdBindRecord extends BaseBean {
     @Column(name = "SERIAL_NUMBER")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -26,7 +23,11 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PRODUCE_SN")
+@Table(name = "MES_PRODUCE_SN", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PRODUCT_SN"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("产品条码表")
 public class MesProduceSn extends BaseBean implements Serializable {
 
@@ -120,15 +121,15 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型 10=正常 20=首检件")
     private Integer snType;
 
-    @Column(name = "TRAY")
+    @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
-    private String tray;
+    private String trayNo;
 
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;
 
-    @Column(name="OPERATE_TYPE")
+    @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;
 
@@ -187,7 +188,7 @@ public class MesProduceSn extends BaseBean implements Serializable {
                 ", custSn='" + custSn + '\'' +
                 ", custPartNo='" + custPartNo + '\'' +
                 ", snType=" + snType +
-                ", tray='" + tray + '\'' +
+                ", trayNo='" + trayNo + '\'' +
                 ", resultMsg='" + resultMsg + '\'' +
                 ", operateType=" + operateType +
                 ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 产品条码履历实体类
@@ -25,7 +22,12 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PRODUCE_SN_TRAVEL")
+@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PRODUCT_SN"),
+        @Index(columnList = "CREATE_DATE_TIME"),
+        @Index(columnList = "MODIFY_DATE_TIME")
+})
 @Api("产品条码履历表")
 public class MesProduceSnTravel extends BaseBean {
     @Column(name = "SERIAL_NUMBER")
@@ -112,7 +114,15 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("客户零件号")
     private String custPartNo;
 
-    @Column(name="OPERATE_TYPE")
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型 10=正常（默认），20=首检件")
+    private Integer snType;
+
+    @Column(name = "TRAY_NO")
+    @ApiParam("托盘号")
+    private String trayNo;
+
+    @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -25,7 +26,12 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PRODUCT_DATA")
+@Table(name = "MES_PRODUCT_DATA", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PRODUCT_SN"),
+        @Index(columnList = "OBJECT_CODE"),
+        @Index(columnList = "MODIFY_DATE_TIME")
+})
 @Api("生产数据")
 public class MesProductData extends BaseBean {
     @Column(name = "WORK_CENTER_CODE")
@@ -48,6 +54,10 @@ public class MesProductData extends BaseBean {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -26,7 +23,10 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QC_CHECK_DATA")
+@Table(name = "MES_QC_CHECK_DATA", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME"),
+        @Index(columnList = "SN")
+})
 @Api("质量过程检测数据")
 public class MesQcCheckData extends BaseBean {
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -25,7 +22,9 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_ORDER")
+@Table(name = "MES_QUEUE_ORDER", indexes = {
+        @Index(columnList = "CUST_FLAG_NO")
+})
 @Api("生产队列主表")
 public class MesQueueOrder extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -25,7 +22,9 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_ORDER_DETAIL")
+@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = {
+        @Index(columnList = "ORDER_NO")
+})
 @Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -25,7 +26,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_RAW_PART_SN")
+@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")})
 @Api("原材料信息")
 public class MesRawPartSn extends BaseBean {
     @Column(name = "PART_NO")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -26,7 +23,10 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_REPAIR_RECORD")
+@Table(name = "MES_REPAIR_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("维修信息记录表")
 public class MesRepairRecord extends BaseBean {
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -24,7 +25,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_SCRAP_RECORD")
+@Table(name = "MES_SCRAP_RECORD", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("报废信息记录表")
 public class MesScrapRecord extends BaseBean {
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -23,7 +24,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WC_CHECK_RECORD")
+@Table(name = "MES_WC_CHECK_RECORD", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("开线检查记录")
 public class MesWcCheckRecord extends BaseBean {
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -23,7 +24,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_CELL_MONITOR_LOG")
+@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("工位监控异常信息")
 public class MesWorkCellMonitorLog extends BaseBean {
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java

@@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
     @Column(name = "PARAM_CODE")
     @ApiParam("参数代码")
     private String paramCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java

@@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -26,7 +23,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_ORDER")
+@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
 @Api("生产工单")
 public class MesWorkOrder extends BaseBean {
     @Column(name = "ORDER_NO")
@@ -203,6 +200,10 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("mes生产工单页面按钮控制")
     private MesButtonFlagModel mesButtonFlagModel;
 
+    @Transient
+    @ApiParam("批量打包开窗页面查询工单=1")
+    private String pageType;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -25,7 +22,10 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_ORDER_LOG")
+@Table(name = "MES_WORK_ORDER_LOG", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("生产工单日志")
 public class MesWorkOrderLog extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.model;
 
 
 import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -67,9 +66,6 @@ public class ProdPackageModel {
     @ApiParam("包装集合")
     private List<MesPackage> packageList;
 
-    @ApiParam("工单集合")
-    private List<MesWorkOrder> workOrderList;
-
     @ApiParam("打印状态文字")
     private String printStrStatus;
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesActionMethod;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesActionMethodRepository extends BaseRepository<MesActionMethod, Long> {
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesAction;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesActionRepository extends BaseRepository<MesAction, Long> {
+
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEventAction;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesEventActionRepository extends BaseRepository<MesEventAction, Long> {
+
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMethod;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesMethodRepository extends BaseRepository<MesMethod, Long> {
+
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java

@@ -69,14 +69,12 @@ public class MesHqlPack {
     /**
      * 根据打印模板的模板代码查询模板信息
      *
-     * @param organizeCode
      * @param mesLabelTemplate
      * @return
      */
-    public static DdlPackBean getLabelTemplate(String organizeCode, MesLabelTemplate mesLabelTemplate) {
+    public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean();
         DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
-        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
         return packBean;
     }
 
@@ -126,8 +124,13 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
         }
-        if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus()) && mesWorkOrder.getWorkOrderStatusVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
+        } else {
+            if (!StringUtils.isEmpty(mesWorkOrder.getPageType()) && "1".equals(mesWorkOrder.getPageType())) {
+                DdlPreparedPack.getInPackArray(new Object[]{MesPcnEnumUtil.WORK_ORDER_STATUS.OPEN.getValue(), MesPcnEnumUtil.WORK_ORDER_STATUS.PAUSE.getValue(),
+                        MesPcnEnumUtil.WORK_ORDER_STATUS.COMPLETE.getValue()}, "workOrderStatus", packBean);
+            }
         }
         if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -25,7 +22,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_CUST_ORDER")
+@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
 @Api("客户信息")
 public class MesCustOrder extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 import java.util.Date;
 
@@ -25,30 +26,33 @@ import java.util.Date;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_DEFECT_RECORD")
+@Table(name = "MES_DEFECT_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("不良信息记录表")
 public class MesDefectRecord extends BaseBean {
-    @Column(name="SERIAL_NUMBER")
+    @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;
 
-    @Column(name="PART_NAME")
+    @Column(name = "PART_NAME")
     @ApiParam("物料名称")
     private String partName;
 
-    @Column(name="DEFECT_CODE")
+    @Column(name = "DEFECT_CODE")
     @ApiParam("缺陷代码")
     private String defectCode;
 
-    @Column(name="DEFECT_NAME")
+    @Column(name = "DEFECT_NAME")
     @ApiParam("缺陷名称")
     private String defectName;
 
-    @Column(name="DEFECT_LOCATION")
+    @Column(name = "DEFECT_LOCATION")
     @ApiParam("缺陷位置")
     private String defectLocation;
 
@@ -56,19 +60,19 @@ public class MesDefectRecord extends BaseBean {
     @ApiParam("面位")
     private String sideLocation;
 
-    @Column(name="REPAIR_STATUS")
+    @Column(name = "REPAIR_STATUS")
     @ApiParam("维修状态")
     private Integer repairStatus;
 
-    @Column(name="WORK_CENTER_CODE")
+    @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
-    @Column(name="WORK_CELL_CODE")
+    @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;
 
-    @Column(name="MEMO")
+    @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -24,7 +25,10 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_DISMANTLE_RECORD")
+@Table(name = "MES_DISMANTLE_RECORD", indexes = {
+        @Index(columnList = "SN"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("物料拆解记录表")
 public class MesDismantleRecord extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java

@@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -27,7 +24,9 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_EQU_TASK")
+@Table(name = "MES_EQU_TASK", indexes = {
+        @Index(columnList = "TASK_NO")
+})
 @Api("设备作业任务")
 public class MesEquTask extends BaseBean {
 
@@ -84,7 +83,7 @@ public class MesEquTask extends BaseBean {
     private String pageType;
 
     @Transient
-    @ApiParam(value ="明细列表")
+    @ApiParam(value = "明细列表")
     private List<MesEquTaskDetail> mesEquTaskDetailList;
 
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java

@@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -27,7 +24,9 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_EQU_TASK_DETAIL")
+@Table(name = "MES_EQU_TASK_DETAIL", indexes = {
+        @Index(columnList = "EQUIPMENT_CODE")
+})
 @Api("设备作业任务明细")
 public class MesEquTaskDetail extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java

@@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description :设备维修作业记录
@@ -26,7 +23,9 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_EQU_TASK_REPAIR_RECORD")
+@Table(name = "MES_EQU_TASK_REPAIR_RECORD", indexes = {
+        @Index(columnList = "EQUIPMENT_CODE")
+})
 @Api("设备维修作业记录")
 public class MesEquTaskRepairRecord extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java

@@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description :设备点检保养作业记录
@@ -26,7 +23,9 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_EQU_TASK_STANDARD_RECORD")
+@Table(name = "MES_EQU_TASK_STANDARD_RECORD", indexes = {
+        @Index(columnList = "EQUIPMENT_CODE")
+})
 @Api("设备点检保养作业记录")
 public class MesEquTaskStandardRecord extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java

@@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Author: Wynne.Lu
@@ -24,7 +21,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE")
+@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")})
 @Api("包装规格")
 public class MesPackage extends BaseBean {
     @Column(name = "PACKAGE_NO")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -23,7 +24,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE_DETAIL")
+@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")})
 @Api("包装规格明细")
 public class MesPackageDetail extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -23,7 +24,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE_TRAVEL")
+@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")})
 @Api("包装履历表")
 public class MesPackageTravel extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java

@@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -26,7 +23,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PLAN_ORDER")
+@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
 @Api("生产主计划")
 public class MesPlanOrder extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java

@@ -12,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -26,7 +27,10 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PROD_BIND_RECORD")
+@Table(name = "MES_PROD_BIND_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "KP_SN")
+})
 @Api("产品绑定记录表")
 public class MesProdBindRecord extends BaseBean {
     @Column(name = "SERIAL_NUMBER")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -25,7 +22,11 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PRODUCE_SN")
+@Table(name = "MES_PRODUCE_SN", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PRODUCT_SN"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("产品条码表")
 public class MesProduceSn extends BaseBean {
 
@@ -117,11 +118,11 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("条码类型")
     private Integer snType;
 
-    @Column(name = "TRAY")
+    @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
-    private String tray;
+    private String trayNo;
 
-    @Column(name="OPERATE_TYPE")
+    @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;
 
@@ -131,11 +132,11 @@ public class MesProduceSn extends BaseBean {
 
     @Transient
     @ApiParam("下线开始时间")
-    private String outWorkCenterStartTime;
+    private String outWorkCenterTimeStart;
 
     @Transient
     @ApiParam("下线结束时间")
-    private String outWorkCenterEndTime;
+    private String outWorkCenterTimeEnd;
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
@@ -184,7 +185,7 @@ public class MesProduceSn extends BaseBean {
                 ", custSn='" + custSn + '\'' +
                 ", custPartNo='" + custPartNo + '\'' +
                 ", snType=" + snType +
-                ", tray='" + tray + '\'' +
+                ", trayNo='" + trayNo + '\'' +
                 ", operateType=" + operateType +
                 ", resultMsg='" + resultMsg + '\'' +
                 '}';

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 产品条码履历实体类
@@ -25,7 +22,12 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PRODUCE_SN_TRAVEL")
+@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PRODUCT_SN"),
+        @Index(columnList = "CREATE_DATE_TIME"),
+        @Index(columnList = "MODIFY_DATE_TIME")
+})
 @Api("产品条码履历表")
 public class MesProduceSnTravel extends BaseBean {
     @Column(name = "SERIAL_NUMBER")
@@ -112,7 +114,15 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("客户零件号")
     private String custPartNo;
 
-    @Column(name="OPERATE_TYPE")
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型 10=正常（默认），20=首检件")
+    private Integer snType;
+
+    @Column(name = "TRAY_NO")
+    @ApiParam("托盘号")
+    private String trayNo;
+
+    @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;
 
@@ -120,6 +130,14 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("返回信息")
     private String resultMsg;
 
+    @Transient
+    @ApiParam("下线开始时间")
+    private String outWorkCenterTimeStart;
+
+    @Transient
+    @ApiParam("下线结束时间")
+    private String outWorkCenterTimeEnd;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java

@@ -11,7 +11,9 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :生产数据
@@ -25,7 +27,12 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PRODUCT_DATA")
+@Table(name = "MES_PRODUCT_DATA", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PRODUCT_SN"),
+        @Index(columnList = "OBJECT_CODE"),
+        @Index(columnList = "MODIFY_DATE_TIME")
+})
 @Api("生产数据")
 public class MesProductData extends BaseBean {
     @Column(name = "WORK_CENTER_CODE")
@@ -100,4 +107,8 @@ public class MesProductData extends BaseBean {
     @ApiParam("数据组号")
     private String groupNo;
 
+    @Transient
+    @ApiParam("字段总数")
+    private Integer fieldNum;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -26,7 +23,10 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QC_CHECK_DATA")
+@Table(name = "MES_QC_CHECK_DATA", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME"),
+        @Index(columnList = "SN")
+})
 @Api("质量过程检测数据")
 public class MesQcCheckData extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java

@@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -29,7 +26,9 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_ORDER")
+@Table(name = "MES_QUEUE_ORDER", indexes = {
+        @Index(columnList = "CUST_FLAG_NO")
+})
 @Api("生产队列主表")
 public class MesQueueOrder extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -25,7 +22,9 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_ORDER_DETAIL")
+@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = {
+        @Index(columnList = "ORDER_NO")
+})
 @Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -25,7 +26,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_RAW_PART_SN")
+@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")})
 @Api("原材料信息")
 public class MesRawPartSn extends BaseBean {
     @Column(name = "PART_NO")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -24,7 +25,10 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_REPAIR_RECORD")
+@Table(name = "MES_REPAIR_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("维修信息记录表")
 public class MesRepairRecord extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -24,7 +25,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_SCRAP_RECORD")
+@Table(name = "MES_SCRAP_RECORD", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("报废信息记录表")
 public class MesScrapRecord extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -23,7 +24,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WC_CHECK_RECORD")
+@Table(name = "MES_WC_CHECK_RECORD", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("开线检查记录")
 public class MesWcCheckRecord extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -23,7 +24,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_CELL_MONITOR_LOG")
+@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("工位监控异常信息")
 public class MesWorkCellMonitorLog extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java

@@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
     @Column(name = "PARAM_CODE")
     @ApiParam("参数代码")
     private String paramCode;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -26,7 +23,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_ORDER")
+@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
 @Api("生产工单")
 public class MesWorkOrder extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -25,7 +22,10 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_ORDER_LOG")
+@Table(name = "MES_WORK_ORDER_LOG", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("生产工单日志")
 public class MesWorkOrderLog extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java

@@ -80,13 +80,13 @@ public class QcCheckDataModel {
     private String workCellName;
 
     @ApiParam("物料名称")
-    private String partNoName;
+    private String partName;
 
     public QcCheckDataModel() {
 
     }
 
-    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partNoName) {
+    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partName) {
         this.id = id;
         this.organizeCode = organizeCode;
         this.createUser = createUser;
@@ -111,6 +111,6 @@ public class QcCheckDataModel {
         this.shiftGroupName = shiftGroupName;
         this.squadLeader = squadLeader;
         this.workCellName = workCellName;
-        this.partNoName = partNoName;
+        this.partName = partName;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -414,7 +414,7 @@ public class MesHqlPack {
     /**
      * MES 开线管控
      *
-     * @param mesWcCheck
+     * @param wcCheck
      * @return
      */
     public static DdlPackBean getMesWcCheck(MesWcCheck wcCheck, String organizeCode) {
@@ -1838,11 +1838,11 @@ public class MesHqlPack {
         if (mesProduceSn.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
-        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterStartTime())) {
+        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
-            DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterStartTime(), "outWorkCenterTime", packBean);
+            DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
         }
-        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterEndTime())) {
+        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeStart())) {
-            DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterEndTime(), "outWorkCenterTime", packBean);
+            DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean);
 //            DdlPreparedPack.timeBuilder(
 //                    mesProduceSn.getOutWorkCenterStartTime(),
 //                    mesProduceSn.getOutWorkCenterEndTime(),
@@ -2021,6 +2021,12 @@ public class MesHqlPack {
         if (mesProduceSnTravel.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), "qcStatus", packBean);
         }
+        if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) {
+            DdlPreparedPack.getStringBiggerPack(mesProduceSnTravel.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean);
+        }
+        if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) {
+            DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
+        }
         DdlPreparedPack.timeBuilder(
                 mesProduceSnTravel.getCreateDateTimeStart(),
                 mesProduceSnTravel.getCreateDateTimeEnd(),

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 作业流程导入Model
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/12/10 11:26
+ * @Modify
+ */
+@Data
+@Api("作业流程导入Model")
+public class WmsAgImportModel implements Serializable {
+    private static final long serialVersionUID = 5322363872992177667L;
+    @ApiParam("流程集合")
+    public List<WmsActionGroup> agList;
+    @ApiParam("流程明细集合")
+    List<WmsActionGroupDetails> agdList;
+    @ApiParam("步骤调用参数集合")
+    List<WmsActionStepCallParam> ascpList;
+    @ApiParam("作业步骤集合")
+    List<WmsActionStep> asList;
+    @ApiParam("作业步骤调用集合")
+    List<WmsActionStepCall> ascList;
+    @ApiParam("作业组件集合")
+    List<WmsActionModule> amList;
+    @ApiParam("作业组件参数集合")
+    List<WmsActionModuleParam> ampList;
+    @ApiParam("作业步骤参数类型集合")
+    List<WmsActionStepType> astList;
+    @ApiParam("工厂代码")
+    public String organizeCode;
+    @ApiParam("是否覆盖")
+    public Integer isConvert;
+    @ApiParam("用户名")
+    public String userName;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java

@@ -9,10 +9,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.mongodb.core.index.Indexed;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -27,16 +27,12 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_LOG_EXCEPTION",
+@Table(name="SYS_LOG_EXCEPTION")
-        indexes = {
-                @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"),
-                @Index(columnList = "EXC_MODULE_ID DESC", name = "LOG_INDEX_EXC_MODULE_ID")
-        }
-)
 @Api(value="系统异常表",description = "记录系统出现的异常")
 public class SysLogException extends BaseBean {
 
     //CommonEnumUtil.SOFT_TYPE
+    @Indexed
     @Column(name="EXC_MODULE_ID")
     @ApiParam(value ="系统模块（枚举）", example = "1")
     @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java

@@ -12,10 +12,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.mongodb.core.index.Indexed;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -30,16 +30,11 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_LOG_OPERATE",
+@Table(name="SYS_LOG_OPERATE")
-        indexes = {
-                @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"),
-                @Index(columnList = "OPERATE_MODULE DESC", name = "LOG_INDEX_OPERATE_MODULE"),
-                @Index(columnList = "OPERATE_TYPE DESC", name = "LOG_INDEX_OPERATE_TYPE")
-})
 @Api(value="操作日志表",description = "操作日志表")
 public class SysLogOperate extends BaseBean {
 
-    //CommonEnumUtil.SOFT_TYPE
+    @Indexed
     @Column(name="OPERATE_MODULE")
     @ApiParam(value ="系统模块（枚举）", example = "1")
     @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
@@ -53,7 +48,7 @@ public class SysLogOperate extends BaseBean {
         return operateModuleName;
     }
 
-    //ImppEnumUtil.OPERATE_TYPE（枚举）
+    @Indexed
     @Column(name="OPERATE_TYPE")
     @ApiParam(value ="操作类型" , example = "-1")
     @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java

@@ -12,10 +12,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.mongodb.core.index.Indexed;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -30,24 +30,19 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_LOG_SYSTEM",
+@Table(name="SYS_LOG_SYSTEM")
-        indexes = {
-                @Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"),
-                @Index(columnList = "LOG_LEVEL", name = "LOG_INDEX_LOG_LEVEL"),
-                @Index(columnList = "LOG_MODULE_ID", name = "LOG_INDEX_LOG_MODULE_ID")
-        })
 @Api(value="系统日志表",description = "系统日志表")
 public class SysLogSystem extends BaseBean {
 
+    @Indexed
     @Column(name="LOG_LEVEL")
     @ApiParam(value ="日志级别" , example ="1")
-    //ImppEnumUtil.LOG_LEVEL
     @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class,refForeignKey = "value",value = "name")
     private Integer logLevel;
 
+    @Indexed
     @Column(name="LOG_MODULE_ID")
     @ApiParam(value ="系统模块（枚举）", example = "1")
-    //CommonEnumUtil.SOFT_TYPE
     @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
     private Integer logModuleId;
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java

@@ -11,9 +11,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.mongodb.core.index.Indexed;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -28,12 +29,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_LOG_TASK_TIME",
+@Table(name="SYS_LOG_TASK_TIME")
-        indexes = {
-                @Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"),
-                @Index(columnList = "NAME DESC", name = "LOG_INDEX_LOG_NAME"),
-                @Index(columnList = "GROUP_NAME DESC", name = "LOG_INDEX_LOG_GROUP_NAME")
-        })
 @Api(value="定时任务执行日志",description = "定时任务执行记录")
 public class SysLogTaskTime extends BaseBean {
 
@@ -79,6 +75,7 @@ public class SysLogTaskTime extends BaseBean {
     @ApiParam(value ="任务周期表达式")
     private String taskCycleExpsRdd;
 
+    @Indexed
     @Column(name="EXECUTE_TIME")
     @ApiParam(value ="执行耗时")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java

@@ -9,11 +9,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import javax.persistence.Column;
+
-import javax.persistence.Entity;
+import javax.persistence.*;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -28,7 +25,12 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "BS_SUIT_DATA_DETAIL")
+@Table(name = "BS_SUIT_DATA_DETAIL",indexes = {
+        @Index(name="bs_suit_data_detail_suit_record_id_idx",columnList = "SUIT_RECORD_ID"),
+        @Index(name="bs_suit_data_detail_suit_case_name_rdd_idx",columnList = "SUIT_CASE_NAME_RDD"),
+        @Index(name="bs_suit_data_detail_suit_case_code_idx",columnList = "SUIT_CASE_CODE_RDD"),
+        @Index(name="bs_suit_data_detail_create_date_time_idx",columnList = "CREATE_DATE_TIME")
+})
 @Api(value = "适配报文详情", description = "适配报文详情")
 public class BsSuitDataDetail extends BaseBean {
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -9,11 +9,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import javax.persistence.Column;
+
-import javax.persistence.Entity;
+import javax.persistence.*;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -28,7 +25,12 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "BS_SUIT_RECORD")
+@Table(name = "BS_SUIT_RECORD",indexes = {
+        @Index(name="bs_suit_record_suit_case_name_rdd_idx",columnList = "SUIT_CASE_NAME_RDD"),
+        @Index(name="bs_suit_record_suit_case_code_idx",columnList = "SUIT_CASE_CODE"),
+        @Index(name="bs_suit_record_create_date_time_idx",columnList = "CREATE_DATE_TIME"),
+        @Index(name="bs_suit_record_process_time_idx",columnList = "PROCESS_TIME"),
+})
 @Api(value = "适配记录", description = "适配记录")
 public class BsSuitRecord extends BaseBean {
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java

@@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -23,7 +24,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "SUIT_RECORD_PARAM")
+@Table(name = "SUIT_RECORD_PARAM",indexes = {
+        @Index(name="suit_record_param_suit_record_id_idx",columnList = "SUIT_RECORD_ID"),
+})
 @Api(value = "适配记录参数", description = "适配记录参数")
 public class BsSuitRecordParam extends BaseBean {
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java

@@ -9,10 +9,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import javax.persistence.Column;
+
-import javax.persistence.Entity;
+import javax.persistence.*;
-import javax.persistence.Lob;
-import javax.persistence.Table;
 
 /**
  * @Description : 请求适配记录
@@ -26,7 +24,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "BS_SUIT_REQUEST_RECORD")
+@Table(name = "BS_SUIT_REQUEST_RECORD",indexes = {
+        @Index(name="bs_suit_request_record_suit_record_id_idx",columnList = "SUIT_RECORD_ID"),
+})
 @Api(value = "请求适配记录", description = "请求适配记录")
 public class BsSuitRequestRecord extends BaseBean {
 

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

@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : MES_生产计划主明细表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-09 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PP_DETAILS")
+@Api("MES_生产计划明细表")
+public class MesPpDetails extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592727L;
+
+    @Column(name="WROKORDER_NO")
+    @ApiParam("工单号")
+    private String woekorderNo;
+
+    @Column(name="ITEM")
+    @ApiParam("行号")
+    private Integer item;
+
+    @Column(name="PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("零件名称")
+    private String partNameRdd;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "工单数量", example = "0")
+    public Double qty;
+
+    public Integer getItem() {
+        return item == null ? 0 : this.item.intValue();
+    }
+
+    public Double getQty() {
+        return qty == null ? 0D : this.qty.doubleValue();
+    }
+}

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

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : MES_生产计划主表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-09 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PP_MASTER")
+@Api("MES_生产计划主表")
+public class MesPpMaster extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592726L;
+
+    @Column(name="WROKORDER_NO")
+    @ApiParam("工单号")
+    private String woekorderNo;
+
+    @Column(name="PDLINE_NO")
+    @ApiParam("产线代码")
+    private String pdlineNo;
+
+    @Column(name="PLAN_PRODUCT_TIME")
+    @ApiParam("生产日期")
+    private String planProductTime;
+
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次代码")
+    private String shitNo;
+
+    @Column(name="START_PRODUCT_TIME")
+    @ApiParam("开始生产时间")
+    private String startProductTime;
+
+    @Column(name="END_PRODUCT_TIME")
+    @ApiParam("结束生产时间")
+    private String endProductTime;
+
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value = "单据状态", example = "0")
+    private Integer orderStatus = 0;
+
+    public Integer getOrderStatus() {
+        return orderStatus == null ? 0 : this.orderStatus.intValue();
+    }
+
+
+}

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

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+* @Description : 生产计划模板
+* @Reference :
+* @author: jessica.chen
+* @date: 2019/12/10 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="生产计划模板",description = "生产计划模板")
+public class MesPpTemplate extends BaseBean {
+
+    private static final long serialVersionUID = 2167743108452607913L;
+
+    @ApiParam(value = "工单号")
+    @AnnoOutputColumn
+    private String woekorderNo;
+
+    @ApiParam(value = "产线代码")
+    @AnnoOutputColumn
+    private String pdlineNo;
+
+    @ApiParam(value = "生产日期")
+    @AnnoOutputColumn
+    private String planProductTime;
+
+    @ApiParam(value = "班次代码")
+    @AnnoOutputColumn
+    private String shitNo;
+
+    @ApiParam(value = "开始生产时间")
+    @AnnoOutputColumn
+    private String startProductTime;
+
+    @ApiParam(value = "结束生产时间")
+    @AnnoOutputColumn
+    private String endProductTime;
+
+    @ApiParam(value = "零件号")
+    @AnnoOutputColumn
+    private String partNo;
+
+    @ApiParam(value = "零件描述")
+    @AnnoOutputColumn
+    private String partNameRdd;
+
+    @ApiParam(value = "工单数量")
+    @AnnoOutputColumn
+    private Double qty;
+}

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

@@ -1,5 +1,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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -29,45 +30,49 @@ import javax.persistence.*;
 public class WmsActionGroup extends BaseBean {
 
     private static final long serialVersionUID = -4169996695337717755L;
-    @Column(name = "AG_NAME_E")
+    @Column(name = "AG_NAME_E", columnDefinition = "varchar(225) default ''")
     @ApiParam("英文流程名称")
     private String agNameE;
 
-    @Column(name = "AG_DESC_E")
+    @Column(name = "AG_DESC_E", columnDefinition = "varchar(225) default ''")
     @ApiParam("英文流程描述")
     private String agDescE;
 
-    @Column(name = "AG_NAME_C")
+    @Column(name = "AG_NAME_C", nullable = false)
     @ApiParam("中文流程名称")
+    @AnnoOutputColumn
     private String agNameC;
 
-    @Column(name = "AG_DESC_C")
+    @Column(name = "AG_DESC_C", nullable = false)
     @ApiParam("中文流程描述")
+    @AnnoOutputColumn
     private String agDescC;
 
-    @Column(name = "INIT_AM_ID")
+    @Column(name = "INIT_AM_ID", columnDefinition = "bigint(20) default 0")
     @ApiParam(value = "初始化组件编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long initAmId;
 
-    @Column(name = "DETAILS_AM_ID")
+    @Column(name = "DETAILS_AM_ID", columnDefinition = "bigint(20) default 0")
     @ApiParam(value = "明细处理组件编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long detailsAmId;
 
-    @Column(name = "END_AM_ID")
+    @Column(name = "END_AM_ID", columnDefinition = "bigint(20) default 0")
     @ApiParam(value = "结束组件编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long endAmId;
 
     // 1=true, 2 = false
-    @Column(name = "AUTO_INIT")
+    @Column(name = "AUTO_INIT", nullable = false)
     @ApiParam(value = "任务自动初始化", example = "0")
+    @AnnoOutputColumn
     private Integer autoInit;
 
     // 1=true, 2 = false
-    @Column(name = "IS_COMMIT_REF_MOVE", columnDefinition = "int default 2", nullable = false)
+    @Column(name = "IS_COMMIT_REF_MOVE", nullable = false)
     @ApiParam(value = "是否连带提交创建状态移动单", example = "2")
+    @AnnoOutputColumn
     private Integer isCommitRefMove;
 
     @Lob

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

@@ -1,5 +1,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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -32,98 +33,107 @@ import javax.persistence.Transient;
 public class WmsActionGroupDetails extends BaseBean {
 
     private static final long serialVersionUID = 544189352378073377L;
-    @Column(name = "AG_ID")
+    @Column(name = "AG_ID", nullable = false)
     @ApiParam(value = "作业流程ID", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     private Long agId;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ", nullable = false)
     @ApiParam(value = "序号", example = "0")
+    @AnnoOutputColumn
     private Integer seq;
 
-    @Column(name = "OK_SEQ")
+    @Column(name = "OK_SEQ",  nullable = false)
     @ApiParam(value = "成功跳转步骤", example = "0")
+    @AnnoOutputColumn
     private Integer okSeq;
 
-    @Column(name = "NG_SEQ")
+    @Column(name = "NG_SEQ",nullable = false)
     @ApiParam(value = "失败跳转步骤", example = "0")
+    @AnnoOutputColumn
     private Integer ngSeq;
 
-    @Column(name = "VALUE_TYPE")
+    @Column(name = "VALUE_TYPE",  nullable = false)
     @ApiParam(value = "动作类型", example = "10")
+    @AnnoOutputColumn
     private Integer valueType;
 
-    @Column(name = "TO_UPPER")
+    @Column(name = "TO_UPPER", nullable = false)
     @ApiParam(value = "是否转为大写", example = "2")
+    @AnnoOutputColumn
     private Integer toUpper;
 
-    @Column(name = "LEN_CHECK")
+    @Column(name = "LEN_CHECK", columnDefinition = "int default 0")
     @ApiParam(value = "长度检查", example = "0")
     private Integer lenCheck;
 
-    @Column(name = "REGULAR_CHECK")
+    @Column(name = "REGULAR_CHECK", columnDefinition = "varchar(1000) default ''")
     @ApiParam(value = "正则校验")
     private String regularCheck;
 
-    @Column(name = "REGULAR_CHECK_FAIL_MSG")
+    @Column(name = "REGULAR_CHECK_FAIL_MSG", columnDefinition = "varchar(1000) default ''")
     @ApiParam(value = "正则校验失败提示")
     private String regularCheckFailMsg;
 
-    @Column(name = "AS_ID")
+    @Column(name = "AS_ID", nullable = false)
-    @ApiParam(value = "作业步骤", example = "0")
+    @ApiParam(value = "作业步骤")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     private Long asId;
 
-    @Column(name = "AT_ID")
+    @Column(name = "AT_ID",  nullable = false)
-    @ApiParam(value = "步骤类型编号", example = "0")
+    @ApiParam(value = "步骤类型编号")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     private Long atId;
 
-    @Transient
+    @Column(name = "GOTO_BTN_CODE", columnDefinition = "varchar(225) default ''")
-    @ApiParam(value = "作业步骤名称")
-    private String asName;
-
-    @Transient
-    @ApiParam(value = "步骤类型名称")
-    private String atName;
-
-    @Transient
-    @ApiParam(value = "流程名称")
-    private String agName;
-
-    @Column(name = "GOTO_BTN_CODE")
     @ApiParam(value = "跳转按钮代码")
     private String goToBtnCode;
 
-    @Column(name = "GOTO_BTN_NAME")
+    @Column(name = "GOTO_BTN_NAME", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "跳转按钮名称")
     private String goToBtnName;
 
-    @Column(name = "PRE_SHOW")
+    @Column(name = "PRE_SHOW", columnDefinition = "int default 0")
-    @ApiParam(value = "是否预显示", example = "1")
+    @ApiParam(value = "是否预显示")
     private Integer preShow;
 
-    @Column(name = "SHOW_AM_ID")
+    @Column(name = "SHOW_AM_ID", columnDefinition = "bigint(20) default 0")
-    @ApiParam(value = "回显组件方法ID", example = "1")
+    @ApiParam(value = "回显组件方法ID")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long showAmId;
 
-    @Column(name = "IS_COMMIT_ABLE")
+    @Column(name = "IS_COMMIT_ABLE",  nullable = false)
-    @ApiParam(value = "是否可提交", example = "2")
+    @ApiParam(value = "是否可提交")
+    @AnnoOutputColumn
     private Integer isCommitAble;
 
-    @Column(name = "IS_AUTO_OPEN_WINDOW")
+    @Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false)
-    @ApiParam(value = "是否自动开窗", example = "2")
+    @ApiParam(value = "是否自动开窗")
     private Integer isAutoOpenWindow;
 
-    @Column(name = "SEARCH_KEY")
+    @Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "搜索KEY")
     private String searchKey;
 
-    @Column(name = "GROUP_KEY")
+    @Column(name = "GROUP_KEY", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "分组KEY")
     private String groupKey;
 
+    @Transient
+    @ApiParam(value = "作业步骤名称")
+    private String asName;
+
+    @Transient
+    @ApiParam(value = "步骤类型名称")
+    private String atName;
+
+    @Transient
+    @ApiParam(value = "流程名称")
+    private String agName;
+
     public int getSeqVal() {
         return this.seq == null ? 0 : this.seq;
     }

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

@@ -1,5 +1,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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -29,31 +30,36 @@ import javax.persistence.Table;
 public class WmsActionModule extends BaseBean {
 
     private static final long serialVersionUID = 9117362998863937579L;
-    @Column(name = "AM_NAME")
+    @Column(name = "AM_NAME",nullable = false)
     @ApiParam("组件名称")
+    @AnnoOutputColumn
     public String amName;
 
-    @Column(name = "AM_DESC")
+    @Column(name = "AM_DESC",  nullable = false)
     @ApiParam("组件描述")
+    @AnnoOutputColumn
     public String amDesc;
 
-    @Column(name = "CALL_CLASS")
+    @Column(name = "CALL_CLASS",nullable = false)
     @ApiParam("实现类")
+    @AnnoOutputColumn
     public String callClass;
 
-    @Column(name = "AM_TYPE")
+    @Column(name = "AM_TYPE",  nullable = false)
-    @ApiParam(value = "组件类型", example = "0")
+    @ApiParam(value = "组件类型")
+    @AnnoOutputColumn
     public Integer amType;
 
-    @Column(name = "OP_TYPE_CODE")
+    @Column(name = "OP_TYPE_CODE", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "作业类型")
     public String opTypeCode;
 
-    @Column(name = "IS_SHOW_INFO")
+    @Column(name = "IS_SHOW_INFO", nullable = false)
-    @ApiParam(value = "是否实现回显", example = "0")
+    @ApiParam(value = "是否实现回显")
+    @AnnoOutputColumn
     public Integer isShowInfo;
 
-    @ApiParam(value = "作业类型名称", example = "0")
+    @ApiParam(value = "作业类型名称")
     public String opTypeName;
 
     public WmsActionModule() {

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

@@ -1,5 +1,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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -31,29 +32,34 @@ import javax.persistence.Table;
 public class WmsActionModuleParam extends BaseBean {
 
     private static final long serialVersionUID = 8099621042858629818L;
-    @Column(name = "AM_ID")
+    @Column(name = "AM_ID", nullable = false)
-    @ApiParam(value = "组件ID", example = "0")
+    @ApiParam(value = "组件ID")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     public Long amId;
 
-    @Column(name = "METHOD_NAME")
+    @Column(name = "METHOD_NAME", columnDefinition = "varchar(255) default ''")
     @ApiParam("组件执行方法名称")
+    @AnnoOutputColumn
     public String methodName;
 
-    @Column(name = "PARAM_CODE")
+    @Column(name = "PARAM_CODE", nullable = false)
     @ApiParam("参数编码")
+    @AnnoOutputColumn
     public String paramCode;
 
-    @Column(name = "PARAM_NAME")
+    @Column(name = "PARAM_NAME",  nullable = false)
     @ApiParam("参数名称")
+    @AnnoOutputColumn
     public String paramName;
 
-    @Column(name = "PARAM_VALUE_LIST")
+    @Column(name = "PARAM_VALUE_LIST", columnDefinition = "varchar(225) default ''")
     @ApiParam("参数可选值列表")
     public String paramValueList;
 
-    @Column(name = "PARAM_TYPE")
+    @Column(name = "PARAM_TYPE",nullable = false)
     @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串,30=出参】", example = "0")
+    @AnnoOutputColumn
     public Integer paramType;
 
     public int getParamTypeVal() {

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

@@ -1,5 +1,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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -31,29 +32,33 @@ import javax.persistence.Table;
 public class WmsActionStep extends BaseBean {
 
     private static final long serialVersionUID = 6460096995982059959L;
-    @Column(name = "AS_NAME_E")
+    @Column(name = "AS_NAME_E", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "英文类型名称")
     private String asNameE;
 
-    @Column(name = "AS_DESC_E")
+    @Column(name = "AS_DESC_E", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "英文类型描述")
     private String asDescE;
 
-    @Column(name = "AS_NAME_C")
+    @Column(name = "AS_NAME_C", nullable = false)
     @ApiParam(value = "中文类型名称")
+    @AnnoOutputColumn
     private String asNameC;
 
-    @Column(name = "AS_DESC_C")
+    @Column(name = "AS_DESC_C", nullable = false)
     @ApiParam(value = "中文类型描述")
+    @AnnoOutputColumn
     private String asDescC;
 
-    @Column(name = "AT_NAME_C_RDD")
+    @Column(name = "AT_NAME_C_RDD",  nullable = false)
     @ApiParam(value = "步骤类型名称")
+    @AnnoOutputColumn
     private String atNameCRdd;
 
-    @Column(name = "AT_ID")
+    @Column(name = "AT_ID", nullable = false)
     @ApiParam(value = "步骤类型编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     private Long atId;
 
     //get单独处理

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

@@ -1,5 +1,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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -33,18 +34,21 @@ import javax.persistence.*;
 public class WmsActionStepCall extends BaseBean {
 
     private static final long serialVersionUID = -6013283534745803464L;
-    @Column(name = "AS_ID")
+    @Column(name = "AS_ID",nullable = false)
     @ApiParam(value = "作业步骤ID", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     public Long asId;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ",nullable = false)
     @ApiParam(value = "序号", example = "0")
+    @AnnoOutputColumn
     public Integer seq;
 
-    @Column(name = "AM_ID")
+    @Column(name = "AM_ID", nullable = false)
     @ApiParam(value = "处理组件ID", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     public Long amId;
 
     @Transient
@@ -55,12 +59,14 @@ public class WmsActionStepCall extends BaseBean {
     @ApiParam(value = "组件描述")
     public String amDesc;
 
-    @Column(name = "AM_TYPE")
+    @Column(name = "AM_TYPE",nullable = false)
-    @ApiParam(value = "组件类型", example = "0")
+    @ApiParam(value = "组件类型")
+    @AnnoOutputColumn
     public Integer amType;
 
-    @Column(name = "OK_VALUE")
+    @Column(name = "OK_VALUE", nullable = false)
-    @ApiParam(value = "成功标志", example = "10")
+    @ApiParam(value = "成功标志")
+    @AnnoOutputColumn
     public Integer okValue;
 
     public int getAmTypeVal() {

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

@@ -1,5 +1,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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -32,25 +33,29 @@ import javax.persistence.Transient;
 public class WmsActionStepCallParam extends BaseBean {
 
     private static final long serialVersionUID = -2813779192436803301L;
-    @Column(name = "AGD_ID")
+    @Column(name = "AGD_ID", nullable = false)
     @ApiParam(value = "流程明细编号")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     private Long agdId;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ",nullable = false)
     @ApiParam(value = "序号")
+    @AnnoOutputColumn
     private Integer seq;
 
-    @Column(name = "AM_ID")
+    @Column(name = "AM_ID", nullable = false)
     @ApiParam(value = "处理组件编号")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn
     private Long amId;
 
-    @Column(name = "PARAM_CODE")
+    @Column(name = "PARAM_CODE",nullable = false)
     @ApiParam(value = "参数编码")
+    @AnnoOutputColumn
     private String paramCode;
 
-    @Column(name = "PARAM_VALUE")
+    @Column(name = "PARAM_VALUE", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "参数值")
     private String paramValue;
 

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

@@ -1,5 +1,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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -21,31 +22,34 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
-@Table(name="WMS_ACTION_TYPE")
+@Table(name = "WMS_ACTION_TYPE")
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api(value="作业步骤类型信息",description = "作业步骤类型信息")
+@Api(value = "作业步骤类型信息", description = "作业步骤类型信息")
 public class WmsActionStepType extends BaseBean {
 
     private static final long serialVersionUID = -8019644718382990603L;
-    @Column(name = "AT_NAME_E")
+    @Column(name = "AT_NAME_E", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "英文类型名称")
     private String atNameE;
 
-    @Column(name = "AT_DESC_E")
+    @Column(name = "AT_DESC_E", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "英文类型描述")
     private String atDescE;
 
-    @Column(name = "AT_NAME_C")
+    @Column(name = "AT_NAME_C", nullable = false)
     @ApiParam(value = "中文类型名称")
+    @AnnoOutputColumn
     private String atNameC;
 
-    @Column(name = "AT_DESC_C")
+    @Column(name = "AT_DESC_C", nullable = false)
     @ApiParam(value = "中文类型描述")
+    @AnnoOutputColumn
     private String atDescC;
 
-    @Column(name = "FUN_CALL_NAME")
+    @Column(name = "FUN_CALL_NAME", nullable = false)
     @ApiParam(value = "方法调用名称")
+    @AnnoOutputColumn
     private String funCallName;
 }

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

@@ -179,6 +179,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @Transient
     public String title;
 
+    @Column(name = "TAG")
+    @ApiParam(value = "标签")
+    private String tag;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }

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

@@ -114,8 +114,21 @@ public class WmsLocate extends BaseBean {
     @ApiParam(value = "加密编码")
     private String encryptionNo;
 
+    @Column(name = "LAST_CS_TIME")
+    @ApiParam(value = "末次盘点时间")
+    private String lastCsTime;
+
+    @Transient
+    @ApiParam(value = "末次盘点开始时间")
+    private String lastCsTimeStart ;
+
+    @Transient
+    @ApiParam(value = "末次盘点结束时间")
+    private String lastCsTimeEnd;
+
     public WmsLocate() {
     }
+
     public WmsLocate(String locateNo,Integer destBoxQty) {
         this.locateNo = locateNo;
         this.destBoxQty = destBoxQty;

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

@@ -30,7 +30,7 @@ import javax.persistence.*;
         @Index(columnList = "ORGANIZE_CODE"),
         @Index(columnList = "PART_NO")
 })
-@Api("库存移动单主表信息")
+@Api("库存移动单处理成功后的记录")
 public class WmsMoveToERP extends BaseBean {
 
     private static final long serialVersionUID = -6223527594941733060L;

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

@@ -0,0 +1,157 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : WMS_拉动计划任务明细表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-10 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_PULL_TASK_DETAILS")
+@Api("WMS_拉动计划任务明细表")
+public class WmsPullTaskDetails extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592736L;
+
+    @Column(name="WROKORDER_NO")
+    @ApiParam("工单号")
+    private String woekorderNo;
+
+    @Column(name="ITEM")
+    @ApiParam(value = "行号", example = "0")
+    private Integer item = 0;
+
+    @Column(name="TERMINAL_NO")
+    @ApiParam("工位代码")
+    private String terminalNo;
+
+    @Column(name="LOCATE_NO")
+    @ApiParam("库位代码")
+    private String locateNo;
+
+    @Column(name="LOCATE_CAPACITY")
+    @ApiParam("库位容量")
+    private String locateCapacity;
+
+    @Column(name="PART_NO")
+    @ApiParam("零件编号")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("零件名称")
+    private String partNameRdd;
+
+    @Column(name="PLAN_PACK_COUNT")
+    @ApiParam(value = "计划容器数", example = "0")
+    private Integer planPackCount = 0;
+
+    @Column(name="FIRST_BATCH_QTY")
+    @ApiParam(value = "首批批量", example = "0")
+    private Integer firstBatchQty = 0;
+
+    @Column(name="FIRST_PACK_COUNT")
+    @ApiParam(value = "首批容器数", example = "0")
+    private Integer firstPackCount = 0;
+
+    @Column(name="REQUEST_QTY")
+    @ApiParam(value = "补货批量", example = "0")
+    private Integer requestQty = 0;
+
+    @Column(name="REQUEST_PACK_COUNT")
+    @ApiParam(value = "补货容器数", example = "0")
+    private Integer requestPackCount = 0;
+
+    @Column(name="REQUEST_LOT_NO")
+    @ApiParam(value = "补货批次", example = "0")
+    private Integer requestLotNo = 0;
+
+    @Column(name="REQUEST_TOTAL_COUNT")
+    @ApiParam(value = "补货累加次数", example = "0")
+    private Integer requestTotalCount = 0;
+
+    @Column(name="LAST_REQUEST_TIME")
+    @ApiParam("上一次补货时间")
+    private String lastRequestTtime;
+
+    @Column(name="BOOT_QTY")
+    @ApiParam(value = "尾箱批量", example = "0")
+    private Integer bootQty = 0;
+
+    @Column(name="BOOT_PACK_COUNT")
+    @ApiParam(value = "尾箱容器数", example = "0")
+    private Integer bootPackCount = 0;
+
+    @Column(name="BOOT_LOT_NO")
+    @ApiParam(value = "尾箱批次", example = "0")
+    private Integer bootLotNo = 0;
+
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value = "单据状态", example = "0")
+    private Integer orderStatus = 0;
+
+    public Integer getOrderStatus() {
+        return orderStatus == null ? 0 : this.orderStatus.intValue();
+    }
+
+    public Integer getBootLotNo() {
+        return bootLotNo == null ? 0 : this.bootLotNo.intValue();
+    }
+
+    public Integer getBootPackCount() {
+        return bootPackCount == null ? 0 : this.bootPackCount.intValue();
+    }
+
+    public Integer getBootQty() {
+        return bootQty == null ? 0 : this.bootQty.intValue();
+    }
+
+    public Integer getRequestTotalCount() {
+        return requestTotalCount == null ? 0 : this.requestTotalCount.intValue();
+    }
+
+    public Integer getRequestLotNo() {
+        return requestLotNo == null ? 0 : this.requestLotNo.intValue();
+    }
+
+    public Integer getRequestPackCount() {
+        return requestPackCount == null ? 0 : this.requestPackCount.intValue();
+    }
+
+    public Integer getRequestQty() {
+        return requestQty == null ? 0 : this.requestQty.intValue();
+    }
+
+    public Integer getFirstPackCount() {
+        return firstPackCount == null ? 0 : this.firstPackCount.intValue();
+    }
+
+    public Integer getFirstBatchQty() {
+        return firstBatchQty == null ? 0 : this.firstBatchQty.intValue();
+    }
+
+    public Integer getPlanPackCount() {
+        return planPackCount == null ? 0 : this.planPackCount.intValue();
+    }
+
+    public Integer getItem() {
+        return item == null ? 0 : this.item.intValue();
+    }
+
+}

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

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : WMS_拉动计划任务主表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-09 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_PULL_TASK_MASTER")
+@Api("WMS_拉动计划任务主表")
+public class WmsPullTaskMaster extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592736L;
+
+    @Column(name="WROKORDER_NO")
+    @ApiParam("工单号")
+    private String woekorderNo;
+
+    @Column(name="PDLINE_NO")
+    @ApiParam("产线代码")
+    private String pdlineNo;
+
+    @Column(name="PLAN_PRODUCT_TIME")
+    @ApiParam("生产日期")
+    private String planProductTime;
+
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次代码")
+    private String shitNo;
+
+    @Column(name="START_PRODUCT_TIME")
+    @ApiParam("开始生产时间")
+    private String startProductTime;
+
+    @Column(name="END_PRODUCT_TIME")
+    @ApiParam("结束生产时间")
+    private String endProductTime;
+
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value = "单据状态", example = "0")
+    private Integer orderStatus = 0;
+
+    public Integer getOrderStatus() {
+        return orderStatus == null ? 0 : this.orderStatus.intValue();
+    }
+
+
+}

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 车辆信息
@@ -71,7 +72,7 @@ public class WmsTmsShippingExt extends BaseBean {
 
     @Column(name="ORDER_STATUS")
     @ApiParam(value ="单据状态")
-    private String orderStatus;
+    private Integer orderStatus;
 
     @Column(name="CUST_NAME")
     @ApiParam(value ="客户名称RDD")
@@ -97,4 +98,9 @@ public class WmsTmsShippingExt extends BaseBean {
     @ApiParam(value =" 申请部门")
     private String depart;
 
+
+    @Transient
+    @ApiParam("物料编码")
+    private String partNo;
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -56,6 +56,12 @@ public class WmsInterfaceDataMapper extends BaseBean {
      */
     @Column(name = "SRC_WHERE", length = 255)
     public String srcWhere;
+
+    /**
+     * 来源表的分组条件，按分组发送，多个列名用半角逗号分隔
+     */
+    @Column(name = "SRC_GROUP_COLUMNS", length = 255)
+    public String srcGroupColumns;
     /**
      * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔
      * 例如：SYNFLG=Y,SYNDATE={#XX}