Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -716,7 +716,10 @@ public class MesEnumUtil {
         SCRAP("SCRAP", "报废原因"),
         QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
         WC_CHECK("WC_CHECK", "开线检查项"),
-        BOARD("BOARD", "看板类型");
+        BOARD("BOARD", "看板类型"),
+        EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
+        EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
+        EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象");
 
         private String value;
         private String description;

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

@@ -97,6 +97,9 @@ public class MesEquipmentModel implements Serializable {
     @ApiParam("连接类型")
     private String connectTypeName;
 
+    @ApiParam("作业校验模式")
+    private Integer checkModel;
+
 
     public MesEquipmentModel() {
 
@@ -139,7 +142,7 @@ public class MesEquipmentModel implements Serializable {
     }
 
     //获取设备分页数据 queryMesEquipmentByPager
-    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -163,6 +166,7 @@ public class MesEquipmentModel implements Serializable {
         this.createDatetime = createDatetime;
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
+        this.checkModel = checkModel;
     }
 
 }

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

@@ -96,6 +96,9 @@ public class MesPlcModel implements Serializable {
     @ApiParam("OPCUA路径")
     private String opcUrl;
 
+    @ApiParam("PLC类型")
+    private Integer plcType;
+
     public MesPlcModel() {
 
     }
@@ -103,7 +106,7 @@ public class MesPlcModel implements Serializable {
     public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
                        String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
                        String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
-                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) {
+                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl, Integer plcType) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -131,5 +134,6 @@ public class MesPlcModel implements Serializable {
         this.device = device;
         this.objectCode = objectCode;
         this.opcUrl = opcUrl;
+        this.plcType = plcType;
     }
 }