【任务：1273质量检测增加字段】

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTypeCfg;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\12\4 10:34
+ * @Modify:
+ **/
+public interface MesTypeCfgRepository extends BaseRepository<MesTypeCfg, Long> {
+}

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

@@ -378,4 +378,27 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         return packBean;
     }
+
+
+
+    /**
+     * 按条件分页查询类型信息数据
+     * @param typeCfg
+     * @return
+     */
+    public static DdlPackBean getTypeCfg(MesTypeCfg typeCfg) {
+
+        DdlPackBean packBean = getAllBaseData(typeCfg.getOrganizeCode());
+        if (!StringUtils.isEmpty(typeCfg.getBusinessTypeCode())) {
+            DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeCode(), "businessTypeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(typeCfg.getBusinessTypeName())) {
+            DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeName(), "businessTypeName", packBean);
+        }
+        if (!StringUtils.isEmpty(typeCfg.getTypeCode())) {
+            DdlPreparedPack.getStringLikerPack(typeCfg.getTypeCode(), "typeCode", packBean);
+        }
+
+        return packBean;
+    }
 }

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

@@ -86,6 +86,9 @@ public class MesPlcModel implements Serializable {
     @ApiParam("是否解析")
     private String isAnalysis;
 
+    @ApiParam("驱动")
+    private String device;
+
     public MesPlcModel() {
 
     }
@@ -93,7 +96,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 workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -118,5 +121,6 @@ public class MesPlcModel implements Serializable {
         this.plcCfg = plcCfg;
         this.analysisRule = analysisRule;
         this.isAnalysis = isAnalysis;
+        this.device = device;
     }
 }

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

@@ -1397,6 +1397,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) {
             DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean);
         }
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItemType())) {
+            DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItemType(), "checkItemType", packBean);
+        }
         return packBean;
     }