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

 Conflicts:

	modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java

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

@@ -6654,4 +6654,74 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 工位等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_WORK_CELL_GRADE {
+        ORDINARY(10, "普通工位"),
+        MONITOR(20, "监听工位");
+
+        private int value;
+        private String description;
+
+        MES_WORK_CELL_GRADE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 质检取值字段类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_FILED_TYPE {
+        NUMBER(10, "数字"),
+        STRING(20, "字符串");
+
+        private int value;
+        private String description;
+
+        QC_FILED_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
 }

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java

@@ -3,10 +3,17 @@ package cn.estsh.i3plus.pojo.mdm.bean.base;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 import java.io.Serializable;
 import java.util.List;
 
@@ -93,4 +100,8 @@ public class MdmSyncData<T> implements Serializable {
 
     @ApiParam("同步失败信息")
     private String syncFailMessage;
+    
+    @ApiParam("同步数据值")
+    private List<T> syncData;
+
 }

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

@@ -35,14 +35,6 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable {
     @ApiParam("描述")
     private String remark;
 
-//    @Column(name = "MIGRATION_CYCLE")
-//    @ApiParam("迁移周期")
-//    private String migrationCycle;
-//
-//    @Column(name = "NEXT_EXECUTION_TIME")
-//    @ApiParam("下次执行时间")
-//    private String nextExecutionTime;
-
     @Column(name = "SRC_TABLE_NAME")
     @ApiParam("来源表名")
     private String srcTableName;
@@ -66,7 +58,7 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable {
     //枚举：CommonEnumUtil.DATA_SOURCE_TYPE
     @Column(name = "DATASOURCE_TYPE")
     @ApiParam(value = "数据源类型")
-    private Integer dataSourceType;
+    private String dataSourceType;
 
     @Column(name = "LAST_EXECUTION_TIME")
     @ApiParam("末次迁移时间")
@@ -76,10 +68,6 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable {
     @ApiParam(value = "末次迁移记录数", example = "0")
     private Integer lastMigrationQty;
 
-    @Column(name = "ERROR_MESSAGE")
-    @ApiParam("执行错误日志")
-    private String errorMessage;
-
 
     @Transient
     @ApiParam(value = "开始时间")
@@ -89,20 +77,4 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable {
     @ApiParam(value = "结束时间")
     private String mcEndTime;
 
-    /*public MesDataMigrationCfg(String migName, String remark, String migrationCycle, String nextExecutionTime, String srcTableName, String srcQueryConditions, Integer processQty, String destTableName, Integer isPhysicalDelete, String lastExecutionTime, Integer lastMigrationQty, String errorMessage, String mcStartTime, String mcEndTime) {
-        this.migName = migName;
-        this.remark = remark;
-        this.migrationCycle = migrationCycle;
-        this.nextExecutionTime = nextExecutionTime;
-        this.srcTableName = srcTableName;
-        this.srcQueryConditions = srcQueryConditions;
-        this.processQty = processQty;
-        this.destTableName = destTableName;
-        this.isPhysicalDelete = isPhysicalDelete;
-        this.lastExecutionTime = lastExecutionTime;
-        this.lastMigrationQty = lastMigrationQty;
-        this.errorMessage = errorMessage;
-        this.mcStartTime = mcStartTime;
-        this.mcEndTime = mcEndTime;
-    }*/
 }

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

@@ -3815,4 +3815,14 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(mesPartSpecific.getIsValid(), "isValid", packBean);
         return packBean;
     }
+
+    public static DdlPackBean getMesDbDataCheck(MesDbDataCheck mesDbDataCheck) {
+        DdlPackBean packBean = getAllBaseData(mesDbDataCheck.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesDbDataCheck.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesDbDataCheck.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesDbDataCheck.getObjectCode(), "objectCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesDbDataCheck.getQcFiledCode(), "qcFiledCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesDbDataCheck.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 }