代码合并 2019-12-30 15:59:52

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -338,9 +338,10 @@ public class AndonManageQueue extends BaseManageQueue {
      * @param confirmTime
      * @param resetTime
      */
-    public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){
+    public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){
         this.organizeCode = organizeCode;
         this.workCenterNameRdd = workCenterNameRdd;
+        this.workCellCode = workCellCode;
         this.workCellNameRdd = workCellNameRdd;
         this.resetUser = resetUser;
         this.alarmCode = alarmCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java

@@ -67,6 +67,6 @@ public class MesWorkCell extends BaseBean {
     private String workCellType;
 
     public String getName(){
-        return this.workCellName;
+        return this.workCellCode;
     }
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java

@@ -21,6 +21,12 @@ public class AndonBoardModel {
     @ApiParam("工作单元名称")
     private String workCellName;
 
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
+    @ApiParam("生产线名称")
+    private String workCenterName;
+
     @ApiParam("安灯任务编号")
     private String andonOrderNo;
 
@@ -36,9 +42,12 @@ public class AndonBoardModel {
     @ApiParam("响应时长  单位：分钟")
     private Long responseTimeCount = 0L;
 
-    @ApiParam("解决时长  单位：分钟")
+    @ApiParam("响应时长  单位：分钟")
     private Long resetTimeCount = 0L;
 
+    @ApiParam("响应时长/响应时长(通用)  单位：分钟")
+    private Long commonTimeCount = 0L;
+
     @ApiParam("安灯正常处理的次数")
     private Integer inTime = 0;
 
@@ -60,6 +69,8 @@ public class AndonBoardModel {
     @ApiParam("工位运行状态")
     private String  cellStatus;
 
+    @ApiParam("图表类型颜色")
+    private String color;
 
     public int getTotalTimeVal() {
         return totalTime == null ? 0 : totalTime;
@@ -85,6 +96,8 @@ public class AndonBoardModel {
         return resetTimeCount == null ? 0 : resetTimeCount;
     }
 
-
+    public double getCommonTimeCountVal() {
+        return commonTimeCount == null ? 0 : commonTimeCount;
+    }
 
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.andon.model;
 
 import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue;
+import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -40,27 +42,54 @@ public class AndonMenuInterfaceModel{
     @ApiParam("当前安灯类型故障比例")
     private Double  proportion = 0D;
 
-    @ApiParam("当前工厂的产线故障统计")
+    @ApiParam("图表类型颜色")
-    private List<AndonMenuInterfaceModel> andonWorkcenterList;
+    private String color;
 
-    @ApiParam("当前产线的所有故障统计")
+    @ApiParam("安灯状态")
-    private List<AndonBoardModel> alarmBrokenInfoList;
+    private Integer actionCode;
 
-    @ApiParam("当前产线的未解决故障统计")
+    @ApiParam("安灯状态名称")
-    private List<AndonBoardModel> pendingSolveBrokenInfoList;
+    private String actionName;
+
+    @ApiParam("mes微服调用-故障次数占比")
+    private List<AndonBoardModel> mesBrokenRatioList;
 
-    @ApiParam("当前产线的响应时长top10")
+    @ApiParam("故障时长类型占比 / 故障次数占比 / 工厂故障信息-产线故障时长-产线时长集合")
-    private List<AndonBoardModel> responseInfoList;
+    private List<AndonBoardModel> brokenRatioList;
 
-    @ApiParam("当前产线的解决时长top10")
+    @ApiParam("工厂故障信息-产线故障时长-安灯类型集合")
-    private List<AndonBoardModel> solveInfoList;
+    private List<AndonMenuInterfaceModel> workcenterBrokenTimeList;
 
-    @ApiParam("当前产线的异常时长top10")
+    @ApiParam("工厂故障信息-产线故障时长-产线集合")
-    private List<AndonBoardModel> exceptionInfoList;
+    private List<MesWorkCenter> workCenterList;
 
-    @ApiParam("当前产线的站点状态统计")
+    @ApiParam("产线整体状态")
+    private List<AndonMenuInterfaceModel> andonWorkcenterList;
+
+    @ApiParam("产品运行状态示意图")
     private List<CellGroupStatusModel> andonCellGroupStatusList;
 
+    @ApiParam("事件设备时长TOP10")
+    private List<AndonMenuInterfaceModel> equTimeList;
+
+    @ApiParam("事件设备时长TOP10-次数")
+    private List<String> equInTimeList;
+
+    @ApiParam("事件质量时长TOP10")
+    private List<AndonMenuInterfaceModel> qualityTimeList;
+
+    @ApiParam("事件质量时长TOP10-次数")
+    private List<String> qualityInTimeList;
+
+    @ApiParam("事件物料时长TOP10")
+    private List<AndonMenuInterfaceModel> partTimeList;
+
+    @ApiParam("事件物料时长TOP10-次数")
+    private List<String> partInTimeList;
+
+    @ApiParam("当前产线的未解决故障统计")
+    private List<AndonBoardModel> pendingSolveBrokenInfoList;
+
     public double getExceptionTimeVal() {
         return exceptionTime == null ? 0 : exceptionTime;
     }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -867,4 +867,13 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    public static DdlPackBean packHqlAndonMenu(String organizeCode, String workCenterCode, String startDateTime, String endDateTime) {
+        DdlPackBean result = DdlPackBean.getDdlPackBean(organizeCode);
+        if (!StringUtils.isEmpty(workCenterCode)) {
+            DdlPreparedPack.getStringEqualPack(workCenterCode, "workCenterCode", result);
+        }
+        DdlPreparedPack.timeBuilder(startDateTime, endDateTime, "createDatetime", result, true);
+        return result;
+    }
 }

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/bean/ProductOrder.java

@@ -53,11 +53,6 @@ public class ProductOrder extends BaseOrder {
     @ApiParam(value ="指定工艺路线")
     private String specifyRouting;
 
-    @Column(name="RESYNCHRONIZE")
-    @ApiParam(value ="是否同步")
-    @FieldAnnotation(defaultValue = "true")
-    private Boolean resynchronize;
-
     @Column(name="RECALC_COUNT")
     @ApiParam(value ="是否重新计算数量")
     @FieldAnnotation(defaultValue = "true")

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,16 @@ 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 String timeRangeColor;
+    private String eventColor;
+    private String name;
     private Long workId;
-    private String text;
 }

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description : 甘特图分页查询参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-11-22
+ * @Modify:
+ **/
+@Data
+@Api("甘特图分页查询参数")
+public class GanttEventModel {
+    private Long[] resourceIds;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date begin;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date end;
+}

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

@@ -4,8 +4,7 @@ import lombok.Data;
 
 @Data
 public class GanttLineModel {
-    private long id;
+    private long from;
-    private long source;
+    private long to;
-    private long target;
     private int type;
 }

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+/**
+ * KPI接口数据
+ */
+@Data
+public class KPIModel {
+    private Integer salesOrderCount;
+
+    private Integer productOrderCount;
+
+    private Integer schedWorkCount;
+
+    private Integer noSchedWorkCount;
+
+    private Integer confirmOrderCount;
+
+    private String produceTimes;
+
+    private String settingTimes;
+
+    private Integer overdueSalesCount;
+}

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

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ResourceLoadRequest {
+    private ApsEnumUtil.RESOURCE_LOAD_SPAN span;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date begin;     // 统计开始时间
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date end;       // 统计结束时间
+
+    private Long[] resourceIds;
+}

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

@@ -730,6 +730,10 @@ public class AndonEnumUtil {
     /**
      * 按灯标识
      * 1-呼叫，2-签到，3-解决
+     *
+     * 20190917将“提交”更改为“解决待审”
+     * 20190917将“审批”更改为“审批完成”
+     * 20190917增加"撤销已确认"枚举
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ANDON_ACTION_TAG {
@@ -737,10 +741,10 @@ public class AndonEnumUtil {
         SIGN(2,"20","响应"),
         RESOLVE(3,"30","解决"),
         CANCEL(4,"40", "撤销"),
-        COMMIT(5,"50","解决待审"),// 20190917将“提交”更改为“解决待审”
+        COMMIT(5,"50","解决待审"),
-        PASS(6,"60","审批完成"), // 20190917将“审批”更改为“审批完成”
+        PASS(6,"60","审批完成"),
         REJECT(7,"70","驳回"),
-        CONFIRMED_CANCEL(8,"80","撤销已确认"); // 20190917增加这个枚举
+        CONFIRMED_CANCEL(8,"80","撤销已确认");
 
         private int value;
         private String code;
@@ -944,27 +948,31 @@ public class AndonEnumUtil {
 
     /**
      * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测
+     *
+     * 下面的顺序不要更改，packBrokenTimeTypeRatioList方法有用到此枚举的顺序
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_TYPE {
-        PART("PART_ALARM", 110060104, "物料"),
+        EQUIP("EQUMENT_ALARM", 110060106, "设备", "#D06D6A"),
-        QUALITY("QUALITY_ALARM", 110060105, "质量"),
+        QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"),
-        EQUIP("EQUMENT_ALARM", 110060106, "设备"),
+        PART("PART_ALARM", 110060104, "物料", "#24BDBA"),
-        PROCESS("ROUTING_ALARM", 110060107, "工艺"),
+        PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"),
-        CHECK("OTHER_ALARM", 110060108, "自处理"),
+        CHECK("OTHER_ALARM", 110060108, "自处理", "#EAA510"),
-        FIX_ERROR("FIX_ERROR", 110060109, "自动报警");
+        FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F");
 
         private String value;
         private Integer code;
         private String description;
+        private String colour;
 
-        ALARM_TYPE(String value, Integer code, String description) {
+        ALARM_TYPE(String value, Integer code, String description, String colour) {
             this.value = value;
             this.code = code;
             this.description = description;
+            this.colour = colour;
         }
 
-         public String getValue() {
+        public String getValue() {
             return value;
         }
 
@@ -976,6 +984,10 @@ public class AndonEnumUtil {
             return description;
         }
 
+        public String getColour() {
+            return colour;
+        }
+
         public static String valueOfDescription(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -995,6 +1007,16 @@ public class AndonEnumUtil {
             }
             return tmp;
         }
+
+        public static String colourOfValue(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
+                    tmp = values()[i].colour;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**

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

@@ -1079,4 +1079,35 @@ public class ApsEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 资源符合时间间隔类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RESOURCE_LOAD_SPAN {
+        ONE_HOUR("ONE_HOUR", "1小时"),
+        TWO_HOUR("TWO_HOUR", "2小时"),
+        SIX_HOUR("SIX_HOUR", "6小时"),
+        EIGHT_HOUR("EIGHT_HOUR", "8小时"),
+        TWELVE_HOUR("TWELVE_HOUR", "12小时"),
+        ONE_DAY("ONE_DAY", "1天"),
+        ONE_WEEK("ONE_WEEK", "1周"),
+        ONE_MONTH("ONE_MONTH", "1月");
+
+        private String value;
+        private String description;
+
+        RESOURCE_LOAD_SPAN(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * @Description : 模块表单枚举类
@@ -1985,7 +1984,7 @@ public class BlockFormEnumUtil {
         }
 
         private String getJDBCUrlSQLServer(String database,String host,Integer port){
-            return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database;
+            return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
         }
     }
 

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

@@ -435,82 +435,82 @@ public class BlockReportEnumUtil {
             return tmp;
         }
     }
-
+//
-    /**
+//    /**
-     * HQL WHERE 条件
+//     * HQL WHERE 条件
-     */
+//     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+//    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum HQL_WHERE{
+//    public enum HQL_WHERE{
-
+//
-        GT(1, " > ", "大于"),
+//        GT(1, " > ", "大于"),
-        GT_EQUAL(2, " >= ", "大于等于"),
+//        GT_EQUAL(2, " >= ", "大于等于"),
-        LT(3, " < ", "小于等于"),
+//        LT(3, " < ", "小于等于"),
-        LT_EQUAL(4, " <= ", "小于等于"),
+//        LT_EQUAL(4, " <= ", "小于等于"),
-        LIKE(5, " LIKE ", "模糊"),
+//        LIKE(5, " LIKE ", "模糊"),
-        LIKE_LEFT(6, " LIKE ", "左模糊"),
+//        LIKE_LEFT(6, " LIKE ", "左模糊"),
-        LIKE_RIGHT(7, " LIKE ", "右模糊"),
+//        LIKE_RIGHT(7, " LIKE ", "右模糊"),
-        EQUAL(8, " = ", "等于"),
+//        EQUAL(8, " = ", "等于"),
-        EQUAL_NOT(9, " <> ", "不等于"),
+//        EQUAL_NOT(9, " <> ", "不等于"),
-//        AND(10, " AND ", "AND"),
+////        AND(10, " AND ", "AND"),
-//        OR(11, " OR ", "OR"),
+////        OR(11, " OR ", "OR"),
-//        NOT(12, " NOT ", "NOT"),
+////        NOT(12, " NOT ", "NOT"),
-        IN(8, " IN ", "IN"),
+//        IN(8, " IN ", "IN"),
-        IS_NULL(13, " IS NULL ", "IS NULL"),
+//        IS_NULL(13, " IS NULL ", "IS NULL"),
-        IS_NOT_NULL(14, " IS NOT NULL ", "IS NOT NULL");
+//        IS_NOT_NULL(14, " IS NOT NULL ", "IS NOT NULL");
-
+//
-        private int value;
+//        private int value;
-        private String name;
+//        private String name;
-        private String description;
+//        private String description;
-
+//
-        HQL_WHERE() {
+//        HQL_WHERE() {
-        }
+//        }
-
+//
-        HQL_WHERE(int value, String name, String description) {
+//        HQL_WHERE(int value, String name, String description) {
-            this.value = value;
+//            this.value = value;
-            this.name = name;
+//            this.name = name;
-            this.description = description;
+//            this.description = description;
-        }
+//        }
-
+//
-        public int getValue() {
+//        public int getValue() {
-            return value;
+//            return value;
-        }
+//        }
-
+//
-        public String getDescription() {
+//        public String getDescription() {
-            return description;
+//            return description;
-        }
+//        }
-
+//
-        public String getName() {
+//        public String getName() {
-            return name;
+//            return name;
-        }
+//        }
-
+//
-        public static HQL_WHERE valueOf(int val) {
+//        public static HQL_WHERE valueOf(int val) {
-            for (int i = 0; i < values().length; i++) {
+//            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+//                if (values()[i].value == val) {
-                    return values()[i];
+//                    return values()[i];
-                }
+//                }
-            }
+//            }
-            return null;
+//            return null;
-        }
+//        }
-
+//
-        public static String valueOfDescription(int val) {
+//        public static String valueOfDescription(int val) {
-            for (int i = 0; i < values().length; i++) {
+//            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+//                if (values()[i].value == val) {
-                    return values()[i].getDescription();
+//                    return values()[i].getDescription();
-                }
+//                }
-            }
+//            }
-            return null;
+//            return null;
-        }
+//        }
-
+//
-        public static int descOf(String desc) {
+//        public static int descOf(String desc) {
-            int tmp = 1;
+//            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
+//            for (int i = 0; i < values().length; i++) {
-                if (values()[i].name.equals(desc)) {
+//                if (values()[i].name.equals(desc)) {
-                    tmp = values()[i].value;
+//                    tmp = values()[i].value;
-                }
+//                }
-            }
+//            }
-            return tmp;
+//            return tmp;
-        }
+//        }
-    }
+//    }
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum HQL_WHERE_REF{

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

@@ -615,7 +615,8 @@ public class BlockSoftSwitchEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATABASE_OPERATE_TYPE{
         READ(1,"读取"),
-        WRITE(2,"写入");
+        WRITE(2,"写入"),
+        BATCH_WRITE(3,"批量写入");
 
         private int value;
         private String description;

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

@@ -148,11 +148,12 @@ public class CommonEnumUtil {
             }
             return null;
         }
-        public static int descriptionOfValue(String desc) {
+        public synchronized static int descriptionOfValue(String desc) {
             int tmp = IMPP.value;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].name().equals(desc)) {
+                if (values()[i].description.equals(desc)) {
                     tmp = values()[i].value;
+                    break;
                 }
             }
             return tmp;
@@ -1393,7 +1394,7 @@ public class CommonEnumUtil {
         LIKE(7, " LIKE ", "全模糊"),
         START_LIKE(7, " LIKE ", "前模糊"),
         END_LIKE(7, " LIKE ", "后模糊"),
-        IN(8, " IN ", "in"),
+        IN(8, " IN ", " in "),
         BETWEEN(9, " BETWEEN ", "区间查询(逗号区分)"),;
 
         private int value;

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

@@ -221,8 +221,10 @@ public class LacEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PARAM_VALUE_TYPE{
-        NUMBER(1,"数字"),
+        INTEGER(1,"整数"),
-        STRING(2,"字符串");
+        STRING(2,"字符串"),
+        FLOAT(3,"浮点"),
+        ORGIN(99,"原始数据");
 
         private int value;
         private String description;
@@ -341,4 +343,140 @@ public class LacEnumUtil {
         }
     }
 
+    /**
+     * 逻辑运算符
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOGICAL_OPERATOR{
+        OR(10,"或","||"),
+        AND(20,"与","&&");
+
+        private int value;
+        private String description;
+        private String operator;
+
+        LOGICAL_OPERATOR(int value, String description, String operator) {
+            this.value = value;
+            this.description = description;
+            this.operator = operator;
+        }
+
+        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 valueOfOperator(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].operator;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * 关系运算符
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RELATIONAL_OPERATOR{
+        GT(10,"大于",">"),
+        LT(20,"小于","<"),
+        EQ(30,"等于","=="),
+        NE(40,"不等于","!="),
+        GE(50,"大于等于",">="),
+        LE(60,"小于等于","<=");
+
+        private int value;
+        private String description;
+        private String operator;
+
+        RELATIONAL_OPERATOR(int value, String description,String operator) {
+            this.value = value;
+            this.description = description;
+            this.operator = operator;
+        }
+
+        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 RELATIONAL_OPERATOR valueOf(int val) {
+            RELATIONAL_OPERATOR tmp = EQ;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i];
+                }
+            }
+            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,158 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
+    /**
+     * JIS发运模式类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_JIS_PATTERN_TYPE {
+        ONE(10, "一套发运"),
+        TRUE(20, "多套发运"),
+        FALSE(30, "单产品多套发运");
+
+        private int value;
+        private String description;
+
+        MES_JIS_PATTERN_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;
+        }
+    }
+
+    /**
+     * 是否解析
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_IS_PARSE {
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        PLC_IS_PARSE(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 CALENDAR_TYPE {
+        DAY(10, "日"),
+        WEEK(20, "周"),
+        MONTH(30, "月"),
+        YEAR(40, "年");
+
+        private int value;
+        private String description;
+
+        CALENDAR_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;
+        }
+    }
+
+    /**
+     * 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, "是"),
@@ -194,7 +346,8 @@ public class MesEnumUtil {
         DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
         REPAIR("REPAIR", "处理措施"),
         SCRAP("SCRAP", "报废原因"),
-        QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准");
+        QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
+        WC_CHECK("WC_CHECK", "开线检查项");
 
         private String value;
         private String description;
@@ -341,7 +494,7 @@ public class MesEnumUtil {
     public enum IF_CONNECT_TYPE {
 
         DB("10", "DB"),
-        WEBSERVICE("20", "webservice "),
+        WEBSERVICE("20", "webservice"),
         RESTFUL("30", "restful");
 
         private String value;
@@ -404,15 +557,18 @@ public class MesEnumUtil {
             return value;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }
 
-        // 根据value返回枚举类型,主要在switch中使用
         public static ORGANIZATION_INIT_DATA getByValue(String value) {
-            for (ORGANIZATION_INIT_DATA mesInsertExcel : values()) {
+            for (ORGANIZATION_INIT_DATA organizationInitData : values()) {
-                if (mesInsertExcel.getValue().equals(value)) {
+                if (organizationInitData.getValue().equals(value)) {
-                    return mesInsertExcel;
+                    return organizationInitData;
                 }
             }
             return null;
@@ -716,7 +872,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -779,7 +935,7 @@ public class MesEnumUtil {
 
         SCRATCH(10, "划痕"),
         FRACTURE(20, "破碎"),
-        SCRAP_TYPE3(30, "缺失");
+        SCRAP_TYPE(30, "缺失");
 
         private int value;
         private String description;
@@ -1368,10 +1524,22 @@ public class MesEnumUtil {
         MES_OBJECT_CFG(230, "对象结构"),
         MES_WC_CHECK(240, "开线检查"),
         MES_QC_CHECK_STANDARD(250, "质量检测标准"),
-        MES_FAULT_CAUSE(260,"设备故障原因"),
+        MES_FAULT_CAUSE(260, "设备故障原因"),
-        MES_FAULT_METHOD(270,"设备故障处理措施"),
+        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, "工序工作单元"),
+        MES_DATASOURCE(360, "DB地址清单"),
+        MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"),
+        MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"),
+        MES_PLC(390,"PLC地址清单"),
+        MES_PROCESS(400,"工序信息"),
+        MES_KPSN_RULE(410,"关键件条码校验规则");
 
         private int value;
         private String description;
@@ -1389,7 +1557,6 @@ public class MesEnumUtil {
             return description;
         }
 
-        // 根据value返回枚举类型,主要在switch中使用
         public static MES_INSERT_EXCEL getByValue(int value) {
             for (MES_INSERT_EXCEL mesInsertExcel : values()) {
                 if (mesInsertExcel.getValue() == value) {
@@ -1548,7 +1715,6 @@ public class MesEnumUtil {
             return description;
         }
 
-        // 根据value返回枚举类型,主要在switch中使用
         public static MES_STATION_BOM_IS_REPEAT getByValue(int value) {
             for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) {
                 if (mesInsertExcel.getValue() == value) {
@@ -1747,7 +1913,6 @@ public class MesEnumUtil {
             return description;
         }
 
-        // 根据value返回枚举类型,主要在switch中使用
         public static MES_WORK_CELL_TYPE getByValue(int value) {
             for (MES_WORK_CELL_TYPE mesInsertExcel : values()) {
                 if (mesInsertExcel.getValue() == value) {
@@ -1781,7 +1946,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * pcn 动作类型
+     * MesProdBindRecord 动作类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_ACTION_TYPE {
@@ -1805,7 +1970,6 @@ public class MesEnumUtil {
             return description;
         }
 
-        // 根据value返回枚举类型,主要在switch中使用
         public static MES_ACTION_TYPE getByValue(int value) {
             for (MES_ACTION_TYPE mesInsertExcel : values()) {
                 if (mesInsertExcel.getValue() == value) {
@@ -1853,7 +2017,6 @@ public class MesEnumUtil {
             return description;
         }
 
-        // 根据value返回枚举类型,主要在switch中使用
         public static MES_IS_BIND_KEY getByValue(int value) {
             for (MES_IS_BIND_KEY mesInsertExcel : values()) {
                 if (mesInsertExcel.getValue() == value) {
@@ -1901,7 +2064,6 @@ public class MesEnumUtil {
             return description;
         }
 
-        // 根据value返回枚举类型,主要在switch中使用
         public static MES_REPAIR_STATUS getByValue(int value) {
             for (MES_REPAIR_STATUS mesInsertExcel : values()) {
                 if (mesInsertExcel.getValue() == value) {
@@ -1952,7 +2114,6 @@ public class MesEnumUtil {
             return description;
         }
 
-        // 根据value返回枚举类型,主要在switch中使用
         public static MES_OPERATE_TYPE getByValue(int value) {
             for (MES_OPERATE_TYPE mesInsertExcel : values()) {
                 if (mesInsertExcel.getValue() == value) {
@@ -2260,82 +2421,6 @@ public class MesEnumUtil {
     }
 
     /**
-     * mes按钮状态配置 判断符号
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_BUTTON_STATUS_JUDGE_FLAG {
-
-        EQUAL("=", "等于"),
-        NOT_EQUAL("!=", "不等于"),
-        GREATER_THAN(">", "大于"),
-        NOT_LESS_THAN(">=", "大于大于"),
-        LESS_THAN("<", "小于"),
-        NOT_GREATER_THAN("<=", "小于等于");
-
-        private String value;
-        private String description;
-
-        MES_BUTTON_STATUS_JUDGE_FLAG(String value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(String val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(val)) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
-     * mes按钮状态配置 逻辑符号
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_BUTTON_STATUS_LOGIC_FLAG {
-
-        AND("&&", "逻辑与"),
-        OR("||", "逻辑或");
-
-        private String value;
-        private String description;
-
-        MES_BUTTON_STATUS_LOGIC_FLAG(String value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(String val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(val)) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
      * MesWorkOrder实体对应的approvalStatus值  审批状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2769,7 +2854,8 @@ public class MesEnumUtil {
         STANDARD_ORDER(10, "标准工单"),
         BTS_ORDER(20, "BTS工单"),
         ATTEMPT_ORDER(30, "试制工单"),
-        BH_ORDER(40, "B&H工单");;
+        BH_ORDER(40, "B&H工单"),
+        JIT_ORDER(50, "JIT工单");
 
         private int value;
         private String description;
@@ -3073,6 +3159,80 @@ public class MesEnumUtil {
     }
 
     /**
+     * 质量标准配置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUALITY_STANDARD_TYPE {
+
+        NG_RATE(10, "不良率"),
+        INNER_PPM(20, "PPM"),
+        ONLINE_PPM(30, "线上PPM");
+
+        private int value;
+        private String description;
+
+        QUALITY_STANDARD_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;
+        }
+    }
+
+    /**
+     * 质量标准配置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUALITY_OBJECT_TYPE {
+
+        ORGANIZE(10, "工厂"),
+        WORK_CENTER_CODE(20, "产线"),
+        PRODUCT(30, "产品");
+
+        private int value;
+        private String description;
+
+        QUALITY_OBJECT_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;
+        }
+    }
+
+    /**
      * MesProduceSn实体对应的qcStatus值  条码表条码质量状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -3399,8 +3559,9 @@ public class MesEnumUtil {
         PCN_LOGIN(160, "PCN_LOGIN", ""),
         PCN_MENU(170, "PCN_MENU", ""),
         PCN_MODULE(180, "PCN_MODULE", ""),
-        PCN_LOGOUT(190, "PCN_LOGOUT", "");
+        PCN_LOGOUT(190, "PCN_LOGOUT", ""),
-
+        UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"),
+        PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", "");
 
         private int value;
         private String code;
@@ -3559,13 +3720,8 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WC_CHECK_TYPE {
-
+        MATERIAL(10, "MATERIAL", "物料"),
-        PERSON(10, "person", "人员"),
+        ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号");
-        EQUIPMENT(20, "equipment", "设备"),
-        MATERIAL(30, "material", "物料"),
-        ROUTE(40, "route", "工艺"),
-        ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
-        MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号");
 
         private int value;
         private String code;

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

@@ -75,7 +75,6 @@ public class MesPcnEnumUtil {
             return description;
         }
 
-        // 根据value返回枚举类型,主要在switch中使用
         public static MES_STATION_BOM_IS_REPEAT getByValue(int value) {
             for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) {
                 if (mesInsertExcel.getValue() == value) {
@@ -131,8 +130,9 @@ public class MesPcnEnumUtil {
         PCN_LOGIN(160, "PCN_LOGIN", ""),
         PCN_MENU(170, "PCN_MENU", ""),
         PCN_MODULE(180, "PCN_MODULE", ""),
-        PCN_LOGOUT(190, "PCN_LOGOUT", "");
+        PCN_LOGOUT(190, "PCN_LOGOUT", ""),
-
+        UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"),
+        PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", "");
 
         private int value;
         private String code;
@@ -192,7 +192,6 @@ public class MesPcnEnumUtil {
             return description;
         }
 
-        // 根据value返回枚举类型,主要在switch中使用
         public static MES_ACTION_TYPE getByValue(int value) {
             for (MES_ACTION_TYPE mesInsertExcel : values()) {
                 if (mesInsertExcel.getValue() == value) {
@@ -216,6 +215,46 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * MES_TYPE_CFG 类型信息
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_TYPE_CFG {
+
+        DEFECT("DEFECT", "缺陷"),
+        DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
+        REPAIR("REPAIR", "处理措施"),
+        SCRAP("SCRAP", "报废原因"),
+        QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
+        WC_CHECK("WC_CHECK", "开线检查项");
+
+        private String value;
+        private String description;
+
+        MES_TYPE_CFG(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String 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.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * MesProdBindRecord 是否是关键件
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -240,7 +279,6 @@ public class MesPcnEnumUtil {
             return description;
         }
 
-        // 根据value返回枚举类型,主要在switch中使用
         public static MES_IS_BIND_KEY getByValue(int value) {
             for (MES_IS_BIND_KEY mesInsertExcel : values()) {
                 if (mesInsertExcel.getValue() == value) {
@@ -364,7 +402,6 @@ public class MesPcnEnumUtil {
             return description;
         }
 
-        // 根据value返回枚举类型,主要在switch中使用
         public static MES_OPERATE_TYPE getByValue(int value) {
             for (MES_OPERATE_TYPE mesInsertExcel : values()) {
                 if (mesInsertExcel.getValue() == value) {
@@ -425,7 +462,6 @@ public class MesPcnEnumUtil {
             return tmp;
         }
 
-        // 根据value返回枚举类型,主要在switch中使用
         public static MES_MATCH_TYPE getByValue(int value) {
             for (MES_MATCH_TYPE mesMatchType : values()) {
                 if (mesMatchType.getValue() == value) {
@@ -707,7 +743,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;
@@ -1174,14 +1211,8 @@ public class MesPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WC_CHECK_TYPE {
-
+        MATERIAL(10, "MATERIAL", "物料"),
-        PERSON(10, "people", "人员"),
+        ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号");
-        EQUIPMENT(20, "equipments", "设备"),
-        MATERIAL(30, "materials", "物料"),
-        ROUTE(40, "routes", "工艺"),
-        ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
-        ENVIRONMENT(60, "environment", "环境");
-
 
         private int value;
         private String code;
@@ -1628,7 +1659,8 @@ public class MesPcnEnumUtil {
         STANDARD_ORDER(10, "标准工单"),
         BTS_ORDER(20, "BTS工单"),
         ATTEMPT_ORDER(30, "试制工单"),
-        BH_ORDER(40, "B&H工单");
+        BH_ORDER(40, "B&H工单"),
+        JIT_ORDER(50, "JIT工单");
 
         private int value;
         private String description;
@@ -2064,6 +2096,9 @@ public class MesPcnEnumUtil {
 
         NEVER(-1, "不过期"),
         ONE_HOUR(3600, "一小时"),
+        FIVE_MINS(300, "5分钟"),
+        HALF_HOUR(1800, "半小时"),
+        ONE_QUARTER(900, "一刻钟"),
         ONE_MIN(60, "一分钟");
 
         private int value;
@@ -2400,7 +2435,6 @@ public class MesPcnEnumUtil {
     }
 
 
-
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ONLINE_SEND_TYPE {
 

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;
+        }
     }
 
     /**
@@ -90,6 +110,7 @@ public class WmsEnumUtil {
     /**
      * 移库单主表：优先级
      */
+    @Deprecated
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRIORITY {
         NORMAL(1, "正常"), URGENT(2, "紧急");
@@ -122,6 +143,38 @@ public class WmsEnumUtil {
 
 
     /**
+     * 移库单主表：优先级  (PRIORITY_NEW)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRIORITY_NEW {
+        URGENT(1, "紧急"), NORMAL(2, "正常");
+        private int value;
+        private String description;
+
+        PRIORITY_NEW(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;
+        }
+    }
+    /**
      * 主表信息 单据类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -185,7 +238,8 @@ public class WmsEnumUtil {
         RECEIPT(20, "RECEIPT", "处理中"),
         RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
         CLOSED(40, "CLOSED", "已关闭"),
-        CANCELLED(50, "CANCELLED", "已取消");
+        CANCELLED(50, "CANCELLED", "已取消"),
+        BATCHING_FINISH(60, "BATCHING_FINISH", "配料完成");
 
         private int value;
         private String code;
@@ -447,7 +501,8 @@ public class WmsEnumUtil {
         LINE_LOCATE(50, "L", "线边库"),
         NC_LOCATE(60, "N", "NC库"),
         SPILLAGE_LOCATE(70, "Y", "溢料库"),
-        TRANSIT_LOCATE(80, "T", "在途库");
+        TRANSIT_LOCATE(80, "T", "在途库"),
+        UTENSIL_LOCATE(90, "U", "器具库");
 
         private int value;
         private String code;
@@ -646,7 +701,8 @@ public class WmsEnumUtil {
         KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
         FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
         KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"),
-        PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库");
+        PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"),
+        UTENSIL_CONSUMING(500,"UTENSIL_CONSUMING","器具领用");
 
         private int value;
         private String code;
@@ -830,7 +886,8 @@ public class WmsEnumUtil {
         VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY", "VDA事务查询"),
         VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
         VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
-        KT_PICK_RC("KT_PICK_RC", "坤泰拣货");
+        KT_PICK_RC("KT_PICK_RC", "坤泰拣货"),
+        UTENSIL_CONSUMING("UTENSIL_CONSUMING","器具领用");
         private String value;
         private String description;
 
@@ -905,8 +962,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_INFO_STATUS {
-        CREATE(10, 10, "创建"), FINISH(20, 20, "处理中"),
+        CREATE(10, 10, "创建"), HANDLEING(20, 20, "处理中"),
-        FAIL(30, 30, "已处理"), CLOSE(40, 40, "已关闭");
+        FINISH(30, 30, "已处理"), CLOSE(40, 40, "已关闭");
 
         private int value;
         private int code;
@@ -961,7 +1018,6 @@ public class WmsEnumUtil {
 
     /**
      * 业务表：库存条码状态
-     * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_STATUS {
@@ -971,7 +1027,7 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
-        //SCRAP(70, "报废"),
+        SCRAP(70,"报废"),
         COMMING(80, "在途");
 
         private int value;
@@ -1015,6 +1071,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;
+        }
+    }
+
     /**
      * 单据是否生成任务状态
      */
@@ -1240,7 +1352,8 @@ public class WmsEnumUtil {
         INVENTORY(20, "已盘"),
         FROZEN(30, "已冻结"),
         THAWING(40, "已解冻"),
-        RETURN_GOODS(50, "取消冻结");
+        RETURN_GOODS(50, "取消冻结"),
+        UNSETTLED_NCUNFREEZE(60, "未盘解冻");
 
         private int value;
         private String description;
@@ -1347,6 +1460,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 +2035,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 +2044,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;
@@ -2838,7 +2990,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_PART_TYPE {
-        RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器");
+        RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"),
+        UTENSIL(50, "器具");
 
         private int value;
         private String description;
@@ -2879,8 +3032,8 @@ public class WmsEnumUtil {
 
 
     public enum WMS_PART_TYPE_STR {
-        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器");
+        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器"),
-
+        UTENSIL("50", "器具");
         private String value;
         private String description;
 
@@ -2906,8 +3059,20 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String descriptionOfValue(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
+
+
     /**
      * 任务数据来源：检查子数据
      */
@@ -4304,4 +4469,328 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 收货看板状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RECEIVING_GOODS_STATUS {
+        WAIT_RECEIVING(10, "待收货"),
+        RECEIVING(20, "收货中"),
+        COMPLETE_RECEIVING(30, "收货完成"),
+        CLOSE(40,"已关闭"),
+        CANCEL(50,"已取消"),
+        UN_RECEIVED(60, "延迟未收货");
+
+        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;
+        }
+    }
+
+
+    /**
+     * 是否贵重物料
+     * 默认为2
+     */
+    public enum IS_VALUABLE {
+        TRUE(1, "贵重物料"), FALSE(2, "非贵重物料");
+
+        private int value;
+        private String description;
+
+        IS_VALUABLE(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;
+        }
+    }
+
+    /**
+     * 计划拉动明细表状态创建
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PULL_TASK_DETAILS_STATUS {
+        BE_HANDLE(10,"BE_HANDLE", "待处理"),
+        CANCELLATION(20,"CANCELLATION", "已处理");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PULL_TASK_DETAILS_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;
+        }
+    }
+
+    /**
+     * 计划拉动主表状态创建
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PULL_TASK_MASTER_STATUS {
+        CREATE(10,"CREATE", "创建"),
+        ENABLED(20,"ENABLED", "已启动"),
+        COMPLETE(30,"COMPLETE", "已完成"),
+        CLOSE(40,"CLOSE", "已关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PULL_TASK_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;
+        }
+    }
+
+    /**
+     * 计划拉动明细表状态创建
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum VENDOR_TYPE {
+        VENDOR(10, "供应商"), CARRIERS(20, "承运商");
+
+        private int value;
+        private String description;
+
+        VENDOR_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/util/StringUtil.java

@@ -1,5 +1,14 @@
 package cn.estsh.i3plus.pojo.base.util;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class StringUtil {
 
 	public static boolean isEmpty(Object obj){
@@ -10,4 +19,72 @@ 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());
+		}
+		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;
+		}
+	}
+
+	private static Pattern linePattern = Pattern.compile("_(\\w)");
+
+	/** 驼峰转下划线 */
+	public static Map<String, Object> humpToLine(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<>();
+		for (String str : map.keySet()) {
+			str = str.toLowerCase();
+			Matcher matcher = linePattern.matcher(str);
+			StringBuffer sb = new StringBuffer();
+			while (matcher.find()) {
+				matcher.appendReplacement(sb, matcher.group(1).toUpperCase());
+			}
+			matcher.appendTail(sb);
+			resultMap.put(sb.toString(), map.get(str));
+		}
+		return resultMap;
+	}
 }

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

@@ -9,6 +9,7 @@ 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;
@@ -84,6 +85,9 @@ public class LacCommandStackStep extends BaseBean {
     @ApiParam(value ="步骤任务列表")
     private List<LacCommandStackStepTask> stepTaskList;
 
+    @Transient
+    @ApiParam(value ="步骤任务检查")
+    private List<LacTaskCheck> taskCheckList;
 
     public LacCommandStackStep() {
     }

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

@@ -85,10 +85,10 @@ public class LacCommandStackStepTask extends BaseBean {
 //    @Column(name="STEP_NAME_RDD")
 //    @ApiParam(value ="步骤名称")
 //    private String stepNameRdd;
-//
+
-//    @Column(name="STEP_CODE_RDD")
+    @Column(name="STEP_CODE_RDD")
-//    @ApiParam(value ="步骤代码")
+    @ApiParam(value ="步骤代码")
-//    private String stepCodeRdd;
+    private String stepCodeRdd;
 
     @Column(name="TASK_ID")
     @ApiParam(value ="任务ID")
@@ -99,7 +99,7 @@ public class LacCommandStackStepTask extends BaseBean {
     @ApiParam(value ="步骤名称")
     private String taskNameRdd;
 
-    @Column(name="STEP_CODE_RDD")
+    @Column(name="TASK_CODE_RDD")
     @ApiParam(value ="任务代码")
     private String taskCodeRdd;
 

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,10 +77,12 @@ 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")
     @ApiParam(value ="参数值类型")
+    @AnnoOutputColumn(refClass = LacEnumUtil.PARAM_VALUE_TYPE.class)
     private Integer paramValueType;
 
     @Column(name="PARAM_DEFAULT_VALUE")

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

@@ -0,0 +1,108 @@
+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;
+import javax.persistence.Transient;
+
+/**
+ * @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;
+
+    @Column(name="TARGET_STEP_NAME_RDD")
+    @ApiParam(value ="目标步骤名称")
+    private String targetStepNameRdd;
+
+    @Transient
+    private String value;
+}

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/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/MesPcn.java

@@ -39,10 +39,18 @@ public class MesPcn extends BaseBean {
     @ApiParam("区域")
     private String areaCode;
 
+    @Column(name = "AREA_NAME")
+    @ApiParam("区域名称")
+    private String areaName;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
 
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
     @Column(name = "PCN_VERSION")
     @ApiParam("PCN版本")
     private String pcnVersion;

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")

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/MesWorkCellPoint.java

@@ -27,6 +27,11 @@ import javax.persistence.Table;
 @Table(name = "MES_WORK_CELL_POINT")
 @Api("工站队列")
 public class MesWorkCellPoint extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;

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")

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/model/QueueOrderModel.java

@@ -40,6 +40,14 @@ public class QueueOrderModel implements Serializable {
     @Transient
     @ApiParam("显示颜色")
     private String color;
+    @ApiParam("工厂代码")
+    private String organizeCode;
+    @ApiParam("展示行数")
+    private Integer prodNum;
+    @ApiParam("产线")
+    private String workCenterCode;
+    @ApiParam("工位")
+    private String workCellCode;
 
     public QueueOrderModel() {
     }

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

@@ -22,28 +22,17 @@ import java.util.*;
 @Api("开线管控model")
 public class WcCheckModel {
 
-    @ApiParam("人")
+    @ApiParam("工作中心")
-    private List<MesWcCheckRecord> people;
+    private String workCenterCode;
-    @ApiParam("人 列")
-    private Map<String, String> peopleColumn;
-
-    @ApiParam("机")
-    private List<MesWcCheckRecord> equipments;
-    @ApiParam("机 列")
-    private Map<String, String> equipmentsColumn;
 
-    @ApiParam("物料")
+    @ApiParam("工单")
-    private List<MesWcCheckRecord> materials;
+    private String workOrder;
-    @ApiParam("物料 列")
-    private Map<String, String> materialsColumn;
 
-    @ApiParam("法")
+    @ApiParam("产品号")
-    private List<MesWcCheckRecord> routes;
+    private String partNo;
-    @ApiParam("法 列")
-    private Map<String, String> routesColumn;
 
-    @ApiParam("对象list和列关系")
+    @ApiParam("是否通过")
-    private Map<String, String> dataColumnRelation;
+    private Integer isPass;
 
     @ApiParam("开线信号")
     private Integer onlineSignal;
@@ -51,43 +40,23 @@ public class WcCheckModel {
     @ApiParam("开线对象")
     MesWcCheckRecord onlineSignalEqu;
 
-    @ApiParam("是否通过")
-    private Integer isPass;
-
-    @ApiParam("工作中心")
-    private String workCenterCode;
-
-    @ApiParam("工单")
-    private String workOrder;
-
-    @ApiParam("产品号")
-    private String partNo;
-
     @ApiParam("需要展示的数据")
-    private Map<String, String> need2ShowMap;
+    private Map<String, String> titleMap;
 
+    @ApiParam("对象list和列关系")
+    private Map<String, Map<String, String>> dataColumnRelation;
+
+    @ApiParam("重构map")
+    private Map<String, List<MesWcCheckRecord>> dataMap;
 
     public WcCheckModel initialWcCheckModel() {
         WcCheckModel wcCheckModel = new WcCheckModel();
-        wcCheckModel.setPeople(new ArrayList<>());
-        wcCheckModel.setEquipments(new ArrayList<>());
-        wcCheckModel.setMaterials(new ArrayList<>());
-        wcCheckModel.setRoutes(new ArrayList<>());
-        wcCheckModel.setPeopleColumn(new HashMap<>());
-        wcCheckModel.setEquipmentsColumn(new HashMap<>());
-        wcCheckModel.setMaterialsColumn(new HashMap<>());
-        wcCheckModel.setRoutesColumn(new HashMap<>());
         wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue());
         wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue());
         onlineSignalEqu = new MesWcCheckRecord();
-        wcCheckModel.setNeed2ShowMap(new HashMap<>());
+        wcCheckModel.setTitleMap(new LinkedHashMap<>());
-
+        wcCheckModel.setDataMap(new LinkedHashMap<>());
-        Map<String, String> dataColumnRelationMap = new HashMap<>();
+        wcCheckModel.setDataColumnRelation(new LinkedHashMap<>());
-        dataColumnRelationMap.put("people", "peopleColumn");
-        dataColumnRelationMap.put("equipments", "equipmentsColumn");
-        dataColumnRelationMap.put("materials", "materialsColumn");
-        dataColumnRelationMap.put("routes", "routesColumn");
-        wcCheckModel.setDataColumnRelation(dataColumnRelationMap);
         return wcCheckModel;
     }
 

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;
     }
 
@@ -157,18 +155,24 @@ public class MesHqlPack {
         }
 
         // 时间段查询
-        DdlPreparedPack.timeBuilder(
+        if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
-                mesWorkOrder.getStartTimeStart(),
+            DdlPreparedPack.timeBuilder(
-                mesWorkOrder.getStartTimeEnd(),
+                    mesWorkOrder.getStartTimeStart(),
-                "startTime", packBean, true);
+                    mesWorkOrder.getStartTimeEnd(),
-        DdlPreparedPack.timeBuilder(
+                    "startTime", packBean, true);
-                mesWorkOrder.getEndTimeStart(),
+        }
-                mesWorkOrder.getEndTimeEnd(),
+        if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) {
-                "endTime", packBean, true);
+            DdlPreparedPack.timeBuilder(
-        DdlPreparedPack.timeBuilder(
+                    mesWorkOrder.getEndTimeStart(),
-                mesWorkOrder.getCreateDateTimeStart(),
+                    mesWorkOrder.getEndTimeEnd(),
-                mesWorkOrder.getCreateDateTimeEnd(),
+                    "endTime", packBean, true);
-                "createDatetime", packBean, true);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesWorkOrder.getCreateDateTimeStart(),
+                    mesWorkOrder.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
         DdlPreparedPack.getOrderDefault(mesWorkOrder);
         DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
         return packBean;
@@ -292,32 +296,35 @@ public class MesHqlPack {
      */
     public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
         DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode());
-        if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
+        if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
             DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
         }
 
-        if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getProductSn())) {
+        if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
             DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
         }
 
-        if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getPartNo())) {
+        if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
         }
 
-        if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
+        if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
         }
 
         // 时间段查询
-        DdlPreparedPack.timeBuilder(
+        if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) {
-                mesProduceSn.getCreateDateTimeStart(),
+            DdlPreparedPack.timeBuilder(
-                mesProduceSn.getCreateDateTimeEnd(),
+                    mesProduceSn.getCreateDateTimeStart(),
-                "createDatetime", packBean, true);
+                    mesProduceSn.getCreateDateTimeEnd(),
-        DdlPreparedPack.timeBuilder(
+                    "createDatetime", packBean, true);
-                mesProduceSn.getOutWorkCenterTimeStart(),
+        }
-                mesProduceSn.getOutWorkCenterTimeEnd(),
+        if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
-                "outWorkCenterTime", packBean, true);
+            DdlPreparedPack.timeBuilder(
-
+                    mesProduceSn.getOutWorkCenterTimeStart(),
+                    mesProduceSn.getOutWorkCenterTimeEnd(),
+                    "outWorkCenterTime", packBean, true);
+        }
         return packBean;
     }
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.annotation;
+
+
+import java.lang.annotation.*;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/25 1:45 下午
+ * @Description:
+ **/
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+@Documented
+public @interface UseMongoDb {
+}

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

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.mes.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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/12 4:00 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_WMS_PPM")
+@Api("WMS PPM 接口表")
+public class IfWmsPpm extends BaseBean {
+
+    @Column(name = "YEAR")
+    @ApiParam("年")
+    private String year;
+
+    @Column(name = "MONTH")
+    @ApiParam("月")
+    private String month;
+
+    @Column(name = "PPM_VALUE")
+    @ApiParam("PPM值")
+    private String ppmValue;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+}

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

@@ -37,21 +37,9 @@ public class MesButtonStatus extends BaseBean {
     @ApiParam("实体类名称")
     private String ClassName;
 
-    @Column(name = "STATUS_FIELD")
+    @Column(name = "APPEND_HQL")
-    @ApiParam("状态字段")
+    @ApiParam("拼接HQL")
-    private String statusField;
+    private String appendHql;
-
-    @Column(name = "JUDGE_FLAG")
-    @ApiParam("判断符合")
-    private String judgeFlag;
-
-    @Column(name = "STATUS_VALUE")
-    @ApiParam("状态值")
-    private String statusValue;
-
-    @Column(name = "LOGIC_FLAG")
-    @ApiParam("逻辑符合")
-    private String logicFlag;
 
     @Column(name = "STATUS_DESC")
     @ApiParam("描述")

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 {
 
@@ -80,4 +77,12 @@ public class MesCustOrder extends BaseBean {
     @Transient
     @ApiParam(value = "订单日期查询用，查询结束日期", example = "2019-12-31 23:59:59")
     public String orderTimeEnd;
+
+    @Transient
+    @ApiParam("订单类型名称")
+    private String orderTypeName;
+
+    @Transient
+    @ApiParam("状态名称")
+    private String statusName;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.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;
 
 /**
  * @Author: Wynne.Lu
@@ -66,4 +67,8 @@ public class MesDataObject extends BaseBean {
     @Column(name = "SELF_ADDITION_VALUE")
     @ApiParam("自增列值")
     private Long selfAdditionValue;
+
+    @Transient
+    @ApiParam("操作类型名称")
+    private String operateTypeName;
 }

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/MesEquNotifyObjectCfg.java

@@ -48,4 +48,8 @@ public class MesEquNotifyObjectCfg extends BaseBean {
     @ApiParam("对象类型")
     private Integer notifyObjectType;
 
+    @Transient
+    @ApiParam("对象类型名称")
+    private String notifyObjectTypeName;
+
 }

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/MesEquTaskNotifyCfg.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 :设备作业通知配置
@@ -48,4 +49,16 @@ public class MesEquTaskNotifyCfg extends BaseBean {
     @ApiParam("通知方式")
     private Integer notifyPattern;
 
+    @Transient
+    @ApiParam("作业类型名称")
+    private String taskTypeName;
+
+    @Transient
+    @ApiParam("通知类型名称")
+    private String notifyTypeName;
+
+    @Transient
+    @ApiParam("通知方式名称")
+    private String notifyPatternName;
+
 }

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/MesKpsnRule.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -71,6 +72,10 @@ public class MesKpsnRule extends BaseBean {
     @ApiParam("供应商代码")
     private String supplierCode;
 
+    @Transient
+    @ApiParam("绑定规则名称")
+    private String bandRuleName;
+
     public int getLengthVal() {
         return this.length == null ? 0 : this.length;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.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;
 
 /**
  * @Author: Wynne.Lu
@@ -55,4 +56,8 @@ public class MesObjectCfg extends BaseBean {
     @ApiParam("是否存储")
     private Integer isSave;
 
+    @Transient
+    @ApiParam("是否存储")
+    private String isSaveName;
+
 }

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :包装规格
@@ -73,6 +74,22 @@ public class MesPackSpec extends BaseBean {
     @ApiParam("是否混包4")
     private Integer isMixed4;
 
+    @Transient
+    @ApiParam("是否混包名称")
+    private String isMixedName;
+
+    @Transient
+    @ApiParam("是否混包2名称")
+    private String isMixedName2;
+
+    @Transient
+    @ApiParam("是否混包3名称")
+    private String isMixedName3;
+
+    @Transient
+    @ApiParam("是否混包4名称")
+    private String isMixedName4;
+
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

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/MesPart.java

@@ -88,4 +88,16 @@ public class MesPart extends BaseBean {
     @Column(name = "PRODUCT_MATCH_TYPE")
     @ApiParam("产品编码匹配类型")
     private Integer productMatchType;
+
+    @Transient
+    @ApiParam("过程编码匹配类型名称")
+    private String processMatchTypeName;
+
+    @Transient
+    @ApiParam("包装编码匹配类型")
+    private String packageMatchTypeName;
+
+    @Transient
+    @ApiParam("产品编码匹配类型")
+    private String productMatchTypeName;
 }

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

@@ -37,10 +37,6 @@ public class MesPartObject extends BaseBean {
     @ApiParam("对象代码")
     private String objectCode;
 
-    @Column(name = "OBJECT_NAME")
-    @ApiParam("物料名称")
-    private String objectName;
-
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("生产线")
     private String workCenterCode;
@@ -60,4 +56,8 @@ public class MesPartObject extends BaseBean {
     @Transient
     @ApiParam("数据组号")
     private String groupNo;
+
+    @Transient
+    @ApiParam("对象名称")
+    private String objectName;
 }

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

@@ -39,10 +39,18 @@ public class MesPcn extends BaseBean {
     @ApiParam("区域")
     private String areaCode;
 
+    @Column(name = "AREA_NAME")
+    @ApiParam("区域名称")
+    private String areaName;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
 
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
     @Column(name = "PCN_VERSION")
     @ApiParam("PCN版本")
     private String pcnVersion;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.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:
@@ -79,6 +80,18 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value = "同步的时候是否区分工厂")
     private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 
+    @Transient
+    @ApiParam("同步方式")
+    private String syncPatternName;
+
+    @Transient
+    @ApiParam("同步类型名称")
+    private String syncTypeName;
+
+    @Transient
+    @ApiParam(value = "同步的时候是否区分工厂")
+    private String isIgnoreOrgName;
+
     public int getIsIgnoreOrgVal() {
         return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg;
     }

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")
@@ -102,6 +99,14 @@ public class MesPlanOrder extends BaseBean {
     public String areaCode;
 
     @Transient
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @Transient
+    @ApiParam("计划类型")
+    private String planTypeName;
+
+    @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
     public String startTimeStart;

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,8 @@ 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 java.math.BigDecimal;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -25,7 +23,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 +119,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 +133,36 @@ public class MesProduceSn extends BaseBean {
 
     @Transient
     @ApiParam("下线开始时间")
-    private String outWorkCenterStartTime;
+    private String outWorkCenterTimeStart;
 
     @Transient
     @ApiParam("下线结束时间")
-    private String outWorkCenterEndTime;
+    private String outWorkCenterTimeEnd;
+
+    @Transient
+    @ApiParam("操作类型名称")
+    private String operateTypeName;
+
+    @Transient
+    @ApiParam("条码状态名称")
+    private String snStatusName;
+
+    @Transient
+    @ApiParam("质量状态名称")
+    private String qcStatusName;
+
+    @Transient
+    @ApiParam("条码类型名称")
+    private String snTypeName;
+
+    public MesProduceSn() {
+    }
+
+    public MesProduceSn(String partNo, Integer qcStatus, Double qty) {
+        this.partNo = partNo;
+        this.qcStatus = qcStatus;
+        this.qty = qty;
+    }
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
@@ -184,7 +211,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")
@@ -120,7 +122,7 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("托盘号")
     private String trayNo;
 
-    @Column(name="OPERATE_TYPE")
+    @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;
 
@@ -128,6 +130,30 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("返回信息")
     private String resultMsg;
 
+    @Transient
+    @ApiParam("下线开始时间")
+    private String outWorkCenterTimeStart;
+
+    @Transient
+    @ApiParam("下线结束时间")
+    private String outWorkCenterTimeEnd;
+
+    @Transient
+    @ApiParam("操作类型名称")
+    private String operateTypeName;
+
+    @Transient
+    @ApiParam("条码状态名称")
+    private String snStatusName;
+
+    @Transient
+    @ApiParam("质量状态名称")
+    private String qcStatusName;
+
+    @Transient
+    @ApiParam("条码类型名称")
+    private String snTypeName;
+
     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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -11,7 +12,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 +28,13 @@ 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")
+})
+//@UseMongoDb
 @Api("生产数据")
 public class MesProductData extends BaseBean {
     @Column(name = "WORK_CENTER_CODE")
@@ -100,4 +109,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/MesProductEncodeCfg.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -43,4 +44,12 @@ public class MesProductEncodeCfg extends BaseBean {
     @Column(name = "RULE_CODE")
     @ApiParam("编码规则代码")
     private String ruleCode;
+
+    @Transient
+    @ApiParam("编码类型名称")
+    private String codeTypeName;
+
+    @Transient
+    @ApiParam("匹配类型名称")
+    private String matchTypeName;
 }

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/MesQcCheckStandard.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -64,4 +65,8 @@ public class MesQcCheckStandard extends BaseBean {
     @ApiParam("检测项类型")
     private String checkItemType;
 
+    @Transient
+    @ApiParam("检测类型名称")
+    private String checkTypeName;
+
 }

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :质量标准配置
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUALITY_STANDARD_CFG")
+@Api("质量标准配置")
+public class MesQualityStandardCfg extends BaseBean {
+
+    @Column(name = "STANDARD_TYPE")
+    @ApiParam("标准类型")
+    private Integer standardType;
+
+    @Column(name = "OBJECT_TYPE")
+    @ApiParam("对象类型")
+    private Integer objectType;
+
+    @Column(name = "OBJECT_KEY_VALUE")
+    @ApiParam("对象键值")
+    private String objectKeyValue;
+
+    @Column(name = "OBJECT_KEY")
+    @ApiParam("对象键")
+    private String objectKey;
+
+}

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")
@@ -46,7 +47,7 @@ public class MesRawPartSn extends BaseBean {
 
     @Column(name = "RAW_QTY")
     @ApiParam("数量")
-    private Long rawQty;
+    private Double rawQty;
 
     @Column(name = "LOT_NO")
     @ApiParam("生产批次")
@@ -64,7 +65,7 @@ public class MesRawPartSn extends BaseBean {
     @ApiParam("供应商代码")
     private String supplierCode;
 
-    public long getRawQtyVal() {
+    public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }
 

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/MesRouteProcessCell.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :工序工作单元
@@ -43,4 +44,12 @@ public class MesRouteProcessCell extends BaseBean {
     @ApiParam("工作中心")
     private String workCenterCode;
 
+    @Transient
+    @ApiParam("流程代码名称")
+    private String routeCodeName;
+
+    @Transient
+    @ApiParam("工序代码名称")
+    private String processCodeName;
+
 }

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/MesStationBom.java

@@ -88,6 +88,22 @@ public class MesStationBom extends BaseBean {
     @ApiParam(value = "绑定数量")
     private Double boundQty;
 
+    @Transient
+    @ApiParam(value = "是否可重复名称")
+    private String isRepeatName;
+
+    @Transient
+    @ApiParam(value = "是否检查名称")
+    private String isCheckName;
+
+    @Transient
+    @ApiParam(value = "是否投料配置名称")
+    private String isFeedName;
+
+    @Transient
+    @ApiParam(value = "是否绑定关键件名称")
+    private String isBindKeyName;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.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;
 
 /**
  * @Author: Wynne.Lu
@@ -51,4 +52,8 @@ public class MesWcCheck extends BaseBean {
     @ApiParam("检查标准")
     private String standard;
 
+    @Transient
+    @ApiParam("检查类型名称")
+    private String checkTypeName;
+
 }