From 83e33e2403bab4684efa78d206b8586bf3e2d8ad Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Wed, 26 May 2021 10:45:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java index 9caec9d..b53e492 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java @@ -66,7 +66,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("末次迁移时间") From 1f84c2f8aa10709748b6e476ee2efc482e204feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 26 May 2021 11:20:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=9015872=2020027--PCN=E7=AB=AF?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E6=89=AB=E6=8F=8F=E5=A2=9E=E5=8A=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A4=8D=E6=A0=B8=E5=B7=A5=E6=AD=A5=EF=BC=8C=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E9=87=87=E9=9B=86=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=E6=80=A7=E5=92=8C=E6=95=B0=E6=8D=AE=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=90=88=E6=A0=BC--2021-05-22=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 70 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 10 ++++ 2 files changed, 80 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 7072531..cc07b12 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -6653,4 +6653,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; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 6cb1b26..b759a7d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/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; + } } From dd7657d7e1fc1498eeb0e70c5a8bf76a516c9bf1 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Wed, 26 May 2021 17:16:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesDataMigrationCfg.java | 28 ---------------------- 1 file changed, 28 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java index b53e492..5d69c4c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java +++ b/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; @@ -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; - }*/ }