解决冲突

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

@@ -11,6 +11,8 @@ 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:
@@ -46,7 +48,7 @@ public class MesQcCheckData extends BaseBean {
 
     @Column(name = "CHECK_TYPE")
     @ApiParam("检测类型")
-    private String checkType;
+    private Integer checkType;
 
     @Column(name = "CHECK_ITEM")
     @ApiParam("检测项")
@@ -92,4 +94,8 @@ public class MesQcCheckData extends BaseBean {
     @ApiParam("客户代码")
     private String custCode;
 
+    @Transient
+    @ApiParam("过程质量检测数据")
+    private List<MesQcCheckStandard> mesQcCheckStandardList;
+
 }

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

@@ -0,0 +1,76 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\12 14:46
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_QC_CHECK_STANDARD")
+@Api("质量检测标准")
+public class MesQcCheckStandard extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测类型")
+    private Integer checkType;
+
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检测项")
+    private String checkItem;
+
+    @Column(name = "CHECK_STANDARD")
+    @ApiParam("检测标准")
+    private String checkStandard;
+
+    @Column(name = "CHECK_GUIDE")
+    @ApiParam("检测指导")
+    private String checkGuide;
+
+    @Column(name = "CHECK_FREQUENCY")
+    @ApiParam("频率")
+    private String checkFrequency;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Transient
+    @ApiParam("检测结果")
+    private String checkResult;
+
+    @Transient
+    @ApiParam("检测值")
+    private String checkValue;
+
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.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.MesQcCheckStandard;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\12 14:58
+ * @Modify:
+ **/
+public interface MesQcCheckStandardRepository extends BaseRepository<MesQcCheckStandard, Long> {
+}

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

@@ -63,4 +63,8 @@ public class MesDatasource extends BaseBean {
     @ApiParam("数据库名称")
     private String dsDbName;
 
+    @Column(name = "DS_DB_NAME")
+    @ApiParam("数据库名称")
+    private String dsDbName;
+
 }

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

@@ -65,9 +65,9 @@ public class MesPlc extends BaseBean {
     @ApiParam("分组名称")
     private String groupName;
 
-    @Column(name = "EQU_CODE")
+    @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")
-    private String equCode;
+    private String equipmentCode;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
@@ -77,10 +77,6 @@ public class MesPlc extends BaseBean {
     @ApiParam("工作单元")
     private String workCellCode;
 
-    @Column(name = "ENABLED")
-    @ApiParam("是否启用 0 false 1 true")
-    private Integer enabled;
-
     @Column(name = "PLC_CFG")
     @ApiParam("PLC的值的设定")
     private String plcCfg;

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

@@ -1256,7 +1256,7 @@ public class MesHqlPack {
         DdlPreparedPack.getOrderByPack(new String[]{String.valueOf(CommonEnumUtil.ASC_OR_DESC.ASC.getValue())}, new String[]{"startTime", "shiftCode"}, packBean);
         return packBean;
     }
-    
+
     /**
      * MES Plc设备信息配置查询条件封装
      * @param mesPlc
@@ -1277,9 +1277,6 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesPlc.getTagAddress())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean);
         }
-        if (!StringUtils.isEmpty(mesPlc.getEquCode())) {
-            DdlPreparedPack.getStringEqualPack(mesPlc.getEquCode(), "equCode", packBean);
-        }
         if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean);
         }
@@ -1309,9 +1306,6 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesDatasource.getDsDbName())) {
             DdlPreparedPack.getStringEqualPack(mesDatasource.getDsDbName(), "dsDbName", packBean);
         }
-        if (!StringUtils.isEmpty(mesDatasource.getEquipmentCode())) {
-            DdlPreparedPack.getStringEqualPack(mesDatasource.getEquipmentCode(), "equCode", packBean);
-        }
         return packBean;
     }
 
@@ -1329,6 +1323,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) {
             DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean);
         }
+        if (!StringUtils.isEmpty(mesFaultMethod.getFmCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean);
+        }
         if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) {
             DdlPreparedPack.getStringEqualPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean);
         }
@@ -1349,6 +1349,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesFaultCause.getFcName())) {
             DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean);
         }
+        if (!StringUtils.isEmpty(mesFaultCause.getFcCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultCause.getFcName())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean);
+        }
         if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) {
             DdlPreparedPack.getStringEqualPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean);
         }
@@ -1369,6 +1375,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) {
             DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean);
         }
+        if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean);
+        }
         if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) {
             DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean);
         }
@@ -1389,6 +1401,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) {
             DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean);
         }
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) {
+            DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean);
+        }
         if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean);
         }
@@ -1400,5 +1418,4 @@ public class MesHqlPack {
         }
         return packBean;
     }
-
 }