From 029c9b6bc802b178971aa1b5e13ef12f284e665a Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 6 Nov 2019 21:38:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=A1=E6=A0=B8=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 45 ++++++++++++++-------- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 4 ++ .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 8 ++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++ .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 8 ++-- 5 files changed, 45 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 55323d9..fa79978 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -201,7 +201,7 @@ public class MesEnumUtil { } /** - * 设备台账报表查询标识 + * 设备台账报表查询标识 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum EQUIPMENT_REPORT_TYPE { @@ -2587,37 +2587,50 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CONFIG_TYPE { - FASTDFS_SAVE_PATH(10, "SAVE_PATH"), - NGINX_IP(20, "NGINX_HOST"), - MES_STATION_SOCKET(30, "mes_station_socket"), - GATEWAY_IP(40, "GATEWAY_HOST"), - UPDATE_SYNC_TIME(50, "UPDATE_SYNC_TIME"), - PCN_PULL(60, "PCN_PULL"), - PCN_PUSH(70, "PCN_PUSH"), - FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"), - REWORK_REPAIR(90, "REWORK_REPAIR"); + FASTDFS_SAVE_PATH(10, "SAVE_PATH", ""), + NGINX_IP(20, "NGINX_HOST", ""), + MES_STATION_SOCKET(30, "MES_STATION_SOCKET", ""), + GATEWAY_IP(40, "GATEWAY_HOST", ""), + UPDATE_SYNC_TIME(50, "SYNC_DATA_URL", "UPDATE_SYNC_TIME"), + PCN_PULL(60, "SYNC_DATA_URL", "PCN_PULL"), + PCN_PUSH(70, "SYNC_DATA_URL", "PCN_PUSH"), + FDFS_DOWNLOAD(80, "SYNC_DATA_URL", "FDFS_DOWNLOAD"), + REWORK_REPAIR(90, "REWORK_REPAIR", ""), + OPC_LINK_SERVER_URL(100, "OPC_LINK", "OPC_LINK_SERVER_URL"), + OPC_LINK_USERNAME(110, "OPC_LINK", "OPC_LINK_USERNAME"), + OPC_LINK_PASSWORD(120, "OPC_LINK", "OPC_LINK_PASSWORD"), + OPC_LINK_REALM(130, "OPC_LINK", "OPC_LINK_REALM"), + OPC_LINK_CALLBACK(140, "OPC_LINK", "OPC_LINK_CALLBACK"), + SUPPLY_SWITCH(150,"SUPPLY_SWITCH",""); + private int value; - private String description; + private String code; + private String cfgKey; - CONFIG_TYPE(int value, String description) { + CONFIG_TYPE(int value, String code, String cfgKey) { this.value = value; - this.description = description; + this.code = code; + this.cfgKey = cfgKey; } public int getValue() { return value; } - public String getDescription() { - return description; + public String getCode() { + return code; + } + + public String getCfgKey() { + return cfgKey; } public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { - tmp = values()[i].description; + tmp = values()[i].cfgKey; } } return tmp; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index 6beeba3..2f172df 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -92,6 +92,10 @@ public class MesPlc extends BaseBean { @ApiParam("是否解析") private String isAnalysis; + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java index ae8b814..e162d62 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -100,14 +100,14 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("客户条码") private String custSn; + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + @Column(name = "CUST_PART_NO") @ApiParam("客户零件号") private String custPartNo; - @Column(name = "PACKAGE_SN") - @ApiParam("包装条码") - private String packageSn; - @Column(name="OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 1dd0077..5623665 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -94,6 +94,10 @@ public class MesPlc extends BaseBean { @ApiParam("是否解析") private String isAnalysis; + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index b00e8b6..4eed687 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -100,14 +100,14 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("客户条码") private String custSn; + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + @Column(name = "CUST_PART_NO") @ApiParam("客户零件号") private String custPartNo; - @Column(name = "PACKAGE_SN") - @ApiParam("包装条码") - private String packageSn; - @Column(name="OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; From b4cea27a5b60d3f64456f7310a2d6d89a640f1aa Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Fri, 8 Nov 2019 17:19:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=A1=E6=A0=B8=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java index 645c2d5..ca13bc4 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java @@ -51,4 +51,8 @@ public class MesObjectCfg extends BaseBean { @ApiParam("对应的pojo属性") private String pojoAttr; + @Column(name = "IS_SAVE") + @ApiParam("是否保存 1存 2不存") + private Integer isSave; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index b294abe..74ea5d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -51,4 +51,8 @@ public class MesObjectCfg extends BaseBean { @ApiParam("对应的pojo属性") private String pojoAttr; + @Column(name = "IS_SAVE") + @ApiParam("是否保存 1存 2不存") + private Integer isSave; + }