Merge remote-tracking branch 'origin/dev' into dev

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

@@ -423,4 +423,165 @@ public class PtlEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * PCN同步PTL主数据同步类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SYNC_TYPE {
+
+        GET_PTL_DATA(1, "pcn获取Ptl数据"),
+        DATA_TO_PTL(2, "pcn推送数据至ptl");
+
+        private int value;
+        private String description;
+
+        SYNC_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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * PCN同步PTL主数据同步方式枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SYNC_PATTERN {
+
+        UPDATE(1, "修改"),
+        INSERT(2, "新增");
+
+        private int value;
+        private String description;
+
+        SYNC_PATTERN(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 Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRUE_OR_FALSE {
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        TRUE_OR_FALSE(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;
+        }
+    }
+
+    /**
+     * ptl-pcn定时任务状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PTL_PCN_TASK_STATUS {
+
+        OPEN(1, "开启"),
+        CLOSE(2, "关闭");
+
+        private int value;
+        private String description;
+
+        PTL_PCN_TASK_STATUS(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/PtlPcnEnumUtil.java

@@ -290,18 +290,20 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TAG_LIGHT_COLOR_CMD {
-        TAG_LIGHT_COLOR_RED("00", "红"),
-        TAG_LIGHT_COLOR_GREEN("01", "绿"),
-        TAG_LIGHT_COLOR_ORANGE("02", "橙"),
-        TAG_LIGHT_COLOR_BLUE("03", "蓝"),
-        TAG_LIGHT_COLOR_PINK_RED("04", "粉红"),
-        TAG_LIGHT_COLOR_BLUE_GREEN("05", "蓝绿");
+        TAG_LIGHT_COLOR_RED("00", 0, "红"),
+        TAG_LIGHT_COLOR_GREEN("01", 1, "绿"),
+        TAG_LIGHT_COLOR_ORANGE("02", 2, "橙"),
+        TAG_LIGHT_COLOR_BLUE("03", 3, "蓝"),
+        TAG_LIGHT_COLOR_PINK_RED("04", 4, "粉红"),
+        TAG_LIGHT_COLOR_BLUE_GREEN("05", 5, "蓝绿");
 
         private String code;
+        private Integer value;
         private String description;
 
-        TAG_LIGHT_COLOR_CMD(String code, String description) {
+        TAG_LIGHT_COLOR_CMD(String code, Integer value, String description) {
             this.code = code;
+            this.value = value;
             this.description = description;
         }
 
@@ -314,10 +316,24 @@ public class PtlPcnEnumUtil {
             return null;
         }
 
+        public static String valueOf(int value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
         public String getCode() {
             return code;
         }
 
+        public Integer getValue() {
+            return value;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -355,24 +371,26 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FINISH_TAG_LIGHT_MUSIC_CMD {
-        FINISH_TAG_LIGHT_MUSIC_00H("00", "Jingle bells"),
-        FINISH_TAG_LIGHT_MUSIC_01H("01", "Carmen"),
-        FINISH_TAG_LIGHT_MUSIC_02H("02", "Happy Chinese new year"),
-        FINISH_TAG_LIGHT_MUSIC_03H("03", "Edelweiss"),
-        FINISH_TAG_LIGHT_MUSIC_04H("04", "Going home"),
-        FINISH_TAG_LIGHT_MUSIC_05H("05", "PAPALA"),
-        FINISH_TAG_LIGHT_MUSIC_06H("06", "Classical"),
-        FINISH_TAG_LIGHT_MUSIC_07H("07", "Listen to the rhythm of the falling rain"),
-        FINISH_TAG_LIGHT_MUSIC_08H("08", "Rock and roll"),
-        FINISH_TAG_LIGHT_MUSIC_09H("09", "Happy birthday"),
-        FINISH_TAG_LIGHT_MUSIC_0AH("0A", "Do Re Me"),
-        FINISH_TAG_LIGHT_MUSIC_0BH("0B", "Strauss");
+        FINISH_TAG_LIGHT_MUSIC_00H("00", 0, "Jingle bells"),
+        FINISH_TAG_LIGHT_MUSIC_01H("01", 1, "Carmen"),
+        FINISH_TAG_LIGHT_MUSIC_02H("02", 2, "Happy Chinese new year"),
+        FINISH_TAG_LIGHT_MUSIC_03H("03", 3, "Edelweiss"),
+        FINISH_TAG_LIGHT_MUSIC_04H("04", 4, "Going home"),
+        FINISH_TAG_LIGHT_MUSIC_05H("05", 5, "PAPALA"),
+        FINISH_TAG_LIGHT_MUSIC_06H("06", 6, "Classical"),
+        FINISH_TAG_LIGHT_MUSIC_07H("07", 7, "Listen to the rhythm of the falling rain"),
+        FINISH_TAG_LIGHT_MUSIC_08H("08", 8, "Rock and roll"),
+        FINISH_TAG_LIGHT_MUSIC_09H("09", 9, "Happy birthday"),
+        FINISH_TAG_LIGHT_MUSIC_0AH("0A", 10, "Do Re Me"),
+        FINISH_TAG_LIGHT_MUSIC_0BH("0B", 11, "Strauss");
 
         private String code;
+        private Integer value;
         private String description;
 
-        FINISH_TAG_LIGHT_MUSIC_CMD(String code, String description) {
+        FINISH_TAG_LIGHT_MUSIC_CMD(String code, Integer value, String description) {
             this.code = code;
+            this.value = value;
             this.description = description;
         }
 
@@ -385,10 +403,24 @@ public class PtlPcnEnumUtil {
             return null;
         }
 
+        public static String valueOf(int value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
         public String getCode() {
             return code;
         }
 
+        public Integer getValue() {
+            return value;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -590,7 +622,7 @@ public class PtlPcnEnumUtil {
     public enum MonitorProcessMessageType {
         CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
         DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
-        EXCEPTION__DISCONNECT_CONTROL_CMD(25, "EXCEPTION__DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
+        EXCEPTION__DISCONNECT_CONTROL_CMD(25, "EXCEPTION_DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
         LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"),
         LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"),
         CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"),
@@ -1142,4 +1174,157 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 系统配置表枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CONFIG_TYPE {
+        FASTDFS_SAVE_PATH(10, "SAVE_PATH", ""),
+        NGINX_HOST(20, "NGINX_HOST", ""),
+        MES_STATION_SOCKET(30, "mes_station_socket", ""),
+        GATEWAY_IP(40, "GATEWAY_HOST", ""),
+        UPDATE_SYNC_TIME(50, "SYNC_DATA_URL", "UPDATE_SYNC_TIME"),
+        PCN_PULL(60, "SYNC_DATA_URL", "PCN_PULL"),
+        PCN_PUSH(70, "SYNC_DATA_URL", "PCN_PUSH"),
+        FDFS_DOWNLOAD(80, "SYNC_DATA_URL", "FDFS_DOWNLOAD"),
+        REWORK_REPAIR(90, "REWORK_REPAIR", ""),
+        OPC_LINK_SERVER_URL(100, "OPC_LINK", "OPC_LINK_SERVER_URL"),
+        OPC_LINK_USERNAME(110, "OPC_LINK", "OPC_LINK_USERNAME"),
+        OPC_LINK_PASSWORD(120, "OPC_LINK", "OPC_LINK_PASSWORD"),
+        OPC_LINK_REALM(130, "OPC_LINK", "OPC_LINK_REALM"),
+        OPC_LINK_CALLBACK(140, "OPC_LINK", "OPC_LINK_CALLBACK"),
+        SUPPLY_SWITCH(150, "SUPPLY_SWITCH", ""),
+        PCN_LOGIN(160, "PCN_LOGIN", ""),
+        PCN_MENU(170, "PCN_MENU", ""),
+        PCN_MODULE(180, "PCN_MODULE", ""),
+        PCN_LOGOUT(190, "PCN_LOGOUT", ""),
+        UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"),
+        PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
+        PCN_SYS_ALL_LANGUAGE(220,"PCN_SYS_ALL_LANGUAGE","PCN_SYS_ALL_LANGUAGE"),
+        PCN_SYS_RESOURCE_KEY_LANGUAGE(230,"PCN_SYS_RESOURCE_KEY_LANGUAGE","PCN_SYS_RESOURCE_KEY_LANGUAGE");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CONFIG_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * PCN同步PTL主数据同步类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SYNC_TYPE {
+
+        GET_PTL_DATA(1, "pcn获取Ptl数据"),
+        DATA_TO_PTL(2, "pcn推送数据至ptl");
+
+        private int value;
+        private String description;
+
+        SYNC_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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * PCN同步PTL主数据同步方式枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SYNC_PATTERN {
+
+        UPDATE(1, "修改"),
+        INSERT(2, "新增");
+
+        private int value;
+        private String description;
+
+        SYNC_PATTERN(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 Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.mes.pcn.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;
@@ -12,7 +14,9 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description :生产区域
@@ -37,4 +41,19 @@ public class MesArea extends BaseBean implements Serializable {
     @Column(name = "AREA_NAME")
     @ApiParam("区域名称")
     private String areaName;
+
+    @Transient
+    @ApiParam(value = "子集列表")
+    private List<MesWorkCenter> childTreeList;
+
+    @Transient
+    @ApiParam(value = "名称")
+    private String name;
+
+    // 默认值 -1
+    @Transient
+    @ApiParam(value = "父节点", access = "父节点", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
+
 }

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

@@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
 @Api("流程工序关系")
 public class MesRouteProcess extends BaseBean implements Serializable {
     private static final long serialVersionUID = 3477334942090180010L;
+
     @Column(name = "ROUTE_CODE")
     @ApiParam("流程代码")
     private String routeCode;

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
 @Api("工序工作单元对照")
 public class MesRouteProcessCell extends BaseBean implements Serializable {
     private static final long serialVersionUID = -703779336699805482L;
+
     @Column(name = "ROUTE_CODE")
     @ApiParam("流程代码")
     private String routeCode;

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

@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("班次休息信息")
 public class MesShiftRest extends BaseBean implements Serializable {
     private static final long serialVersionUID = -8712815093203320523L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;

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

@@ -22,8 +22,8 @@ import java.io.Serializable;
 @Table(name = "MES_TIME")
 @Api("工步参数")
 public class MesTime extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 1562011791394529076L;
+
     @Column(name = "MODULE")
     @ApiParam("组件")
     private String module;

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

@@ -29,8 +29,8 @@ import java.io.Serializable;
 @Table(name = "MES_TORQUE_DETAIL")
 @Api("扭矩信息记录表")
 public class MesTorqueDetail extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 2900363253333046861L;
+
     @Column(name = "SN")
     @ApiParam("过程条码")
     private String serialNumber;

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

@@ -28,8 +28,8 @@ import java.io.Serializable;
 @Table(name = "MES_TYPE_CFG")
 @Api("类型信息表")
 public class MesTypeCfg extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -1699612238800419597L;
+
     @Column(name = "TYPE_CODE")
     @ApiParam("类型代码")
     private String typeCode;

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

@@ -27,8 +27,8 @@ import java.io.Serializable;
 @Table(name = "MES_WC_CHECK")
 @Api("开线检查")
 public class MesWcCheck extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 8057329890155185557L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;

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

@@ -30,8 +30,8 @@ import java.io.Serializable;
 })
 @Api("开线检查记录")
 public class MesWcCheckRecord extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -2173902677953303765L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
 @Api("工作单元")
 public class MesWorkCell extends BaseBean implements Serializable {
     private static final long serialVersionUID = -493313481197504121L;
+
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;

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

@@ -27,8 +27,8 @@ import java.io.Serializable;
 })
 @Api("工位监控异常信息")
 public class MesWorkCellMonitorLog extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -5634446206963213556L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;

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

@@ -28,8 +28,8 @@ import java.io.Serializable;
 @Table(name = "MES_WORK_CELL_PARAM")
 @Api("mes工作单元参数")
 public class MesWorkCellParam extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -3659425774085368499L;
+
     @Column(name = "PARAM_CODE")
     @ApiParam("参数代码")
     private String paramCode;

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
 @Api("工作单元参数配置")
 public class MesWorkCellParamCfg extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1739991089354361293L;
+
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;

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

@@ -28,8 +28,8 @@ import java.io.Serializable;
 @Table(name = "MES_WORK_CELL_POINT")
 @Api("工站队列")
 public class MesWorkCellPoint extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 2881841596678871526L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
 @Api("工作中心")
 public class MesWorkCenter extends BaseBean implements Serializable {
     private static final long serialVersionUID = -1119897685621371682L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;

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

@@ -27,11 +27,11 @@ import java.io.Serializable;
 @Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
-}
-)
+})
 @Api("生产工单")
 public class MesWorkOrder extends BaseBean implements Serializable {
     private static final long serialVersionUID = 8065877030194822855L;
+
     @Column(name = "ORDER_NO", nullable = false)
     @ApiParam("工单号")
     private String orderNo;

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

@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("生产工单日志")
 public class MesWorkOrderLog extends BaseBean implements Serializable {
     private static final long serialVersionUID = -7018645997937147427L;
+
     @Column(name = "ORDER_NO")
     @ApiParam("工单号")
     private String orderNo;

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

@@ -17,12 +17,21 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Api("pcn页面按钮控制model")
+@Api("mes页面按钮控制model")
 public class MesButtonFlagModel implements Serializable {
 
     @ApiParam("修改按钮")
     private boolean updateButton;
 
+    @ApiParam("按配置修改按钮")
+    private boolean updateButtonConfig;
+
+    @ApiParam("下达按钮")
+    private boolean transmitButton;
+
+//    @ApiParam("测试动态下达按钮")
+//    private boolean dynamicTransmitButtonTest;
+
     @ApiParam("启动按钮")
     private boolean startUpButton;
 
@@ -38,5 +47,11 @@ public class MesButtonFlagModel implements Serializable {
     @ApiParam("完成按钮")
     private boolean completeButton;
 
+    @ApiParam("关闭按钮-提醒")
+    private boolean closeButtonNoticeFlag;
+
+    @ApiParam("维修任务按钮")
+    private boolean repairButton;
+
 
 }

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

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -72,12 +73,12 @@ public class MesBom extends BaseBean implements Serializable {
 
     @Column(name = "EFF_START_TIME")
     @ApiParam(value = "生效时间")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String effStartTime;
 
     @Column(name = "EFF_END_TIME")
     @ApiParam(value = "失效时间")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String effEndTime;
 
     public double getQtyVal() {

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

@@ -27,7 +27,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_CUSTOMER")
-@Api("客户产线代码")
+@Api("客户信息")
 public class MesCustomer extends BaseBean implements Serializable {
     private static final long serialVersionUID = 6049359006918853570L;
     @Column(name = "CUSTOMER_CODE")

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

@@ -58,16 +58,15 @@ public class MesDatasource extends BaseBean implements Serializable {
     @ApiParam("密码")
     private String dsPassword;
 
+    @Column(name = "DS_DB_NAME")
+    @ApiParam("数据库名称")
+    private String dsDbName;
+
     @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")
     private String equipmentCode;
 
-    @Column(name = "DS_DB_NAMsE")
-    @ApiParam("数据库名称")
-    private String dsDbName;
-
     @Transient
     @ApiParam("设备名称")
     private String equipmentName;
-
 }

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

@@ -11,7 +11,9 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description:
@@ -41,4 +43,26 @@ public class MesDefect extends BaseBean implements Serializable {
     @Column(name = "DEFECT_TYPE")
     @ApiParam("缺陷类型")
     private String defectType;
+
+    @Transient
+    @ApiParam("缺陷类型名称")
+    private String defectTypeName;
+
+    @Transient
+    @ApiParam("缺陷位置")
+    private String defectLocation;
+
+    @Transient
+    @ApiParam("缺陷类型子集")
+    private List<MesDefect> mesDefectList;
+    public MesDefect() {
+
+    }
+
+    public MesDefect(String defectCode, String defectName, String defectType, String defectTypeName) {
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.defectType = defectType;
+        this.defectTypeName = defectTypeName;
+    }
 }

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

@@ -28,8 +28,8 @@ import java.io.Serializable;
 @Table(name = "MES_DEFECT_CAUSE")
 @Api("缺陷原因表")
 public class MesDefectCause extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -4078847071878784152L;
+
     @Column(name = "DC_CODE")
     @ApiParam("缺陷原因代码")
     private String dcCode;

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

@@ -8,12 +8,10 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description:
@@ -34,6 +32,7 @@ import java.util.Date;
 @Api("不良信息记录表")
 public class MesDefectRecord extends BaseBean implements Serializable {
     private static final long serialVersionUID = -6672562641463628050L;
+
     @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;
@@ -78,6 +77,9 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String memo;
 
+    @Transient
+    private List<MesDefect> mesDefectList;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }

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

@@ -8,11 +8,9 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @Description:
@@ -60,11 +58,11 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
 
     @Column(name = "QTY")
     @ApiParam("产品数量")
-    private Integer qty;
+    private Double qty;
 
     @Column(name = "DISMANTLE_QTY")
     @ApiParam("拆解数")
-    private Integer dismantleQty;
+    private BigDecimal dismantleQty;
 
     @Column(name = "ITEM_PART_NO")
     @ApiParam("子物料编码")
@@ -76,17 +74,24 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
 
     @Column(name = "OK_QTY")
     @ApiParam("合格数")
-    private Integer okQty;
+    private BigDecimal okQty;
 
     @Column(name = "MISS_QTY")
     @ApiParam("缺失数")
-    private Integer missQty;
+    private BigDecimal missQty;
 
     @Column(name = "SCRAP_QTY")
     @ApiParam("报废数")
-    private Integer scrapQty;
+    private BigDecimal scrapQty;
 
     @Column(name = "MEMO")
     @ApiParam("备注")
-    private String meno;
+    private String memo;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("关联批次")
+    private String lotNo;
+
+    @Transient
+    private String serialNumber;
 }

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

@@ -28,8 +28,8 @@ import java.io.Serializable;
 @Table(name = "MES_ESOP")
 @Api("作业指导书信息表(ODS)")
 public class MesEsop extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -2025246159538929513L;
+
     @Column(name = "PART_NO")
     @ApiParam("零件号")
     private String partNo;

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

@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("系统业务事件")
 public class MesEvent extends BaseBean implements Serializable {
     private static final long serialVersionUID = -2941486161983912085L;
+
     @Column(name = "EVENT_CODE")
     @ApiParam("事件代码")
     private String eventCode;

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

@@ -34,6 +34,7 @@ import java.io.Serializable;
 @Api("系统业务事件动作")
 public class MesEventAction extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1188871471049646861L;
+
     @Column(name = "EVENT_CODE")
     @ApiParam("事件代码")
     private String eventCode;

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

@@ -27,8 +27,8 @@ import java.io.Serializable;
 @Table(name = "MES_FI_CFG")
 @Api("首检件配置")
 public class MesFiCfg extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 6919161447256638470L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("产线")
     private String workCenterCode;

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

@@ -27,8 +27,8 @@ import java.io.Serializable;
 @Table(name = "MES_FILE")
 @Api("文件表")
 public class MesFile extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 5057339077996828057L;
+
     @Column(name = "FILE_NAME")
     @ApiParam("文件名称")
     private String fileName;

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

@@ -15,10 +15,10 @@ import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
- * @Description:
- * @Reference:
- * @Author: yiming.gu
- * @CreateDate:2019-05-21
+ * @Description :物料关键数据
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-05-15
  * @Modify:
  **/
 @Data
@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("物料关键数据关系")
 public class MesKpData extends BaseBean implements Serializable {
     private static final long serialVersionUID = 8243089140216459544L;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

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

@@ -27,8 +27,8 @@ import java.util.List;
 @Table(name = "MES_LABEL_TEMPLATE")
 @Api(value = "打印模板", description = "打印模板")
 public class MesLabelTemplate extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 5371856566557305323L;
+
     @Column(name = "TEMPLATE_CODE")
     @ApiParam(value = "模板代码")
     private String templateCode;

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

@@ -28,8 +28,8 @@ import java.io.Serializable;
 @Table(name = "MES_LABEL_TEMPLATE_PARAM")
 @Api(value = "打印模板参数", description = "打印模板参数")
 public class MesLabelTemplateParam extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 6476163540527157643L;
+
     @Column(name = "TEMPLATE_ID")
     @ApiParam(value = "模板ID", access = "模板ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("系统业务方法")
 public class MesMethod extends BaseBean implements Serializable {
     private static final long serialVersionUID = -3254086662292709833L;
+
     @Column(name = "METHOD_CODE")
     @ApiParam("方法代码")
     private String methodCode;

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

@@ -27,8 +27,8 @@ import java.io.Serializable;
 @Table(name = "MES_MONITOR_TASK")
 @Api("监听任务")
 public class MesMonitorTask extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 4606062283853607814L;
+
     @Column(name = "TASK_NO")
     @ApiParam("任务编号")
     private String taskNo;

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

@@ -28,8 +28,8 @@ import java.io.Serializable;
 @Table(name = "MES_MONITOR_TASK_DETAIL")
 @Api("监听任务明细")
 public class MesMonitorTaskDetail extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -8703163858851139587L;
+
     @Column(name = "TASK_NO")
     @ApiParam("任务编号")
     private String taskNo;

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

@@ -19,7 +19,6 @@ import java.io.Serializable;
  * @CreateDate: 2019/8/22 5:59 PM
  * @Description:
  **/
-
 @Data
 @Entity
 @DynamicInsert
@@ -28,8 +27,8 @@ import java.io.Serializable;
 @Table(name = "MES_NUMBER_RULE")
 @Api("条码生成规则")
 public class MesNumberRule extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -7547623897602721464L;
+
     @Column(name = "RULE_CODE")
     @ApiParam("规则代码")
     private String ruleCode;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.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.Version;
 import java.io.Serializable;
 
 /**
@@ -27,8 +28,8 @@ import java.io.Serializable;
 @Table(name = "MES_NUMBER_SERIALNO")
 @Api("编码序号")
 public class MesNumberSerialno extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -6004402998083665263L;
+
     @Column(name = "CURRENT_NUMBER_PREFIX")
     @ApiParam("当前编号前缀")
     private String currentNumberPrefix;
@@ -40,4 +41,9 @@ public class MesNumberSerialno extends BaseBean implements Serializable {
     @Column(name = "CURRENT_NUMBER")
     @ApiParam("当前编号")
     private String currentNumber;
+
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public transient Integer lockVersion;
 }

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

@@ -28,8 +28,8 @@ import java.io.Serializable;
 @Table(name = "MES_OBJECT_CFG")
 @Api("对象结构")
 public class MesObjectCfg extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 55753384888695913L;
+
     @Column(name = "OBJECT_CODE")
     @ApiParam("对象代码")
     private String objectCode;
@@ -55,11 +55,11 @@ public class MesObjectCfg extends BaseBean implements Serializable {
     private String pojoAttr;
 
     @Column(name = "IS_SAVE")
-    @ApiParam("是否存储")
+    @ApiParam("是否保存 1存 2不存")
     private Integer isSave;
 
     @Transient
-    @ApiParam("是否存储")
+    @ApiParam("是否存储名")
     private String isSaveName;
 
 }

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

@@ -31,6 +31,7 @@ import java.io.Serializable;
 @Deprecated
 public class MesPLCConfigure extends BaseBean implements Serializable {
     private static final long serialVersionUID = 2609782937477343108L;
+
     @Column(name = "IP")
     @ApiParam("设备ip")
     private String ipAddress;

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
 @Api("包装规格")
 public class MesPackage extends BaseBean implements Serializable {
     private static final long serialVersionUID = 5275923991324889995L;
+
     @Column(name = "PACKAGE_NO", nullable = false)
     @ApiParam("包装编号")
     private String packageNo;
@@ -101,4 +102,18 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("打印状态文字")
     private String printStrStatus;
 
+    @Transient
+    @ApiParam("打印缓存id")
+    private String printId;
+
+    public MesPackage() {
+    }
+
+    public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) {
+        this.packageNo = packageNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.packSpecQty = packSpecQty;
+    }
 }

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

@@ -28,8 +28,8 @@ import java.io.Serializable;
 })
 @Api("包装规格明细")
 public class MesPackageDetail extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 6980459490465566975L;
+
     @Column(name = "PACKAGE_NO", nullable = false)
     @ApiParam("包装编码")
     private String packageNo;
@@ -39,11 +39,11 @@ public class MesPackageDetail extends BaseBean implements Serializable {
     private String serialNumber;
 
     @Column(name = "PART_NO")
-    @ApiParam("物料号")
+    @ApiParam("物料编号")
     private String partNo;
 
     @Column(name = "PART_NAME_RDD")
-    @ApiParam("产品条码")
+    @ApiParam("物料名称")
     private String partNameRdd;
 
     @Column(name = "PACKAGE_NO2")

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

@@ -28,8 +28,8 @@ import java.io.Serializable;
 @Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")})
 @Api("包装履历表")
 public class MesPackageTravel extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -6425620221708201986L;
+
     @Column(name = "PACKAGE_NO")
     @ApiParam("包装编码")
     private String packageNo;

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

@@ -31,6 +31,7 @@ import java.io.Serializable;
 @Api("物料信息")
 public class MesPart extends BaseBean implements Serializable {
     private static final long serialVersionUID = -7731182105899332283L;
+
     @Column(name = "PART_NO")
     @ApiParam("零件号")
     private String partNo;
@@ -75,10 +76,6 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("产品类型代码")
     private String produceCategoryCode;
 
-    @Transient
-    @ApiParam("产品类型名称")
-    private String produceCategoryName;
-
     @Column(name = "PROCESS_MATCH_TYPE")
     @ApiParam("过程编码匹配类型")
     private Integer processMatchType;
@@ -92,6 +89,10 @@ public class MesPart extends BaseBean implements Serializable {
     private Integer productMatchType;
 
     @Transient
+    @ApiParam("产品类型名称")
+    private String produceCategoryName;
+
+    @Transient
     @ApiParam("过程编码匹配类型名称")
     private String processMatchTypeName;
 
@@ -102,4 +103,8 @@ public class MesPart extends BaseBean implements Serializable {
     @Transient
     @ApiParam("产品编码匹配类型")
     private String productMatchTypeName;
+
+    @Transient
+    @ApiParam("分类名称")
+    private String categoryName;
 }

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

@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("零件种类")
 public class MesPartCategory extends BaseBean implements Serializable {
     private static final long serialVersionUID = 106841156414035968L;
+
     @Column(name = "CATEGORY_CODE")
     @ApiParam("分类代码")
     private String categoryCode;

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

@@ -30,8 +30,8 @@ import java.io.Serializable;
 @Table(name = "MES_PATTERN_JIS")
 @Api("JIS发运模式")
 public class MesPatternJis extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 216398440591829755L;
+
     @Column(name = "PATTERN_NO")
     @ApiParam("模式编号")
     private String patternNo;
@@ -45,7 +45,7 @@ public class MesPatternJis extends BaseBean implements Serializable {
     private Integer queueNo;
 
     @Column(name = "HANDLE_NO")
-    @ApiParam("一次处理队列数")
+    @ApiParam("一次处理套数")
     private Integer handleNo;
 
     @Column(name = "PATTERN_DESC")

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
 @Api("PCN节点")
 public class MesPcn extends BaseBean implements Serializable {
     private static final long serialVersionUID = -9150091413555406397L;
+
     @Column(name = "PCN_CODE")
     @ApiParam("PCN代码")
     private String pcnCode;

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
 @Api("PCN节点连接日志")
 public class MesPcnConnectLog extends BaseBean implements Serializable {
     private static final long serialVersionUID = 2756240593256441951L;
+
     @Column(name = "PCN_CODE")
     @ApiParam("PCN代码")
     private String pcnCode;

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

@@ -30,7 +30,6 @@ import java.io.Serializable;
 @Table(name = "MES_PCN_SYNC_CFG")
 @Api("MES_PCN_同步配置")
 public class MesPcnSyncCfg extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 7270930330576127126L;
 
     @Column(name = "PCN_CODE")
@@ -58,7 +57,7 @@ public class MesPcnSyncCfg extends BaseBean implements Serializable {
     private String syncTime;
 
     @Column(name = "SYNC_PATTERN")
-    @ApiParam("同步方式 2、新增  1、修改")
+    @ApiParam("同步方式 2.新增  1.修改")
     private Integer syncPattern;
 
     @Column(name = "SYNC_TYPE")

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

@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("MES_PCN同步异常日志")
 public class MesPcnSyncErrorLog extends BaseBean implements Serializable {
     private static final long serialVersionUID = -6031591772505958774L;
+
     @Column(name = "PCN_CODE")
     @ApiParam("PCN代码")
     private String pcnCode;

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

@@ -0,0 +1,72 @@
+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.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description : 账号离线登陆表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-09-01 11:02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PCN_SYS_USER_OFFLINE")
+@Api(value = "账号离线登陆表", description = "账号离线登陆表。")
+public class MesPcnSysUserOffline extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7617353154826718154L;
+    @Column(name = "USER_ID")
+    @ApiParam(value = "人员ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+
+    @Column(name = "USER_CODE")
+    @ApiParam(value = "用户编号", access = "用户编号")
+    private String userCode;
+
+    @Column(name = "USER_NAME")
+    @ApiParam(value = "用户名称", access = "账号名称")
+    private String userName;
+
+    @Column(name = "LOGIN_NAME")
+    @ApiParam(value = "登陆名称", access = "登陆名称")
+    private String loginName;
+
+    @Column(name="USER_TYPE")
+    @ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
+    private Integer userType;
+
+    @Lob
+    @Column(name="LOGIN_INFO")
+    @ApiParam(value ="登陆信息" , access ="登陆信息")
+    private String loginInfo;
+
+    @Lob
+    @Column(name="MENU_LIST")
+    @ApiParam(value ="菜单" , access ="菜单")
+    private String menuList;
+
+    @Lob
+    @Column(name="MODULE_LIST")
+    @ApiParam(value ="模块" , access ="模块")
+    private String moduleList;
+
+}

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

@@ -29,8 +29,8 @@ import java.io.Serializable;
 @Table(name = "MES_PCN_TASK")
 @Api("mes-pcn定时任务工作清单")
 public class MesPcnTask extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 4129717677965409395L;
+
     @Column(name = "TASK_CODE")
     @ApiParam("任务代码")
     private String taskCode;

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

@@ -0,0 +1,53 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description :mes-pcn定时任务工作清单同步记录
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-27
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PCN_TASK_LOG")
+@Api("mes-pcn定时任务工作清单同步记录")
+public class MesPcnTaskLog extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -784806389462540310L;
+
+    @Column(name = "SYNC_TIME_START")
+    @ApiParam("同步数据开始时间")
+    private String syncTimeStart;
+
+    @Column(name = "SYNC_TIME_END")
+    @ApiParam("同步数据截止时间")
+    private String syncTimeEnd;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_CONTENT")
+    @ApiParam("异常内容")
+    private Long errorContent;
+
+    public int getSyncStatusVal() {
+        return this.syncStatus == null ? 0 : this.syncStatus;
+    }
+}

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

@@ -31,6 +31,7 @@ import java.io.Serializable;
 @Api("生产主计划")
 public class MesPlanOrder extends BaseBean implements Serializable {
     private static final long serialVersionUID = 6773005820598583458L;
+
     @Column(name = "ORDER_NO", nullable = false)
     @ApiParam("生产计划单号")
     private String orderNo;

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

@@ -30,8 +30,8 @@ import java.io.Serializable;
 @Table(name = "MES_PLC")
 @Api("PLC配置表")
 public class MesPlc extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -7172265186837551268L;
+
     @Column(name = "PLC_CODE")
     @ApiParam("PLC代码")
     private String plcCode;

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
 @Api("工序")
 public class MesProcess extends BaseBean implements Serializable {
     private static final long serialVersionUID = -615476712907856558L;
+
     @Column(name = "PROCESS_CODE")
     @ApiParam("工序代码")
     private String processCode;

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

@@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -36,6 +35,7 @@ import java.io.Serializable;
 @Api("产品绑定记录表")
 public class MesProdBindRecord extends BaseBean implements Serializable {
     private static final long serialVersionUID = -6984193022328810942L;
+
     // 联合唯一索引必须加:, nullable = false
     @Column(name = "SERIAL_NUMBER", nullable = false)
     @ApiParam(value = "产品条码")
@@ -79,11 +79,11 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
     private String supplierCode;
 
     @Column(name = "LOT_NO")
-    @ApiParam
+    @ApiParam("关联批次")
     private String lotNo;
 
     @Column(name = "IS_FEED")
-    @ApiParam
+    @ApiParam("是否投料配置")
     private Integer isFeed;
 
     @Column(name = "VERSION")
@@ -100,7 +100,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
 
     @Column(name = "ACTION_TYPE")
     @ApiParam(value = "动作类型")
-    private String actionType;
+    private Integer actionType;
 
     @ApiParam(value = "是否绑定关键件名称")
     private String isBindKeyName;

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

@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("产品配置")
 public class MesProdCfg extends BaseBean implements Serializable {
     private static final long serialVersionUID = -1301835558902463754L;
+
     @Column(name = "PROD_CFG_CODE")
     @ApiParam("产品配置代码")
     private String prodCfgCode;

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

@@ -31,6 +31,7 @@ import java.io.Serializable;
 @Api("产品配置明细")
 public class MesProdCfgDetail extends BaseBean implements Serializable {
     private static final long serialVersionUID = -5678006170645940563L;
+
     @Column(name = "PROD_CFG_CODE")
     @ApiParam("产品配置代码")
     private String prodCfgCode;

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

@@ -27,8 +27,8 @@ import java.io.Serializable;
 @Table(name = "MES_PROD_PACK")
 @Api("产品包装关系")
 public class MesProdPack extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -5748484568201154400L;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
 @Api("产品类流程配置表")
 public class MesProdRouteCfg extends BaseBean implements Serializable {
     private static final long serialVersionUID = -3903152693262813917L;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

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

@@ -28,8 +28,8 @@ import java.io.Serializable;
 @Table(name = "MES_PRODUCE_CATEGORY")
 @Api("系统业务动作")
 public class MesProduceCategory extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -992595557921651448L;
+
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
     private String produceCategoryCode;

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

@@ -29,8 +29,8 @@ import java.io.Serializable;
 @Table(name = "MES_PRODUCE_CTGY_PICTURE")
 @Api("产品类型图片表")
 public class MesProduceCtgyPicture extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 4199856772441042802L;
+
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
     private String produceCtgyCode;
@@ -43,7 +43,21 @@ public class MesProduceCtgyPicture extends BaseBean implements Serializable {
     @ApiParam("文件id")
     private Long fileId;
 
+    @Column(name = "PICTURE_URL")
+    @ApiParam("图片URL")
+    private String pictureUrl;
+
     @Transient
     @ApiParam("文件原名称")
     private String fileOriginName;
+
+    @Transient
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @Transient
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+
 }

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

@@ -33,8 +33,8 @@ import java.math.BigDecimal;
 })
 @Api("产品条码表")
 public class MesProduceSn extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -1630924042562178494L;
+
     @Column(name = "SERIAL_NUMBER", nullable = false)
     @ApiParam("过程条码")
     private String serialNumber;
@@ -72,11 +72,11 @@ public class MesProduceSn extends BaseBean implements Serializable {
     private Integer printStatus;
 
     @Column(name = "WORK_CENTER_CODE")
-    @ApiParam("工作中心代码")
+    @ApiParam("生产线")
     private String workCenterCode;
 
     @Column(name = "WORK_CELL_CODE")
-    @ApiParam("工作单元代码")
+    @ApiParam("工位")
     private String workCellCode;
 
     @Column(name = "ROUTE_CODE")
@@ -120,7 +120,7 @@ public class MesProduceSn extends BaseBean implements Serializable {
     private String custCode;
 
     @Column(name = "SN_TYPE")
-    @ApiParam("条码类型")
+    @ApiParam("条码类型 10=正常 20=首检件")
     private Integer snType;
 
     @Column(name = "TRAY_NO")

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

@@ -33,6 +33,7 @@ import java.io.Serializable;
 @Api("产品条码履历表")
 public class MesProduceSnTravel extends BaseBean implements Serializable {
     private static final long serialVersionUID = -1807953720033107108L;
+
     @Column(name = "SERIAL_NUMBER")
     @ApiParam("过程条码")
     private String serialNumber;

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

@@ -29,8 +29,8 @@ import java.io.Serializable;
 @Table(name = "MES_PRODUCT_ENCODE_CFG")
 @Api("产品编码配置")
 public class MesProductEncodeCfg extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 5608141802461306170L;
+
     @Column(name = "CODE_TYPE")
     @ApiParam("编码类型")
     private Integer codeType;

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

@@ -31,8 +31,8 @@ import java.util.List;
 })
 @Api("质量过程检测数据")
 public class MesQcCheckData extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -8044433561607606170L;
+
     @Column(name = "CHECK_ID")
     @ApiParam("检测id")
     private String checkId;
@@ -116,4 +116,12 @@ public class MesQcCheckData extends BaseBean implements Serializable {
     @Transient
     @ApiParam("工作单元名称")
     private String workCellName;
+
+    @Transient
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Transient
+    @ApiParam("过程质量检测数据")
+    private List<MesQcCheckStandard> mesQcCheckStandardList;
 }

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

@@ -13,6 +13,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description:
@@ -29,8 +30,8 @@ import java.io.Serializable;
 @Table(name = "MES_QC_CHECK_STANDARD")
 @Api("质量检测标准")
 public class MesQcCheckStandard extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 3977375527789854590L;
+
     @Column(name = "PART_NO")
     @ApiParam("物料编码")
     private String partNo;
@@ -63,6 +64,18 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @ApiParam("频率")
     private String checkFrequency;
 
+    @Transient
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Transient
+    @ApiParam("检测结果")
+    private String checkResult;
+
+    @Transient
+    @ApiParam("检测值")
+    private String checkValue;
+
     @Column(name = "CHECK_ITEM_TYPE")
     @ApiParam("检测项类型")
     private String checkItemType;
@@ -71,4 +84,29 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @ApiParam("检测类型名称")
     private String checkTypeName;
 
+    @Transient
+    @ApiParam("检测项类型名称")
+    private String checkItemTypeName;
+
+    @Transient
+    private List<MesQcCheckStandard> childQcList;
+
+    public MesQcCheckStandard() {
+    }
+
+    public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard
+            , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) {
+        this.id = id;
+        this.partNo = partNo;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.checkType = checkType;
+        this.checkItem = checkItem;
+        this.checkStandard = checkStandard;
+        this.checkGuide = checkGuide;
+        this.checkFrequency = checkFrequency;
+        this.partName = partName;
+        this.checkItemType = checkItemType;
+        this.checkItemTypeName = checkItemTypeName;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.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;
 import java.io.Serializable;
 
 /**
@@ -29,8 +30,8 @@ import java.io.Serializable;
 @Table(name = "MES_QUEUE_JIS")
 @Api("JIS发运队列")
 public class MesQueueJis extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -2712958514118946868L;
+
     @Column(name = "JIS_NO")
     @ApiParam("主队列编号")
     private String jisNo;
@@ -63,4 +64,8 @@ public class MesQueueJis extends BaseBean implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Transient
+    @ApiParam("颜色")
+    private String color;
+
 }

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

@@ -29,8 +29,8 @@ import java.io.Serializable;
 @Table(name = "MES_QUEUE_JIS_DETAIL")
 @Api("JIS发运队列明细")
 public class MesQueueJisDetail extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -3242843412307565585L;
+
     @Column(name = "JIS_NO")
     @ApiParam("主队列编号")
     private String jisNo;
@@ -52,7 +52,7 @@ public class MesQueueJisDetail extends BaseBean implements Serializable {
     private Integer status;
 
     @Column(name = "FINAL_STATUS")
-    @ApiParam("发运整体状态")
+    @ApiParam("明细整体状态")
     private Integer finalStatus;
 
     @Column(name = "SERIAL_NUMBER")

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -11,9 +10,6 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 /**
  * @Description:
@@ -35,6 +31,7 @@ import java.util.List;
 @Api("生产队列主表")
 public class MesQueueOrder extends BaseBean implements Serializable {
     private static final long serialVersionUID = -7459452106180601417L;
+
     @Column(name = "ORDER_NO", nullable = false)
     @ApiParam("主队列编号")
     private String orderNo;

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

@@ -31,6 +31,7 @@ import java.io.Serializable;
 @Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean implements Serializable {
     private static final long serialVersionUID = 7840873844253353896L;
+
     @Column(name = "ORDER_NO", nullable = false)
     @ApiParam("主队列编号")
     private String orderNo;
@@ -61,7 +62,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
 
     @Column(name = "WORK_TYPE")
     @ApiParam("生产类型")
-    private String workOrderType;
+    private String workType;
 
     @Column(name = "PRODUCE_CATEGORY_CODE")
     @ApiParam("产品类型代码")
@@ -90,4 +91,13 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }
+
+    public MesQueueOrderDetail() {
+    }
+
+    public MesQueueOrderDetail(Double queueSeq, Double seq, String serialNumber) {
+        this.queueSeq = queueSeq;
+        this.seq = seq;
+        this.serialNumber = serialNumber;
+    }
 }

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

@@ -31,6 +31,7 @@ import java.io.Serializable;
 @Api("原材料信息")
 public class MesRawPartSn extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1590983555938105569L;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

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

@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("维修")
 public class MesRepair extends BaseBean implements Serializable {
     private static final long serialVersionUID = 5304257976947321917L;
+
     @Column(name = "REPAIR_CODE")
     @ApiParam("维修代码")
     private String repairCode;

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

@@ -8,11 +8,9 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description:
@@ -33,8 +31,8 @@ import java.io.Serializable;
 })
 @Api("维修信息记录表")
 public class MesRepairRecord extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -1758374702271940323L;
+
     @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;
@@ -90,4 +88,16 @@ public class MesRepairRecord extends BaseBean implements Serializable {
     @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;
+
+    @Transient
+    @ApiParam("备注")
+    private String spareMemo;
+
+    @Transient
+    @ApiParam("不良记录id")
+    private Long defectRecordId;
+
+    @Transient
+    @ApiParam("缺陷集合")
+    private List<MesDefect> mesDefectList;
 }

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

@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("流程表")
 public class MesRoute extends BaseBean implements Serializable {
     private static final long serialVersionUID = -3616935751787295145L;
+
     @Column(name = "ROUTE_CODE")
     @ApiParam("流程代码")
     private String routeCode;

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
 @Api("流程工序关系")
 public class MesRouteProcess extends BaseBean implements Serializable {
     private static final long serialVersionUID = -1248219638779313299L;
+
     @Column(name = "ROUTE_CODE")
     @ApiParam("流程代码")
     private String routeCode;

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

@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("工序工作单元对照")
 public class MesRouteProcessCell extends BaseBean implements Serializable {
     private static final long serialVersionUID = 4823057491756814599L;
+
     @Column(name = "ROUTE_CODE")
     @ApiParam("流程代码")
     private String routeCode;

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

@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("报废原因")
 public class MesScrap extends BaseBean implements Serializable {
     private static final long serialVersionUID = 2850681183524213132L;
+
     @Column(name = "SCRAP_CODE")
     @ApiParam("报废代码")
     private String scrapCode;
@@ -38,7 +39,7 @@ public class MesScrap extends BaseBean implements Serializable {
     @ApiParam("报废名称")
     private String scrapName;
 
-    @Column(name="SCRAP_TYPE")
+    @Column(name = "SCRAP_TYPE")
     @ApiParam("报废类型")
     private String scrapType;
 

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

@@ -31,8 +31,8 @@ import java.io.Serializable;
 })
 @Api("报废信息记录表")
 public class MesScrapRecord extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -5451178133547076360L;
+
     @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;
@@ -51,7 +51,7 @@ public class MesScrapRecord extends BaseBean implements Serializable {
 
     @Column(name = "SCRAP_CODE")
     @ApiParam("报废代码")
-    private String repairCode;
+    private String scrapCode;
 
     @Column(name = "SCRAP_NAME")
     @ApiParam("报废名称")

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

@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("班次信息")
 public class MesShift extends BaseBean implements Serializable {
     private static final long serialVersionUID = 4001070186534674096L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
 @Api("班组")
 public class MesShiftGroup extends BaseBean implements Serializable {
     private static final long serialVersionUID = 3409573116624543569L;
+
     @Column(name = "GROUP_CODE")
     @ApiParam("班组代码")
     private String groupCode;

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

@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("班次休息信息")
 public class MesShiftRest extends BaseBean implements Serializable {
     private static final long serialVersionUID = 5486276486536860088L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;

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

@@ -32,6 +32,7 @@ import java.io.Serializable;
 @Api("工位物料清单")
 public class MesStationBom extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1817387724628691734L;
+
     @Column(name = "PART_NO")
     @ApiParam("零件号")
     private String partNo;
@@ -69,7 +70,6 @@ public class MesStationBom extends BaseBean implements Serializable {
     @ApiParam(value = "是否检查")
     private Integer isCheck;
 
-
     @Column(name = "IS_FEED")
     @ApiParam(value = "是否投料配置")
     private Integer isFeed;
@@ -91,6 +91,14 @@ public class MesStationBom extends BaseBean implements Serializable {
     private Double boundQty;
 
     @Transient
+    @ApiParam("关键件代码")
+    private String keyBarCode;
+
+    @Transient
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Transient
     @ApiParam(value = "是否可重复名称")
     private String isRepeatName;
 
@@ -126,6 +134,10 @@ public class MesStationBom extends BaseBean implements Serializable {
         return this.isBind == null ? false : this.isBind;
     }
 
+    public double getBoundQtyVal() {
+        return this.boundQty == null ? 0.0d : this.boundQty;
+    }
+
     @Override
     public String toString() {
         return "MesStationBom{" +

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.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;
 import java.io.Serializable;
 
 /**
@@ -29,6 +30,7 @@ import java.io.Serializable;
 @Api("工步")
 public class MesStep extends BaseBean implements Serializable {
     private static final long serialVersionUID = -1106608189453496947L;
+
     @Column(name = "STEP_CODE")
     @ApiParam("工步代码")
     private String stepCode;
@@ -48,4 +50,54 @@ public class MesStep extends BaseBean implements Serializable {
     @Column(name = "STEP_OBJECT")
     @ApiParam("工步对象")
     private String stepObject;
+
+    /**
+     * 工位扫描业务所需使用字段
+     */
+    @Transient
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    /**
+     * 工位扫描业务所需使用字段
+     */
+    @Transient
+    @ApiParam("工序代码")
+    private String processCode;
+
+    /**
+     * 工位扫描业务所需使用字段
+     */
+    @Transient
+    @ApiParam("工步顺序")
+    private Integer stepSeq;
+
+    /**
+     * 工位扫描业务所需使用字段
+     */
+    @Transient
+    @ApiParam("工步执行完毕")
+    private boolean isComplete;
+
+    /**
+     * 工位扫描业务所需使用字段
+     */
+    @Transient
+    @ApiParam("工步是否跳过")
+    private boolean isJump;
+
+    public MesStep() {
+    }
+
+    public MesStep(String stepCode, String stepName, String stepText, String stepType, String stepObject,
+                   String routeCode, String processCode, Integer stepSeq) {
+        this.stepCode = stepCode;
+        this.stepName = stepName;
+        this.stepText = stepText;
+        this.stepType = stepType;
+        this.stepObject = stepObject;
+        this.routeCode = routeCode;
+        this.processCode = processCode;
+        this.stepSeq = stepSeq;
+    }
 }

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
 @Api("工步参数")
 public class MesStepParam extends BaseBean implements Serializable {
     private static final long serialVersionUID = 6709455994477993263L;
+
     @Column(name = "STEP_CODE")
     @ApiParam("工步代码")
     private String stepCode;
@@ -44,8 +45,8 @@ public class MesStepParam extends BaseBean implements Serializable {
     @Column(name = "PARAM_NAME")
     @ApiParam("参数名称")
     private String paramName;
-    //text select
+
     @Column(name = "PARAM_ATTRIBUTE")
-    @ApiParam("参数属性")
+    @ApiParam("参数属性 text select")
     private String paramAttribute;
 }

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

@@ -0,0 +1,40 @@
+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;
+import java.io.Serializable;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TIME")
+@Api("工步参数")
+public class MesTime extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1562011791394529076L;
+
+    @Column(name = "MODULE")
+    @ApiParam("组件")
+    private String module;
+
+    @Column(name = "ELAPSE")
+    @ApiParam("耗时")
+    private Long elapse;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+
+}

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

@@ -0,0 +1,97 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description :扭矩信息记录表
+ * @Reference :
+ * @Author : Crish
+ * @CreateDate : 2019-05-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TORQUE_DETAIL")
+@Api("扭矩信息记录表")
+public class MesTorqueDetail extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 2900363253333046861L;
+
+    @Column(name = "SN")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "UPPER_LIMIT")
+    @ApiParam("最大值")
+    private Double upperLimit;
+
+    @Column(name = "LOWER_LIMIT")
+    @ApiParam("最小值")
+    private Double lowerLimit;
+
+    @Column(name = "TORQUE_DETAIL_VALUE")
+    @ApiParam("扭矩值")
+    private Double torqueValue;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name = "ok")
+    @ApiParam("扭矩是否合格")
+    private String ok;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "p_set")
+    @ApiParam("螺丝枪PSET设置值")
+    private String deviceSetValue;
+
+    @Column(name = "MAXANGLE")
+    @ApiParam("最大扭矩")
+    private String maxAngle;
+
+    @Column(name = "MINANGLE")
+    @ApiParam("最小扭矩")
+    private String minAngel;
+
+    @Column(name = "FINALANGLE")
+    @ApiParam("最终扭矩")
+    private Integer finalAngle;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @Column(name = "KEY_DATA_CODE")
+    @ApiParam("关键数据代码")
+    private String keyDataCode;
+
+    @Column(name = "RESULT_MSG")
+    @ApiParam("扭矩判定结果")
+    private String resultMsg;
+}

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

@@ -28,8 +28,8 @@ import java.io.Serializable;
 @Table(name = "MES_TYPE_CFG")
 @Api("类型信息表")
 public class MesTypeCfg extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 7666533200631763797L;
+
     @Column(name = "TYPE_CODE")
     @ApiParam("类型代码")
     private String typeCode;

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

@@ -28,8 +28,8 @@ import java.io.Serializable;
 @Table(name = "MES_WC_CHECK")
 @Api("开线检查")
 public class MesWcCheck extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 7937744978114334701L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;

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

@@ -30,8 +30,8 @@ import java.io.Serializable;
 })
 @Api("开线检查记录")
 public class MesWcCheckRecord extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 6919654845394560128L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
@@ -77,7 +77,7 @@ public class MesWcCheckRecord extends BaseBean implements Serializable {
     private String groupCode;
 
     @Column(name = "OVERALL_RESULT")
-    @ApiParam
+    @ApiParam("总体结果")
     private Integer overAllResult;
 
 }

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

@@ -27,8 +27,8 @@ import java.io.Serializable;
 @Table(name = "MES_WC_EQUIPMENT")
 @Api("工作单元设备关系表")
 public class MesWcEquipment extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 188390912605665500L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;

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

@@ -33,6 +33,7 @@ import java.util.List;
 @Api("工作单元")
 public class MesWorkCell extends BaseBean implements Serializable {
     private static final long serialVersionUID = 8552890090536989486L;
+
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.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.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -30,8 +27,8 @@ import java.io.Serializable;
 })
 @Api("工位监控异常信息")
 public class MesWorkCellMonitorLog extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 1432794181428753903L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
@@ -44,7 +41,7 @@ public class MesWorkCellMonitorLog extends BaseBean implements Serializable {
     @ApiParam("物料号")
     private String partNo;
 
-    @Column(name = "workOrderNo")
+    @Column(name = "WORK_ORDER_NO")
     @ApiParam("工单")
     private String workOrderNo;
 
@@ -60,6 +57,7 @@ public class MesWorkCellMonitorLog extends BaseBean implements Serializable {
     @ApiParam("流程")
     private String routeCOde;
 
+    @Lob
     @Column(name = "MESSAGE")
     @ApiParam("异常信息")
     private String message;

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

@@ -29,8 +29,8 @@ import java.io.Serializable;
 @Table(name = "MES_WORK_CELL_PARAM")
 @Api("mes工作单元参数")
 public class MesWorkCellParam extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 1017369816822438021L;
+
     @Column(name = "PARAM_CODE")
     @ApiParam("参数代码")
     private String paramCode;

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

@@ -30,6 +30,7 @@ import java.io.Serializable;
 @Api("工作单元参数配置")
 public class MesWorkCellParamCfg extends BaseBean implements Serializable {
     private static final long serialVersionUID = -8507576103087989740L;
+
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;

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

@@ -32,8 +32,8 @@ import java.util.List;
 @Table(name = "MES_WORK_CELL_POINT")
 @Api("工站队列")
 public class MesWorkCellPoint extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = -6817903235638554748L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;