From 7d192b36a6010afb776e48bf08b6956a0d30cae3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 11 May 2020 22:39:02 +0800 Subject: [PATCH 01/45] =?UTF-8?q?pom=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 3 ++- modules/i3plus-pojo-aps/pom.xml | 4 ++-- modules/i3plus-pojo-base/pom.xml | 4 ++-- modules/i3plus-pojo-form/pom.xml | 4 ++-- modules/i3plus-pojo-hardswitch/pom.xml | 3 ++- modules/i3plus-pojo-ics/pom.xml | 4 +++- modules/i3plus-pojo-jobflow/pom.xml | 4 ++-- modules/i3plus-pojo-lac/pom.xml | 3 ++- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- modules/i3plus-pojo-platform/pom.xml | 4 ++-- modules/i3plus-pojo-ptl/pom.xml | 4 ++-- modules/i3plus-pojo-report/pom.xml | 3 ++- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 4 ++-- modules/i3plus-pojo-wms/pom.xml | 4 ++-- modules/i3plus-pojo-workflow/pom.xml | 4 ++-- pom.xml | 2 +- 19 files changed, 38 insertions(+), 32 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..9d4bcf9 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 3d6cbc0..3c603b2 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar - + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 96472ad..8debbf6 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 3937425..0bb5683 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-form jar - + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..f927537 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 5bfdd66..4c515c4 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,12 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ics + jar + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 8b15a31..939370d 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar - + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..29778e4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-lac jar + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index f9957c9..4f24980 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 409b79a..c7bebed 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 846c302..b5c2cd3 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 23f68bd..3dc593d 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-platform jar - + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 28cf55f..d1db96a 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ptl jar - + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..4f23437 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-report jar + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 1b72275..788be96 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 910d630..36a40da 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-sweb jar - + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index e5b4e5c..63d500c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-wms jar - + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0ecf190..f0812c0 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar - + 1.0-PROD-SNAPSHOT diff --git a/pom.xml b/pom.xml index fbbe86f..c4793b9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 3669fbb4a41ce0183adb5af832bfb2a5b2eb3f5a Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 12 May 2020 18:57:49 +0800 Subject: [PATCH 02/45] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93=E9=9B=AA=E5=B4=A9,=E6=9C=89=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=AF=B7=E6=8E=92=E6=9F=A5=E6=AD=A4=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 204 ++++++++++++++++----- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 47 ----- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 + .../i3plus/pojo/model/license/ImppLicense.java | 23 +++ .../i3plus/pojo/platform/bean/SysDataSource.java | 87 +++++++++ .../i3plus/pojo/platform/bean/SysDepartment.java | 8 + .../estsh/i3plus/pojo/platform/bean/SysMenu.java | 6 + .../i3plus/pojo/platform/bean/SysOrganize.java | 9 + .../i3plus/pojo/platform/bean/SysPojoVersion.java | 13 +- .../i3plus/pojo/platform/bean/SysPosition.java | 7 + .../estsh/i3plus/pojo/platform/bean/SysRole.java | 17 +- .../i3plus/pojo/platform/bean/SysUserInfo.java | 5 + .../repository/SysDataSourceRepository.java | 14 ++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 89 ++++++--- 14 files changed, 408 insertions(+), 125 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 01ad320..b1bdf8d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -19,58 +19,69 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SOFT_TYPE { - IMPP(1, 0, 0, "impp-platform", "IMPP平台"), - CORE(2, 8100, 4, "i3core", "i3业务平台"), - WMS(3, 8200, 10, "i3wms", "仓库管理软件"), - MES(4, 8300, 11, "i3mes", "生产管理软件"), - QMS(5, 0, 0, "i3qms", "质量管理软件"), - MES_PCN(6, 8350, 12, "i3mes-pcn", "生产管理软件-节点中心"), - SWEB(7, 8800, 19, "i3sweb", "供应商服务"), - - PTL(8, 8700, 20, "i3ptl", "亮灯自动拣选"), - PTL_PCN(9, 8750, 21, "i3ptl-pcn", "亮灯自动拣选-节点中心"), - - FORM(20, 8900, 16, "block-form", "智能表单"), - REPORT(21, 8910, 17, "block-report", "智能报表"), - WORKFLOW(22, 0, 0, "block-workflow", "智能工作流"), - JOBFLOW(23, 0, 0, "block-jobflow", "智能作业流"), - SOFTSWITCH(24, 8920, 18, "block-softswitch", "软件适配器"), - HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"), - LAC(26, 8600, 13, "lac", "连接适配器"), - ANDON(27, 8500, 14, "andon", "安灯"), - APS(28, 8400, 15, "i3aps", "高级计划与排产"), - CENTER(99, 8000, 1, "icloud-server", "注册中心"), - SURFACE(98, 0, 0, "i3surface", "对外服务"), - CLOUD(97, 0, 0, "i3cloud", "微服务"), - GATEWAY(96, 9000, 3, "impp-gateway", "服务网关"), - CONSOLE(95, 8010, 2, "impp-console", "服务监控台"), - DEV(9999, 0000, 0, "Development", "系统调试"); + /** WMS 服务 */ + WMS(3, 8200, 10, 102000000L, "i3wms", "仓库管理软件"), + SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"), + QMS(5, 0, 0, 0, "i3qms", "质量管理软件"), - /** - * 产品ID - */ + /** Mes 服务 */ + MES(4, 8300, 11, 103000000L, "i3mes", "生产管理软件"), + MES_PCN(6, 8350, 12, 107000000L, "i3mes-pcn", "生产管理软件-节点中心"), + + /** PTL 服务 */ + PTL(8, 8700, 20, 111000000L, "i3ptl", "亮灯自动拣选"), + PTL_PCN(9, 8750, 21, 109000000L, "i3ptl-pcn", "亮灯自动拣选-节点中心"), + + /** Block 服务 */ + FORM(20, 8900, 16, 104000000L, "block-form", "智能表单"), + REPORT(21, 8910, 17, 105000000L, "block-report", "智能报表"), + WORKFLOW(22, 0, 0, 0, "block-workflow", "智能工作流"), + JOBFLOW(23, 0, 0, 0, "block-jobflow", "智能作业流"), + SOFTSWITCH(24, 8920, 18, 130000000L, "block-softswitch", "软件适配器"), + HARDSWITCH(25, 0, 0, 0, "block-hardswitch", "硬件适配器"), + + /** LAC 服务 */ + LAC(26, 8600, 13, 150000000L, "lac", "连接适配器"), + + /** 安灯服务 */ + ANDON(27, 8500, 14, 110000000L, "andon", "安灯"), + + /** 计划排产服务 */ + APS(28, 8400, 15, 140000000L, "i3aps", "高级计划与排产"), + SURFACE(98, 0, 0, 0, "i3surface", "对外服务"), + + /** 基础服务 */ + IMPP(1, 0, 0, 100000000L, "impp-platform", "IMPP平台"), + CONSOLE(95, 8010, 0, 0, "impp-console", "服务监控台"), + GATEWAY(96, 9000, 0, 0, "impp-gateway", "服务网关"), + CLOUD(97, 0, 0, 0, "i3cloud", "微服务"), + CENTER(99, 8000, 1, 0, "icloud-server", "注册中心"), + + /** 平台服务 */ + CORE(2, 8100, 4, 101000000L, "i3core", "i3业务平台"), + + /** 调试服务 */ + DEV(9999, 0000, 0, 120000000L, "Development", "系统调试"); + + + /** 产品ID */ private int value; - /** - * 应用默认端口 - */ - private int prot; - /** - * 应用默认雪花DataBaseId(0-31)共32 个存储区 - */ + /** 应用默认端口 */ + private int port; + /** 应用默认雪花DataBaseId(0-31)共32 个存储区 */ private int snowflakeId; - /** - * 产品代码 - */ + /** 产品代码 */ private String code; - /** - * 产品描述 - */ + /** 顶级菜单代码 */ + private long menuRootId; + /** 产品描述 */ private String description; - SOFT_TYPE(int value, int prot, int snowflakeId, String code, String description) { + SOFT_TYPE(int value, int port, int snowflakeId, long menuRootCode, String code, String description) { this.value = value; - this.prot = prot; + this.port = port; this.snowflakeId = snowflakeId; + this.menuRootId = menuRootCode; this.code = code; this.description = description; } @@ -87,14 +98,18 @@ public class CommonEnumUtil { return description; } - public int getProt() { - return prot; + public int getPort() { + return port; } public int getSnowflakeId() { return snowflakeId; } + public long getMenuRootId() { + return menuRootId; + } + public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -135,7 +150,6 @@ public class CommonEnumUtil { } public static SOFT_TYPE valueOf(int val) { - String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { return values()[i]; @@ -144,6 +158,15 @@ public class CommonEnumUtil { return null; } + public static SOFT_TYPE valueOfMenuRootId(long id) { + for (int i = 0; i < values().length; i++) { + if (values()[i].menuRootId == id) { + return values()[i]; + } + } + return null; + } + public static SOFT_TYPE codeOfDescription(String code) { for (int i = 0; i < values().length; i++) { if (values()[i].code.equals(code)) { @@ -921,7 +944,9 @@ public class CommonEnumUtil { public enum LOG_LOGIN_PLATFORM { PC_IMPP_CORE(10, "PC-IMPP", "PC后台管理端"), PC_WMS_SWEB(20, "PC-SWEB", "PC SWEB后台管理端"), - Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端"); + Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端"), + MES_PCN(40, "MES-PCN", "MES-PCN"), + PTL_PCN(50, "PTL-PCN", "PTL-PCN"); private int value; private String name; @@ -2176,6 +2201,89 @@ public class CommonEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_SOURCE_STATUS { + CONN_SUCCESS(10, "验证成功", "验证成功"), + CONN_FAILURE(20, "验证失败", "验证失败"); +// TIME_OUT(30, "连接超时", "连接超时"), +// AUTH_ERROR(40, "账号密码错误", "账号密码错误"); + + private int value; + private String code; + private String description; + + private DATA_SOURCE_STATUS (int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + 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; + } + } + return tmp; + } + + public static DATA_SOURCE_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * PC自定义搜索-字段类型 * 10-文本，20-数字，30-下拉框，40，时间，50-开窗 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 0323dbd..86c0877 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -6416,53 +6416,6 @@ public class WmsEnumUtil { } /** - * BatchHold 值类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum FG_INSTOCK_SN_TYPE { - NORMAL(10, "NORMAL", "实物条码(正常)"), - FIRST_PIECE(20, "FIRST_PIECE", "首件"), - MIDDLE_PIECE(30, "MIDDLE_PIECE", "中件"), - TAIL_PIECE(40, "TAIL_PIECE", "末件"); - - private int value; - private String code; - private String description; - - FG_INSTOCK_SN_TYPE(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public String getCode() { - return code; - } - - public static String valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - - public static String valueOfDescription(int val) { - return valueOf(val); - } - } - - /** * 返修、挑选状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 4d2fc73..fc99205 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 @@ -130,6 +130,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("密码") private String password; + @Column(name = "DEFAULT_RULE") + @ApiParam("默认赋值属性") + private String defaultRule; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java index 77c3e53..d1cc3c6 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java @@ -70,6 +70,28 @@ public class ImppLicense implements Serializable { @ApiParam(value ="深思授权信息") private ImppLicenseSenseshield senseshield; + /* 备用预留字段 */ + @ApiParam(value ="备用字段") + private String licenseSpare01; + @ApiParam(value ="备用字段") + private String licenseSpare02; + @ApiParam(value ="备用字段") + private String licenseSpare03; + @ApiParam(value ="备用字段") + private String licenseSpare04; + @ApiParam(value ="备用字段") + private String licenseSpare05; + @ApiParam(value ="备用字段") + private String licenseSpare06; + @ApiParam(value ="备用字段") + private String licenseSpare07; + @ApiParam(value ="备用字段") + private String licenseSpare08; + @ApiParam(value ="备用字段") + private String licenseSpare09; + @ApiParam(value ="备用字段") + private String licenseSpare10; + /* 业务人员信息 */ @ApiParam(value ="授权创建时间") private Date licenseCreateDateTime; // 授权时间 @@ -92,6 +114,7 @@ public class ImppLicense implements Serializable { @ApiParam(value ="锁类型") private String lockType; + /* 基础业务逻辑 */ @ApiParam(value ="到期时间") private String maturityDateTime; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java new file mode 100644 index 0000000..a32264f --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +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; + +/** + * @Description : 数据对象 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-02-27 10:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_DATA_SOURCE") +@Api(value="数据对象") +public class SysDataSource extends BaseBean { + + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + + @Column(name="SOURCE_NAME") + @ApiParam(value ="数据源名称") + private String sourceName; + + @Column(name="SOURCE_CODE") + @ApiParam(value ="数据源编码") + private String sourceCode; + + @Column(name="SOURCE_STATUS") + @ApiParam(value ="数据源状态",name = "状态：可用，不可用 看枚举当中是否存在") + private Integer sourceStatus; + public String getSourceStatusTxt() { + return softType == null ? null : CommonEnumUtil.DATA_SOURCE_STATUS.valueOfDescription(sourceStatus); + } + + @Column(name="SOURCE_TYPE") + @ApiParam(value ="数据源类型",name = "BlockFormEnumUtil.DATA_SOURCE_TYPE") + private Integer sourceType; + public String getSourceTypeTxt() { + return softType == null ? null : CommonEnumUtil.DATA_SOURCE_TYPE.valueOfDescription(sourceType); + } + + + @Column(name="SOURCE_HOST") + @ApiParam(value ="数据源连接地址") + private String sourceHost; + + @Column(name="SOURCE_PORT") + @ApiParam(value ="数据源端口") + private Integer sourcePort; + + @Column(name="SOURCE_DATA_BASE_NAME") + @ApiParam(value ="数据库名称") + private String sourceDataBaseName; + + @Column(name="SOURCE_USER_NAME") + @ApiParam(value ="数据库用户名称") + private String sourceUserName; + + @Column(name="SOURCE_PASSWORD") + @ApiParam(value ="数据库用户密码") + private String sourcePassword; + + @Column(name="SOURCE_DESCRIPTION") + @ApiParam(value ="数据源描述") + private String sourceDescription; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java index 79daa0f..4121b94 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java @@ -68,4 +68,12 @@ public class SysDepartment extends BaseBean { @ApiParam(value ="子集列表") private List childList; + public SysDepartment() { + } + + public SysDepartment(String departmentCode, Long parentId, Long organizeId) { + this.departmentCode = departmentCode; + this.parentId = parentId; + this.organizeId = organizeId; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 8a47f38..59afede 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -113,4 +113,10 @@ public class SysMenu extends BaseBean { @ApiParam(value ="子集列表") private List childList = new ArrayList<>(); + public SysMenu() { + } + + public SysMenu(String menuCode) { + this.menuCode = menuCode; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java index 2bb58d7..e8162c5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java @@ -80,4 +80,13 @@ public class SysOrganize extends BaseBean { @ApiParam(value ="子集ID列表") private List childIdList; + public SysOrganize() { + } + + public SysOrganize(String organizeCode, Integer organizeType, Long parentId, Integer organizeStatus) { + this.organizeCode = organizeCode; + this.organizeType = organizeType; + this.parentId = parentId; + this.organizeStatus = organizeStatus; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java index 3fe7559..4348f54 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java @@ -26,7 +26,10 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_POJO_VERSION") +@Table(name="SYS_POJO_VERSION",indexes = { + @Index(name="index_sys_pojo_version_ref_id",columnList = "REF_ID"), + @Index(name="index_sys_pojo_version_ref_class",columnList = "REF_CLASS"), +}) @Api(value="对象历史") public class SysPojoVersion extends BaseBean { @@ -41,6 +44,11 @@ public class SysPojoVersion extends BaseBean { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } + @Column(name="PLAN_ID") + @ApiParam(value ="对象计划id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long planId; + @Column(name="REF_ID") @ApiParam(value ="对象id" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -79,4 +87,7 @@ public class SysPojoVersion extends BaseBean { @ApiParam(value ="用户部门信息") private SysPojoVersionDetail versionDetail; + @Transient + @ApiParam(value ="操作对象本身") + private String bean; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java index 1479652..9040b15 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java @@ -59,4 +59,11 @@ public class SysPosition extends BaseBean { @ApiParam(value ="子部门列表") private List childList; + public SysPosition() { + } + + public SysPosition(String positionCode, Long parentId) { + this.positionCode = positionCode; + this.parentId = parentId; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 9786250..788a76c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -11,10 +11,8 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.Type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; +import java.util.List; /** * @Description : 用户登陆表 @@ -53,4 +51,15 @@ public class SysRole extends BaseBean { @ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1") private Integer roleStatus; + @Transient + @ApiParam(value ="角色拥有功能权限信息") + private transient List menuIdList; + + public SysRole() { + } + + public SysRole(String name, Integer roleStatus) { + this.name = name; + this.roleStatus = roleStatus; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 0a3735b..fded310 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -247,4 +247,9 @@ public class SysUserInfo extends BaseBean { @ApiParam(value = "岗位信息") @AnnoOutputColumn(hidden = true) private SysPosition position; + + @Transient + @ApiParam(value = "图像信息") + @AnnoOutputColumn(hidden = true) + private String imageFileUrl; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.java new file mode 100644 index 0000000..15c469b --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysDataSource; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-11 上午11:05 + * @Modify: + **/ +public interface SysDataSourceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 8e68d4d..d71a80e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -128,7 +128,7 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(position.getOrganizeCode()); // 查询参数封装 -// DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); // String Like DdlPreparedPack.getStringLikerPack(position.getName(),"name",result); DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); @@ -154,6 +154,21 @@ public class CoreHqlPack { /** + * 岗位复杂查询 + * @param bean + * @return + */ + public static DdlPackBean packHqlSysRefUserPosition(SysRefUserPosition bean){ + DdlPackBean result = DdlPackBean.getDdlPackBean(bean); + + // 查询参数封装 + DdlPreparedPack.getNumEqualPack(bean.getUserId(),"userId",result); + + return result; + } + + + /** * 组织复杂查询 * @param organize * @return @@ -176,13 +191,22 @@ public class CoreHqlPack { } public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List idList){ + HqlPack.getOrderDefault(organize); + DdlPackBean result = DdlPackBean.getDdlPackBean(organize); - // String Like DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result); DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getNumEqualPack(organize.getParentId(),"parentId",result); + + // 查询参数封装 + if(organize.getChildIdList() != null){ + DdlPreparedPack.getInPack(StringUtils.join(organize.getChildIdList(),","),"parentId",result); + } + // Number In DdlPreparedPack.getInPackList(idList,"id",result); + return result; } @@ -201,6 +225,7 @@ public class CoreHqlPack { * @param department * @return */ + @Deprecated public static String packHqlSysDepartment(SysDepartment department){ StringBuffer result = new StringBuffer(); @@ -223,34 +248,15 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(department); DdlPreparedPack.getStringLikerPack(department.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result); + DdlPreparedPack.getNumEqualPack(department.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); + DdlPreparedPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); DdlPreparedPack.getInPackList(idList,"id",result); result.setOrderByStr(department.orderBy()); return result; } - /** - * 系统权限复杂查询 - * @param menu - * @return - */ - public static String packHqlSysMenu(SysMenu menu){ - StringBuffer result = new StringBuffer(); - - // 查询参数封装 - HqlPack.getNumEqualPack(menu.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(menu.getMenuType(),"menuType",result); - HqlPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); - HqlPack.getStringLikerPack(menu.getName(),"name",result); - HqlPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); - - // 添加默认排序 - HqlPack.getOrderDefault(menu); - - return result.toString(); - } - public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List idList){ DdlPackBean result = DdlPackBean.getDdlPackBean(menu); @@ -1008,7 +1014,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary){ - DdlPackBean packBean = new DdlPackBean(); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(sysDictionary); DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean); DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean); @@ -1020,4 +1026,37 @@ public class CoreHqlPack { return packBean; } + + /** + * 按条件查询字典 + * @param bean + * @return + */ + public static DdlPackBean packHqlSysPojoVersion(SysPojoVersion bean){ + DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean); + + DdlPreparedPack.getNumEqualPack(bean.getRefId(),"refId",packBean); + DdlPreparedPack.getNumEqualPack(bean.getPlanId(),"planId",packBean); + DdlPreparedPack.getNumEqualPack(bean.getOperateType(),"operateType",packBean); + DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(),"refClass",packBean); + DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(),"versionMethodName",packBean); + DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(),"pojoCompare",packBean); + + return packBean; + } + + + public static DdlPackBean packSysDataSource(SysDataSource bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean); + + DdlPreparedPack.getStringLikerPack(bean.getSourceHost(), "sourceHost", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getSourceName(), "sourceName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getSourceCode(), "sourceCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getSourceDataBaseName(), "sourceDataBaseName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getSourceType(), "sourceType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getSourceStatus(), "sourceStatus", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getSoftType(), "softType", ddlPackBean); + + return ddlPackBean; + } } \ No newline at end of file From c288b5466062ece5aab1f8f994254bdbba9a63f2 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 14 May 2020 13:46:46 +0800 Subject: [PATCH 03/45] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/bean/SysDataSource.java | 1 + .../i3plus/pojo/platform/bean/SysPojoVersion.java | 4 +--- .../pojo/platform/bean/SysPojoVersionDetail.java | 3 +-- .../pojo/platform/bean/SysPojoVersionPlan.java | 2 +- .../pojo/platform/platbean/SysLogConsole.java | 5 ++++- .../pojo/platform/platbean/SysLogException.java | 13 ++++-------- .../pojo/platform/platbean/SysLogOperate.java | 23 +++++++++------------- .../pojo/platform/platbean/SysLogSystem.java | 10 ++++++++-- .../pojo/platform/platbean/SysLogTaskTime.java | 9 ++++++--- .../i3plus/pojo/report/sqlpack/ReportHqlPack.java | 8 ++++---- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java index a32264f..fce7b6f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="数据对象") public class SysDataSource extends BaseBean { + private static final long serialVersionUID = -3116421427693381484L; @Column(name="SOFT_TYPE") @ApiParam(value ="产品类型") private Integer softType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java index 4348f54..8c7a6cb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java @@ -33,9 +33,7 @@ import javax.persistence.*; @Api(value="对象历史") public class SysPojoVersion extends BaseBean { - - private static final long serialVersionUID = -2456588444446248239L; - + private static final long serialVersionUID = -2265406135818649545L; @Column(name="SOFT_TYPE") @ApiParam(value ="产品类型") private Integer softType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java index 19f9d82..9831c18 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java @@ -32,8 +32,7 @@ import javax.persistence.Table; @Api(value="对象历史") public class SysPojoVersionDetail extends BaseBean { - - private static final long serialVersionUID = -2456588444446248239L; + private static final long serialVersionUID = 5385530381442176242L; @Column(name="POJO_VERSION_ID") @ApiParam(value ="对象id" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java index 407d667..8be2265 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java @@ -29,7 +29,7 @@ import javax.persistence.Table; @Api(value="对象历史") public class SysPojoVersionPlan extends BaseBean { - private static final long serialVersionUID = -1120504360281638917L; + private static final long serialVersionUID = -3125272220108497862L; @Column(name="SOFT_TYPE") @ApiParam(value ="产品类型") private Integer softType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index fd31e35..f9c7f28 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -35,7 +35,10 @@ public class SysLogConsole extends BaseBean { /******** 服务器信息 ********/ @Column(name="SOFT_TYPE") @ApiParam(value ="产品名称") - private String softType; + private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } @Column(name="LOG_HOST") @ApiParam(value ="服务器IP") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index e4b46a1..d64db0e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -33,17 +33,12 @@ public class SysLogException extends BaseBean { //CommonEnumUtil.SOFT_TYPE @Indexed - @Column(name="EXC_MODULE_ID") + @Column(name="SOFT_TYPE") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") - private Integer excModule; - - private String excModuleName; - public String getExcModuleName(){ - if(this.excModule != null){ - return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.excModule); - } - return excModuleName; + private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } @Column(name="EXC_CLASS_NAME") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index c9d392c..704d025 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -35,17 +35,12 @@ import javax.persistence.Table; public class SysLogOperate extends BaseBean { @Indexed - @Column(name="OPERATE_MODULE") + @Column(name="SOFT_TYPE") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") - private Integer operateModule; - - private String operateModuleName; - public String getOperateModuleName(){ - if(this.operateModule != null){ - return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.operateModule); - } - return operateModuleName; + private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } @Indexed @@ -54,8 +49,8 @@ public class SysLogOperate extends BaseBean { @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description") private Integer operateType; - public String getOperateTypeName(){ - return ImppEnumUtil.OPERATE_TYPE.valueOfCode(operateType); + public String getOperateTypeTxt(){ + return operateType == null ? null : ImppEnumUtil.OPERATE_TYPE.valueOfDescription(operateType); } @Column(name="OPERATE_MESSAGE") @@ -74,9 +69,9 @@ public class SysLogOperate extends BaseBean { @ApiParam(value ="请求路径" , access ="请求路径") private String requestUrl; - @Column(name="HTTP_METHOD") - @ApiParam(value ="http请求方法" , access ="http请求方法") - private String httpMethod; +// @Column(name="HTTP_METHOD") +// @ApiParam(value ="http请求方法" , access ="http请求方法") +// private String httpMethod; @Column(name="LOG_ARGS") @ApiParam(value ="方法入参" , access ="方法入参") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index 5d81ed5..5de995d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -39,12 +39,18 @@ public class SysLogSystem extends BaseBean { @ApiParam(value ="日志级别" , example ="1") @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class,refForeignKey = "value",value = "name") private Integer logLevel; + public String getLogLevelTxt() { + return logLevel == null ? null : ImppEnumUtil.LOG_LEVEL.valueOfDescription(logLevel); + } @Indexed - @Column(name="LOG_MODULE_ID") + @Column(name="SOFT_TYPE") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") - private Integer logModuleId; + private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } @Column(name="REMOTE_IP") @ApiParam(value ="请求IP" , access ="请求IP") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index fedc271..591d9a9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -63,9 +63,12 @@ public class SysLogTaskTime extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long taskPlanId; - @Column(name = "TASK_SOFT_TYPE_RDD") - @ApiParam(value = "任务所属模块") - private Integer taskSoftTypeRdd; + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品名称") + private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } @Column(name="TASK_CYCLE_NAME_RDD") @ApiParam(value ="任务周期名称") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index 2beeaa9..c465cee 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -114,13 +114,13 @@ public class ReportHqlPack { * @param brLayout * @return */ - public static String packHqlBrLayout(BrLayout brLayout){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBrLayout(BrLayout brLayout){ + DdlPackBean result = DdlPackBean.getDdlPackBean(brLayout); // 查询参数封装 - HqlPack.getStringLikerPack(brLayout.getLayoutName(),"layoutName",result); + DdlPreparedPack.getStringLikerPack(brLayout.getLayoutName(),"layoutName",result); - return result.toString(); + return result; } /** From fc99ee8914c84e19d6d367371fd16aa64ba38ebd Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 14 May 2020 19:00:10 +0800 Subject: [PATCH 04/45] =?UTF-8?q?pojo=20=E5=BA=8F=E5=88=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java | 6 +++++- .../cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java | 6 ++++-- .../cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java | 4 +++- .../cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java | 3 ++- .../cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java | 3 ++- .../cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java | 1 + .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java | 6 ++++-- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java | 6 ++++-- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java | 6 +++++- .../cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java | 2 +- .../java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java | 2 +- .../java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java | 2 ++ 100 files changed, 293 insertions(+), 99 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java index 749eae4..c8767a5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_呼叫原因 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "ANDON_呼叫原因") -public class AndonAlarmCause extends BaseBean { +public class AndonAlarmCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5837347497945981811L; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java index 1ec4182..0594355 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : 安灯子类型 @@ -28,7 +29,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯子类型") -public class AndonAlarmDetailType extends BaseBean { +public class AndonAlarmDetailType extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1540491136291384925L; @Column(name = "ALARM_DETAIL_CODE") @ApiParam(value = "安灯子类型编码") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java index e0bbc8e..286fcbc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : ANDON_呼叫通知配置 @@ -28,7 +29,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_呼叫通知配置") -public class AndonAlarmResponseCfg extends BaseBean { +public class AndonAlarmResponseCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4302725908675374347L; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java index afd4cb0..82bfda2 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :安灯广播 @@ -27,7 +28,10 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="ANDON_BROADCAST") @Api("安灯广播") -public class AndonBroadCast extends BaseBean { +public class AndonBroadCast extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5383684820100076411L; + @Column(name="DEVICE_NUM") @ApiParam("广播设备编号") private String targetIds; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java index 750e650..698bebb 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -30,7 +31,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name="ANDON_BROADCAST_CFG") @Api("生产区域") -public class AndonBroadCastCfg extends BaseBean { +public class AndonBroadCastCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5434544329665544113L; + @Column(name="ALARM_CODE") @ApiParam("安灯类型代码") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java index 9d9df79..2e8c77e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_工作单元呼叫原因配置 @@ -29,7 +30,10 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元呼叫原因配置") -public class AndonCellAlarmCause extends BaseBean { +public class AndonCellAlarmCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3623997837738333774L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java index 1be0a94..abf5ff9 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_工作单元事件原因配置 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元事件原因配置") -public class AndonCellEventCause extends BaseBean { +public class AndonCellEventCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1641944472466007171L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java index 00dea5f..23c8d1b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_工作单元处理方法配置 @@ -29,7 +30,10 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元处理方法配置") -public class AndonCellEventMethod extends BaseBean { +public class AndonCellEventMethod extends BaseBean implements Serializable { + + private static final long serialVersionUID = 8681966862823447650L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java index 8cfd0b7..ef790dc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : ANDON_工作单元事件现象 @@ -26,7 +27,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元事件现象") -public class AndonCellEventPhenomenon extends BaseBean { +public class AndonCellEventPhenomenon extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4413846938406056923L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java index c194faf..cd82b84 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : ANDON_工位分组配置 @@ -29,7 +30,10 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工位分组配置") -public class AndonCellGroupCfg extends BaseBean { +public class AndonCellGroupCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4801397986303698999L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java index 0f39a62..a6653c7 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : 系统参数配置 @@ -26,7 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="ANDON_CONFIG") @Api(value="系统配置") -public class AndonConfig extends BaseBean { +public class AndonConfig extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3284234821448139251L; @Column(name="NAME") @ApiParam(value ="名称") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index 9f8d287..1db40c9 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -14,7 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.List; +import java.io.Serializable; /** * @Description : ANDON_自处理配置 @@ -30,7 +30,9 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_自处理配置") -public class AndonDisposalCfg extends BaseBean { +public class AndonDisposalCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 161656982939855466L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java index 83e1572..d2bd2cd 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: 自处理维护配置 @@ -29,7 +30,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("Andon自处理维护配置") -public class AndonDisposalMaintenCfg extends BaseBean { +public class AndonDisposalMaintenCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 474667557264134793L; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java index 2491043..91bb41b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_事件原因 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "ANDON_事件原因") -public class AndonEventCause extends BaseBean { +public class AndonEventCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3051829000971794178L; @Column(name = "EC_CODE") @ApiParam(value = "事件原因代码") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java index f681bb6..c5371c6 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_事件处理方法 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "ANDON_事件处理方法") -public class AndonEventMethod extends BaseBean { +public class AndonEventMethod extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2079366249221906256L; @Column(name = "EM_CODE") @ApiParam(value = "事件方法代码") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java index 43877a3..52cf481 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_事件现象 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_事件现象") -public class AndonEventPhenoMenon extends BaseBean { +public class AndonEventPhenoMenon extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3844606172813258352L; @Column(name = "EPM_CODE") @ApiParam(value = "事件现象代码") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java index 95aa421..a7dcae8 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : 安灯停线配置数据 @@ -34,7 +35,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯队列") -public class AndonHaltCfg extends BaseBean { +public class AndonHaltCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6209233767460121461L; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java index 3c89d14..4def408 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : ANDON_停机类型 @@ -26,7 +27,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_停机类型") -public class AndonHaltType extends BaseBean { +public class AndonHaltType extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7816748747119429173L; @Column(name = "HALT_CODE") @ApiParam(value = "停机类型编码") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java index ff4853d..6213675 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,10 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON知识库") -public class AndonKnowledgeBase extends BaseManageQueue { +public class AndonKnowledgeBase extends BaseManageQueue implements Serializable { + + private static final long serialVersionUID = -1636250887271456543L; + @Column(name = "FLOW_STATUS") @ApiParam(value = "审批状态") private Integer flowStatus; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index f2be38c..e02d1a3 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; @@ -41,7 +42,10 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯队列") -public class AndonManageQueue extends BaseManageQueue { +public class AndonManageQueue extends BaseManageQueue implements Serializable { + + private static final long serialVersionUID = 183865984747203897L; + @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") private Double seq; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index a5d557a..0c285bc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description : 安灯记录 @@ -36,7 +37,9 @@ import javax.persistence.*; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯记录") -public class AndonManageRecord extends BaseManageQueue { +public class AndonManageRecord extends BaseManageQueue implements Serializable { + + private static final long serialVersionUID = 4667499369694353351L; @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java index 5c81250..59d4a55 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: 安灯通知记录表 @@ -29,7 +30,10 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("通知记录") -public class AndonMessageRecord extends BaseBean { +public class AndonMessageRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5002185160195696080L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java index e9bbc29..385b069 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_PLC控制 @@ -30,7 +31,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯PLC控制") -public class AndonPLC extends BaseBean { +public class AndonPLC extends BaseBean implements Serializable { + + private static final long serialVersionUID = -611094238158756163L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java index 33078db..ee4c926 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : ANDON_PLC监控记录 @@ -34,7 +35,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯PLC监控记录") -public class AndonPLCRecord extends BaseBean { +public class AndonPLCRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1593292976397416635L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java index 31fda6a..cf92a50 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : 安灯任务附属表 @@ -26,7 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="ANDON_MANAGE_ATTACH") @Api(value="安灯附属表") -public class AndonQueueAttach extends BaseBean { +public class AndonQueueAttach extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6314624948969141111L; @Column(name="PROD_INFO") @ApiParam(value ="产品信息" , example ="-1") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java index fee0346..2a428d1 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -28,7 +29,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("通知方式") -public class AndonResponse extends BaseBean { +public class AndonResponse extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3558849492798328348L; @Column(name = "RESPONSE_CODE") @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java index b2ad1a2..7236d3a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : 安灯通知对象 @@ -28,7 +29,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯通知对象") -public class AndonResponseObject extends BaseBean { +public class AndonResponseObject extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7623038823371770473L; @Column(name = "RP_OBJECT_CODE") @ApiParam(value = "通知对象对象编码") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java index ae42d1b..3316350 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java @@ -16,6 +16,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -32,7 +33,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name="MES_AREA") @Api("生产区域") -public class MesArea extends BaseBean { +public class MesArea extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6011431901401687892L; + @Column(name="AREA_CODE") @ApiParam("区域代码") private String areaCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java index 59d6249..2761fab 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java @@ -17,6 +17,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :生产设备 @@ -32,7 +33,10 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name="MES_EQUIPMENT") @Api("生产设备") -public class MesEquipment extends BaseBean { +public class MesEquipment extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4827453020382814751L; + @Column(name="EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java index 533c56a..9098f6b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="MES_SHIFT") @Api("班次信息") -public class MesShift extends BaseBean { +public class MesShift extends BaseBean implements Serializable { + + private static final long serialVersionUID = -459263592129978101L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java index 0533141..8bb58e7 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -31,7 +32,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL") @Api("工作单元") -public class MesWorkCell extends BaseBean { +public class MesWorkCell extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5981041286446162921L; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java index eb81426..8cf20a2 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -31,7 +32,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CENTER") @Api("工作中心") -public class MesWorkCenter extends BaseBean { +public class MesWorkCenter extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1988041859547182829L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index 6c8ff91..6c046d9 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -13,7 +13,9 @@ import java.io.Serializable; * @Modify: **/ @Data -public class AndonBoardModel { +public class AndonBoardModel implements Serializable { + + private static final long serialVersionUID = 4995310176494124290L; @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java index 79813f6..06230c4 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -16,7 +17,9 @@ import java.util.List; * @Modify: **/ @Data -public class AndonMenuInterfaceModel{ +public class AndonMenuInterfaceModel implements Serializable { + + private static final long serialVersionUID = 6854130571481363067L; @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java index 5585338..e35260e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java @@ -9,6 +9,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.MappedSuperclass; +import java.io.Serializable; /** * @Description: @@ -19,7 +20,9 @@ import javax.persistence.MappedSuperclass; **/ @Data @MappedSuperclass -public class BaseManageQueue extends BaseBean { +public class BaseManageQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5223610541891941843L; @Column(name = "ANDON_ORDER_NO") @ApiParam(value = "安灯队列编号") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java index 42af00f..217927d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java @@ -12,13 +12,16 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; +import java.io.Serializable; import java.util.List; /** * 工位分组配置model */ @Data -public class CellGroupStatusModel{ +public class CellGroupStatusModel implements Serializable { + + private static final long serialVersionUID = -6614881484056090725L; @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java index 5df7d8d..d7be692 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Entity; +import java.io.Serializable; /** * @Description: @@ -23,7 +24,9 @@ import javax.persistence.Entity; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("组织模型") -public class ProdOrgModel extends BaseBean { +public class ProdOrgModel extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2210888838877951435L; @ApiParam("区域名称") private String areaName; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java index 53e0faf..6f78bda 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java @@ -4,9 +4,12 @@ import cn.estsh.i3plus.pojo.andon.bean.MesArea; import io.swagger.annotations.ApiParam; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; -public class SysOrganizeModel{ +public class SysOrganizeModel implements Serializable { + + private static final long serialVersionUID = -8218859255737680832L; @Transient @ApiParam(value ="父节点") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java index 41f39d8..258296d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java @@ -29,7 +29,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("作业组件") public class PtlActionModule extends BaseBean implements Serializable { - private static final long serialVersionUID = 4734809867665293289L; + + private static final long serialVersionUID = -4114157018012638259L; @Column(name = "AM_CODE") @ApiParam("组件代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java index 44fb849..90e4cd7 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("组件集") public class PtlActionModuleGroup extends BaseBean implements Serializable { - private static final long serialVersionUID = 5581772484177493182L; + + private static final long serialVersionUID = 1250324721395561455L; @Column(name = "AMG_ID") @ApiParam("组件集编号") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java index 82ba6c0..e3bd0f0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java @@ -29,7 +29,7 @@ import java.io.Serializable; @Api("组件参数") public class PtlActionModuleParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -1015028092547846989L; + private static final long serialVersionUID = 4579868625998473374L; @Column(name = "AM_CODE") @ApiParam("组件代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java index 3d2f7f7..eac7e13 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("作业流程") public class PtlActionRoute extends BaseBean implements Serializable { - private static final long serialVersionUID = 6246614708550175795L; + + private static final long serialVersionUID = -8864181068138221051L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java index 43d20b5..d3bbefe 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("ACTOR信息") public class PtlActor extends BaseBean implements Serializable { - private static final long serialVersionUID = 5647053475810310357L; + + private static final long serialVersionUID = -7339437529064969381L; @Column(name = "ACTOR_CODE") @ApiParam("actor代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java index 9324978..f8fa5fb 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("ACTOR消息获取规则") public class PtlActorRule extends BaseBean implements Serializable { - private static final long serialVersionUID = -1515292442151992142L; + + private static final long serialVersionUID = -963692719400754670L; @Column(name = "ACTOR_CODE") @ApiParam("actor代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java index 2a779bc..05de822 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java @@ -31,7 +31,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Api("区域") public class PtlArea extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596443841199197995L; + + private static final long serialVersionUID = 2112712129904360675L; @Column(name = "AREA_NO") @ApiParam("区域代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java index cae88c8..caf5c46 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("PTL_区域观察者事件配置") public class PtlAreaActorAction extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596837642283797995L; + + private static final long serialVersionUID = -7531797997172228131L; @Column(name = "AREA_NO") @ApiParam("区域代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java index 9672b1d..c5a58e1 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java @@ -29,7 +29,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区域作业流程") public class PtlAreaRoute extends BaseBean implements Serializable { - private static final long serialVersionUID = -9139851888717990905L; + + private static final long serialVersionUID = 2190158227924727752L; @Column(name = "AREA_NO") @ApiParam("区域代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java index 14bc428..34c5e42 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("PTL_区域流程组件调用参数") public class PtlAreaRouteModuleParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596829442283797995L; + + private static final long serialVersionUID = -3322697230578335377L; @Column(name = "AREA_NO") @ApiParam("区域代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java index eec1146..8bed06c 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java @@ -30,7 +30,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Api("区段亮灯任务") public class PtlAreaSectionTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 1453616567666404664L; + + private static final long serialVersionUID = 3594963385331020252L; @Column(name = "SECTION_TASK_NO") @ApiParam("区段任务编号") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java index 1d04433..3e14e31 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区段亮灯任务明细") public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = -7563431552643393714L; + + private static final long serialVersionUID = 2881889608152445629L; @Column(name = "SECTION_TASK_NO") @ApiParam("区段任务编号") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java index b07a2d9..2df3ce2 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区域亮灯任务") public class PtlAreaTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 1188465976922660834L; + + private static final long serialVersionUID = -3984445969125341848L; @Column(name = "AREA_TASK_NO") @ApiParam("区域任务编号") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java index 5570ddc..b8a8825 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区域任务进度") public class PtlAreaTaskSeq extends BaseBean implements Serializable { - private static final long serialVersionUID = 7138688457410728493L; + + private static final long serialVersionUID = 8346059210789998285L; @Column(name = "AREA_NO") @ApiParam("区域代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java index 6c72b19..972e412 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -25,7 +25,8 @@ import java.io.Serializable; @Table(name = "PTL_BOM") @EqualsAndHashCode(callSuper = true) public class PtlBom extends BaseBean implements Serializable { - private static final long serialVersionUID = -4459081803170156825L; + + private static final long serialVersionUID = 2676195473413945030L; @Column(name = "PART_NO") @ApiParam("父物料号") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java index 16faab6..fce2d11 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java @@ -29,7 +29,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("控制器") public class PtlControl extends BaseBean implements Serializable { - private static final long serialVersionUID = -5371842196308816310L; + + private static final long serialVersionUID = 3118824964768156554L; @Column(name = "CONTROL_NO") @ApiParam("控制器编号") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java index f11b596..de26af7 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("元素") public class PtlElement extends BaseBean implements Serializable { - private static final long serialVersionUID = 5562337056340313246L; + + private static final long serialVersionUID = 65129699912359054L; @Column(name = "ELEMENT_NO") @ApiParam("元素代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java index 30025bc..5763636 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("元素属性") public class PtlElementAttribute extends BaseBean implements Serializable { - private static final long serialVersionUID = 4591354414381724731L; + + private static final long serialVersionUID = -4734327563828184066L; @Column(name = "ELEMENT_NO") @ApiParam("元素代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java index c066a91..ab70950 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("PTL_接口清单") public class PtlIf extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596882732758197995L; + + private static final long serialVersionUID = 8056691337038646866L; @Column(name = "IF_CODE") @ApiParam("接口代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java index a74cab7..8bde78c 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("界面") public class PtlInterface extends BaseBean implements Serializable { - private static final long serialVersionUID = 5905965593463421411L; + + private static final long serialVersionUID = -380212716030440434L; @Column(name = "INTERFACE_NO") @ApiParam("界面代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java index 56c2b50..6412bb4 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("界面元素") public class PtlInterfaceElement extends BaseBean implements Serializable { - private static final long serialVersionUID = -8436630151033411240L; + + private static final long serialVersionUID = 1583442966822428784L; @Column(name = "INTERFACE_NO") @ApiParam("界面代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java index 445b8f2..8a7c756 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("界面元素属性") public class PtlInterfaceElementAttribute extends BaseBean implements Serializable { - private static final long serialVersionUID = 6603839514256277172L; + + private static final long serialVersionUID = -6093597374268730218L; @Column(name = "INTERFACE_NO") @ApiParam("界面代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java index a14a5a3..eb3e19d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java @@ -29,6 +29,7 @@ import java.util.List; public class PtlLabelTemplate extends BaseBean implements Serializable { private static final long serialVersionUID = 8287307324960885418L; + @Column(name = "TEMPLATE_CODE") @ApiParam(value = "模板代码") private String templateCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java index 08a100e..de2c8ac 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java @@ -30,6 +30,7 @@ import java.io.Serializable; public class PtlLabelTemplateParam extends BaseBean implements Serializable { private static final long serialVersionUID = 7292367173575992422L; + @Column(name = "TEMPLATE_ID") @ApiParam(value = "模板ID", access = "模板ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java index 05b54f6..6733022 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("主任务") public class PtlMainTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 7144785793974319891L; + + private static final long serialVersionUID = 8626414623799663395L; @Column(name = "TASK_NO") @ApiParam("主任务编号") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java index a0eb09b..d273e3e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("主任务明细") public class PtlMainTaskDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 7144785793974319897L; + + private static final long serialVersionUID = -7380963913791704644L; @Column(name = "TASK_NO") @ApiParam("主任务编号") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java index 70d99c0..cdf49e6 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("消息类型") public class PtlMessageType extends BaseBean implements Serializable { - private static final long serialVersionUID = -8899362292879155612L; + + private static final long serialVersionUID = -1202110531150781349L; @Column(name = "MT_CODE") @ApiParam("消息类型代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java index 6339bca..3b9f24f 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("消息类型格式") public class PtlMessageTypeFormat extends BaseBean implements Serializable { - private static final long serialVersionUID = 3398977445081168030L; + + private static final long serialVersionUID = 1114241840945889678L; @Column(name = "MT_CODE") @ApiParam("消息类型代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java index d86d1b1..982dcef 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java @@ -29,7 +29,9 @@ import java.io.Serializable; @Table(name = "PTL_OBJECT_DAO") @Api("PTL_对象与dao对应关系") public class PtlObjectDao extends BaseBean implements Serializable { - private static final long serialVersionUID = 2286752328499060L; + + private static final long serialVersionUID = 3972627525439997959L; + @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java index 6508012..16331af 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("物料") public class PtlPart extends BaseBean implements Serializable { - private static final long serialVersionUID = -7451758045686558893L; + + private static final long serialVersionUID = -517621136983016210L; @Column(name = "PART_NO") @ApiParam("物料编号") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java index b9e661b..b822a40 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java @@ -28,7 +28,9 @@ import java.io.Serializable; @Table(name = "PTL_PCN") @Api("PCN节点") public class PtlPcn extends BaseBean implements Serializable { - private static final long serialVersionUID = -9140094723555406392L; + + private static final long serialVersionUID = -4320051898730968719L; + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java index 360d748..f7001d4 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java @@ -29,7 +29,8 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Api("PTL_PCN数据清理") public class PtlPcnClear extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596443273899197995L; + + private static final long serialVersionUID = 2581206839565766798L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java index 05d5c88..e966b3e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java @@ -28,7 +28,8 @@ import java.io.Serializable; @Table(name = "PTL_PCN_CONNECT_LOG") @Api("PCN节点连接日志") public class PtlPcnConnectLog extends BaseBean implements Serializable { - private static final long serialVersionUID = 2756240593256441951L; + + private static final long serialVersionUID = 7670515108162521936L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java index 060404d..18a7d10 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java @@ -31,7 +31,7 @@ import java.io.Serializable; @Api("PTL_PCN_同步配置") public class PtlPcnSyncCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 7270948230576127126L; + private static final long serialVersionUID = -5459970792389134485L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java index 110f4a8..486b07c 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java @@ -31,6 +31,7 @@ import java.io.Serializable; public class PtlPcnSyncErrorLog extends BaseBean implements Serializable { private static final long serialVersionUID = -8285936568677939604L; + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java index 916a9ce..3f67269 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java @@ -29,7 +29,8 @@ import java.io.Serializable; @Table(name = "PTL_PCN_TASK") @Api("ptl-pcn定时任务工作清单") public class PtlPcnTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 4129714382965409395L; + + private static final long serialVersionUID = 2486815585819368941L; @Column(name = "TASK_CODE") @ApiParam("任务代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java index f10f0e0..58d21b7 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java @@ -29,7 +29,8 @@ import java.io.Serializable; @Table(name = "PTL_PCN_TASK_LOG") @Api("ptl-pcn定时任务工作清单同步记录") public class PtlPcnTaskLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -784806174962540310L; + + private static final long serialVersionUID = 932305261648065821L; @Column(name = "SYNC_TIME_START") @ApiParam("同步数据开始时间") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java index 8d6bb6b..4bfd0b9 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : 打印机配置表 @@ -26,9 +27,10 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="PTL_PRINTER_CONFIGURE") @Api("打印机配置表") -public class PtlPrinterConfigure extends BaseBean{ +public class PtlPrinterConfigure extends BaseBean implements Serializable { + + private static final long serialVersionUID = -226395857300082832L; - private static final long serialVersionUID = 1234639813072592779L; @Column(name="PRINTER_NO") @ApiParam("打印机编号") private String printerNo; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java index 1d4cb38..22f7119 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : 待打印队列表 @@ -27,9 +28,10 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name="PTL_PRINTING_QUEUE") @Api("待打印队列表") -public class PtlPrintingQueue extends BaseBean{ +public class PtlPrintingQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = 729384890593058720L; - private static final long serialVersionUID = 1111639813072592779L; @Column(name="PRINT_IDENTIFICATION") @ApiParam("打印标识") private String printIdentification; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java index 2194d12..6c57df7 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("PTL_RFID") public class PtlRfid extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596837642758197995L; + + private static final long serialVersionUID = 1322725195212837292L; @Column(name = "RFID_CONTROL_NO") @ApiParam("RFID读写器代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java index 56fdace..9d7dce2 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java @@ -29,7 +29,7 @@ import java.io.Serializable; @Api("PTL_流程组件调用参数") public class PtlRouteModuleParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -3036415977457877114L; + private static final long serialVersionUID = -7330592964296954653L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java index 6222e0a..77999b7 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("流程状态") public class PtlRouteStatus extends BaseBean implements Serializable { - private static final long serialVersionUID = -2862693366302428501L; + + private static final long serialVersionUID = 5555766204635105977L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java index 3935303..0faefbd 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java @@ -29,7 +29,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区段") public class PtlSection extends BaseBean implements Serializable { - private static final long serialVersionUID = -7451758045686558883L; + + private static final long serialVersionUID = -1155737119433934849L; @Column(name = "SECTION_NO") @ApiParam("区段编号") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java index 0de2878..b504674 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java @@ -28,7 +28,8 @@ import java.io.Serializable; }) @Api("数据同步死信") public class PtlSyncDeadLetter extends BaseBean implements Serializable { - private static final long serialVersionUID = 1151025992437433734L; + + private static final long serialVersionUID = -7435143562440979065L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java index 8c46173..a897694 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("标签信息") public class PtlTag extends BaseBean implements Serializable { - private static final long serialVersionUID = -949910394508157581L; + + private static final long serialVersionUID = -2431773668822112292L; @Column(name = "TAG_NO") @ApiParam("标签代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java index 5f056b7..0f63c84 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : @@ -28,11 +29,10 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="PTL_TEST_USER") @Api(value="PTL 测试用户",description = "测试用户") -public class PtlTestUser extends BaseBean { +public class PtlTestUser extends BaseBean implements Serializable { private static final long serialVersionUID = -130240511327784335L; - @Column(name="USER_INFO_ID") @ApiParam(value ="人员ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java index f08d7da..fc36a47 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java @@ -20,7 +20,7 @@ import java.util.List; @Api("流程明细Model") public class ActionModuleGroupModel implements Serializable { - private static final long serialVersionUID = 3569055511035396175L; + private static final long serialVersionUID = 3963042613552364928L; @ApiParam("组件代码") private String amCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java index e2a1467..41eadd0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + /** * @author Wynne.Lu * @date 2020/2/12 18:18 @@ -11,7 +13,9 @@ import lombok.Data; */ @Data @ApiModel("作业组件model") -public class ActionModuleModel { +public class ActionModuleModel implements Serializable { + + private static final long serialVersionUID = 4925369056448110395L; @ApiModelProperty("组件代码") private String amCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java index 3a1e7fe..cda9485 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; +import java.io.Serializable; + /** * @author Wynne.Lu * @date 2020/2/13 19:31 @@ -17,7 +19,9 @@ import lombok.ToString; @NoArgsConstructor @ToString @ApiModel("actor消息类型及属性") -public class ActorMessageModel { +public class ActorMessageModel implements Serializable { + + private static final long serialVersionUID = 4524576023835016971L; @ApiModelProperty("消息类型代码") private String mtCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java index cd3cec6..ed49267 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -19,7 +21,9 @@ import lombok.ToString; @NoArgsConstructor @ToString @ApiModel("actor消息类型及属性") -public class AreaSectionTaskDetailModel { +public class AreaSectionTaskDetailModel implements Serializable { + + private static final long serialVersionUID = -896587708527024227L; private Long id; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java index 1cb36c9..e23dfcf 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java @@ -7,7 +7,8 @@ import java.io.Serializable; @Data public class AttrModel implements Serializable { - private static final long serialVersionUID = -4842958192243396773L; + + private static final long serialVersionUID = 7259890069511744335L; @ApiParam("属性名称") private String attrName; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java index e533406..c4c0900 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java @@ -18,7 +18,7 @@ import java.util.List; @Api("作业流程Model") public class BussinessProcessModel implements Serializable { - private static final long serialVersionUID = 148029163662900001L; + private static final long serialVersionUID = 1987194216369839465L; @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java index 13576e2..a379b44 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java @@ -19,7 +19,8 @@ import java.util.Map; @Data @ApiModel("通用数据传输对象") public class CommonMsgModel implements Serializable { - private static final long serialVersionUID = 6359899762200319607L; + + private static final long serialVersionUID = 8271636435115494111L; @ApiModelProperty("工厂") private String organizeCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java index f423f60..92d0c0d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java @@ -15,7 +15,8 @@ import java.io.Serializable; @Data @ApiModel("亮灯model") public class LightOnModel implements Serializable { - private static final long serialVersionUID = -1089361557513425229L; + + private static final long serialVersionUID = 2054373260210137133L; @ApiParam("标签地址，范围1~250,设置null即为所有标签") private Integer tagNo; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java index 167a62d..70bc3cc 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java @@ -17,7 +17,7 @@ import java.io.Serializable; @ApiModel("生产队列主表") public class MesQueueOrder implements Serializable { - private static final long serialVersionUID = -3124113504001270712L; + private static final long serialVersionUID = -3191808970468979533L; @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java index 48d66be..b92295c 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java @@ -17,7 +17,7 @@ import java.io.Serializable; @ApiModel("生产队列明细") public class MesQueueOrderDetail implements Serializable { - private static final long serialVersionUID = 1945173626511595078L; + private static final long serialVersionUID = 806856745031040789L; @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java index fdfb332..444f867 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java @@ -18,7 +18,7 @@ import java.io.Serializable; @ApiModel("工位物料清单") public class MesStationBom implements Serializable { - private static final long serialVersionUID = -2658812944873600461L; + private static final long serialVersionUID = 7398825718819106180L; @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java index 3f42664..916995e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java @@ -19,7 +19,7 @@ import java.util.Map; @Api("流程明细Model") public class ProcessDetailModel implements Serializable { - private static final long serialVersionUID = 3569055511035396175L; + private static final long serialVersionUID = 4353961796870951797L; @ApiParam("状态代码") private String statusCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java index c4bbcd4..f56a32a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java @@ -7,11 +7,15 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + @Data @NoArgsConstructor @AllArgsConstructor @Api("产品包装model") -public class ProductDataModel { +public class ProductDataModel implements Serializable { + + private static final long serialVersionUID = 6946629608590823479L; @ApiParam("字段代码") private String fieldCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java index 28b0ed1..5f5d0d4 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java @@ -19,6 +19,8 @@ import java.util.List; @Api("亮灯监听Model") public class PtlMonitorControlModel implements Serializable { + private static final long serialVersionUID = 7446249296664249977L; + @ApiParam("刷新频率") public String refreshTime; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java index 4e83d86..4d89870 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java @@ -17,7 +17,8 @@ import java.util.Map; @Data @ApiModel("特定条件model") public class SpecificRuleModel implements Serializable { - private static final long serialVersionUID = -4724747574943605500L; + + private static final long serialVersionUID = 7948646696191723363L; private List kList=new ArrayList<>(); diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java index 030a1d9..2f486c0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java @@ -19,6 +19,8 @@ import java.util.Map; @Data public class WsResultBean implements Serializable { + private static final long serialVersionUID = 7807441951231474373L; + /** * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepContent：工步内容、 * moduleContent组件内容,taskComplete整个扫描完成 From 029763feb1c8b5eac914151ec7447c95b0046307 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 14 May 2020 19:10:02 +0800 Subject: [PATCH 05/45] pom --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index a9e288f..b948580 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index a44418c..e12eaee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 2de88b5..c338f71 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 50ab2c2..7637865 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 7f94617..d98b7d8 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index d800ecf..bf96e57 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 60fc467..a758a6a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index d65e031..efacfd2 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index a785f21..dba12cc 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index d6d2f8e..81670b2 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 0fbfb69..26a7311 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 76739f9..eaf2544 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0368700..0f615b6 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index b2eedd4..9e5f745 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 5fcd08a..0fea52b 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 2eddf76..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From ec7718294451274569e7fe4015efb200fe13b1ac Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 14 May 2020 19:11:03 +0800 Subject: [PATCH 06/45] =?UTF-8?q?=E3=80=90BATCH=E5=BD=95=E5=85=A5=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=80=BC-=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 55dd8fd..5c2dd6d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -3168,7 +3168,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result); - DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkResult(), "reworkStatus", result); + DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkStatus(), "reworkStatus", result); DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result); if (StringUtils.isNotBlank(wmsTestResultSummary.getCreateDateTimeStart())) { DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(), From 60dee0420670b132f7841c1813968563cc76c33c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 14 May 2020 19:12:24 +0800 Subject: [PATCH 07/45] =?UTF-8?q?=E3=80=908512=20=E4=B8=AD=E8=88=AA-BH?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=97=A0=E6=95=88=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 3be68de..2698900 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -570,7 +570,7 @@ public class WmsStockSn extends BaseBean { public WmsStockSn(String organizeCode, String refSrc, String partNo, String partNameRdd, Integer snType, String locateNo, String workCenterCode, String packageNo, String shippingFlag, String lotNo, String dateCode, String fixLotNo - , String leftCode, Double qty, String sn, String createUser, String createDatetime, String modifyDatetime, String modifyUser) { + , String leftCode, Double qty, String sn, String createUser, String createDatetime,String modifyUser,String modifyDatetime) { this.organizeCode = organizeCode; this.refSrc = refSrc; this.partNo = partNo; From 5004f1703777313aa3d004913e23f17ffd0b4803 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 14 May 2020 19:53:03 +0800 Subject: [PATCH 08/45] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mdm/pom.xml | 2 +- sonar-project.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..b1911ec 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..3428e74 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 53a421b3b97694149675e9f679bff4fdd50a9ed7 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 14 May 2020 20:16:43 +0800 Subject: [PATCH 09/45] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 4 ++-- modules/i3plus-pojo-aps/pom.xml | 4 ++-- modules/i3plus-pojo-base/pom.xml | 4 ++-- modules/i3plus-pojo-form/pom.xml | 4 ++-- modules/i3plus-pojo-hardswitch/pom.xml | 4 ++-- modules/i3plus-pojo-ics/pom.xml | 4 ++-- modules/i3plus-pojo-jobflow/pom.xml | 4 ++-- modules/i3plus-pojo-lac/pom.xml | 4 ++-- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- modules/i3plus-pojo-platform/pom.xml | 4 ++-- modules/i3plus-pojo-ptl/pom.xml | 4 ++-- modules/i3plus-pojo-report/pom.xml | 4 ++-- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 4 ++-- modules/i3plus-pojo-wms/pom.xml | 4 ++-- modules/i3plus-pojo-workflow/pom.xml | 4 ++-- pom.xml | 2 +- sonar-project.properties | 2 +- 21 files changed, 39 insertions(+), 39 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 9d4bcf9..4988f31 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 3c603b2..4104107 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 8debbf6..96472ad 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 0bb5683..9be7e80 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-form jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index f927537..53cfea6 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 4c515c4..5e5ef03 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ics jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 939370d..44c0526 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 29778e4..122cb94 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-lac jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index b1911ec..d98b7d8 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 4f24980..f9957c9 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index c7bebed..409b79a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b5c2cd3..846c302 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 3dc593d..c94172f 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-platform jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index d1db96a..4dd7471 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ptl jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 4f23437..c45f09e 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-report jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 788be96..1b72275 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 36a40da..94fb42a 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-sweb jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 63d500c..cac0256 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-wms jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index f0812c0..af52bb4 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/pom.xml b/pom.xml index c2104bf..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 3428e74..932bdd9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-PROD-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From c1241bd6c5365db34b82f0c2e5123c1cef28753c Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 14 May 2020 21:13:02 +0800 Subject: [PATCH 10/45] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 4 ++-- modules/i3plus-pojo-aps/pom.xml | 4 ++-- modules/i3plus-pojo-base/pom.xml | 4 ++-- modules/i3plus-pojo-form/pom.xml | 4 ++-- modules/i3plus-pojo-hardswitch/pom.xml | 4 ++-- modules/i3plus-pojo-ics/pom.xml | 4 ++-- modules/i3plus-pojo-jobflow/pom.xml | 4 ++-- modules/i3plus-pojo-lac/pom.xml | 4 ++-- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- modules/i3plus-pojo-platform/pom.xml | 4 ++-- modules/i3plus-pojo-ptl/pom.xml | 4 ++-- modules/i3plus-pojo-report/pom.xml | 4 ++-- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 4 ++-- modules/i3plus-pojo-wms/pom.xml | 4 ++-- modules/i3plus-pojo-workflow/pom.xml | 4 ++-- pom.xml | 2 +- sonar-project.properties | 2 +- 21 files changed, 39 insertions(+), 39 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 4988f31..4b9154c 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4104107..da2f55a 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 96472ad..a933723 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 9be7e80..c86f822 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-form jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 53cfea6..36594a5 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 5e5ef03..93dfe19 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ics jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 44c0526..6b17e65 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 122cb94..ff17bee 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-lac jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..7f94617 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index f9957c9..a2bb2df 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 409b79a..8664dd2 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 846c302..265f98d 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index c94172f..7545af8 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-platform jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 4dd7471..c11bfc9 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ptl jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index c45f09e..f941c0d 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-report jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 1b72275..069a4e2 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 94fb42a..4c7b396 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-sweb jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index cac0256..c6788d4 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-wms jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index af52bb4..5c86a26 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/pom.xml b/pom.xml index cc8fce6..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..55e4e84 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 0352980cde50eeb0cb5980bd142d214853993837 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 15 May 2020 09:28:33 +0800 Subject: [PATCH 11/45] =?UTF-8?q?bug:=20[8516]=20=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E8=AE=A1=E7=AE=97bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index 83c18ad..0fedc5b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -123,4 +123,8 @@ public class MesOee extends BaseBean implements Serializable { @Transient @ApiParam("自定义数据map") private List operateObjectAttributes; + + @Transient + @ApiParam("手工录入集合") + private List attributes; } From af6b0ce0fd9f5b7b5c9d1a5726473d70b3a3196c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 15 May 2020 09:32:44 +0800 Subject: [PATCH 12/45] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E3=80=901842?= =?UTF-8?q?=E3=80=91-=E6=B7=BB=E5=8A=A0=E6=B5=B7=E7=BA=B3=E5=B7=9D5?= =?UTF-8?q?=E4=B8=AA=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84=E5=AE=9E=E4=BD=93=E4=B8=8E=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 92 +++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesModelGrade.java | 49 +++++++ .../estsh/i3plus/pojo/mes/bean/MesPartColor.java | 60 +++++++++ .../i3plus/pojo/mes/bean/MesProdModelCfg.java | 84 ++++++++++++ .../i3plus/pojo/mes/bean/MesScatterPartCfgBom.java | 75 +++++++++++ .../pojo/mes/bean/MesScatterPartProdCfg.java | 150 +++++++++++++++++++++ 6 files changed, 510 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java 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 eba9bab..86a9633 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 @@ -5730,4 +5730,96 @@ public class MesEnumUtil { } } + /** + * MES_产品颜色 类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_COLOR_TYPE { + + PRODUCT_COLOR(10, "产品颜色"), + MATERIAL_COLOR(20, "物料颜色"); + + private int value; + private String description; + + MES_COLOR_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * MES_车型散件配置清单 选配类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_OPTION_TYPE { + + OPTION_PART(1, "选配件"), + BOM_DISASSEMBLY(2, "BOM拆解"); + + private int value; + private String description; + + MES_OPTION_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java new file mode 100644 index 0000000..224a78c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; + +/** + * @Description:车型等级 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 10:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MODEL_GRADE") +@Api("MES_车型等级") +public class MesModelGrade extends BaseBean implements Serializable { + private static final long serialVersionUID = -5412635747427364076L; + + @Column(name = "GRADE_CODE") + @ApiParam("等级代码") + private String gradeCode; + + @Column(name = "GRADE_NAME") + @ApiParam("等级名称") + private String gradeName; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "GRADE_FLAG_VALUE") + @ApiParam("等级标识值") + private String gradeFlagValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java new file mode 100644 index 0000000..578b4c6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; + +/** + * @Description:产品颜色 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 10:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_COLOR") +@Api("MES_产品颜色") +public class MesPartColor extends BaseBean implements Serializable { + private static final long serialVersionUID = -5412632727837364076L; + + @Column(name = "COLOR_TYPE") + @ApiParam("类型") + private Integer colorType; + + @Column(name = "COLOR_CODE") + @ApiParam("颜色代码") + private String colorCode; + + @Column(name = "COLOR_NAME") + @ApiParam("颜色名称") + private String colorName; + + @Column(name = "IF_COLOR_CODE") + @ApiParam("接口颜色代码") + private String ifColorCode; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "MODEL_YEAR") + @ApiParam("年度型") + private String modelYear; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java new file mode 100644 index 0000000..be8e632 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java @@ -0,0 +1,84 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; + +/** + * @Description:产品车型配置 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 15:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_MODEL_CFG") +@Api("MES_产品车型配置") +public class MesProdModelCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -5227132727837364076L; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "MODEL_YEAR") + @ApiParam("年度型") + private String modelYear; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "PART_NO") + @ApiParam("总成零件号") + private String partNo; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam("客户零件号") + private String customerPartNo; + + @Column(name = "GRADE_CODE") + @ApiParam("等级代码") + private String gradeCode; + + @Column(name = "MODEL_FLAG_VALUE") + @ApiParam("车型标志值") + private String modelFlagValue; + + @Column(name = "MODEL_CFG_FLAG_VALUE") + @ApiParam("车型配置标志值") + private String modelCfgFlagValue; + + @Column(name = "QC_FLAG_VALUE") + @ApiParam("质量标志值") + private String qcFlagValue; + + @Column(name = "LABEL_DESC") + @ApiParam("条码标签描述") + private String labelDesc; + + @Column(name = "CCC_CODE") + @ApiParam("3C认证编码") + private String cccCode; + + @Column(name = "PROCESS_LABEL_TEMPLATE") + @ApiParam("过程标签模板") + private String processLabelTemplate; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java new file mode 100644 index 0000000..fd2e7c3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description:车型散件配置清单 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 10:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCATTER_PART_CFG_BOM") +@Api("MES_车型散件配置清单") +public class MesScatterPartCfgBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -5412635772834364076L; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "MODEL_YEAR") + @ApiParam("年度型") + private String modelYear; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户零件号") + private String custPartNo; + + @Column(name = "PART_FLAG_LOCATION") + @ApiParam("零件标志位") + private Integer partFlagLocation; + + @Column(name = "PART_FLAG_VALUE") + @ApiParam("零件标志值") + private String partFlagValue; + + @Column(name = "QTY", columnDefinition = "decimal(18,3)") + @ColumnDefault("0") + @ApiParam(value = "用量", example = "0") + public Double qty; + + @Column(name = "OPTION_TYPE") + @ApiParam("选配类型") + private Integer optionType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java new file mode 100644 index 0000000..4d177e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -0,0 +1,150 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; +import java.util.Date; + +/** + * @Description:散件零件生产配置 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 10:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCATTER_PART_PROD_CFG") +@Api("MES_散件零件生产配置") +public class MesScatterPartProdCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -5412632727837782394L; + + @Column(name = "CFG_ID") + @ApiParam("配置编号") + private String cfgId; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "MODEL_FLAG_VALUE") + @ApiParam("车型标志值") + private String modelFalgValue; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "GRADE_CODE") + @ApiParam("等级代码") + private String gradeCode; + + @Column(name = "COLOR_CODE") + @ApiParam("颜色代码") + private String colorCode; + + @Column(name = "PART_FLAG_LOCATION") + @ApiParam("标志位") + private Integer partFlagLocation; + + @Column(name = "PART_FLAG_VALUE") + @ApiParam("标志值") + private String partFlagValue; + + @Column(name = "POKE_YOKE_FIX") + @ApiParam("防错码") + private String pokeYokeFix; + + @Column(name = "POKE_YOKE_FROM") + @ApiParam("防错码开始位") + private Integer pokeYokeFrom; + + @Column(name = "POKE_YOKE_END") + @ApiParam("防错码结束位") + private Integer pokeYokeEnd; + + @Column(name = "POKE_YOKE_LENGTH") + @ApiParam("防错码长度") + private Integer pokeYokeLength; + + @Column(name = "PEST1") + @ApiParam("PEST编码1") + private Integer pest1; + + @Column(name = "PEST2") + @ApiParam("PEST编码2") + private Integer pest2; + + @Column(name = "PEST3") + @ApiParam("PEST编码3") + private Integer pest3; + + @Column(name = "PEST4") + @ApiParam("PEST编码4") + private Integer pest4; + + @Column(name = "PEST5") + @ApiParam("PEST编码5") + private Integer pest5; + + @Column(name = "PEST6") + @ApiParam("PEST编码6") + private Integer pest6; + + @Column(name = "PEST7") + @ApiParam("PEST编码7") + private Integer pest7; + + @Column(name = "PEST8") + @ApiParam("PEST编码8") + private Integer pest8; + + @Column(name = "TORQUE_NO") + @ApiParam("扭矩枪编号") + private String torqueNo; + + @Column(name = "IS_PF") + @ApiParam("是否大枪") + private Integer isPf; + + @Column(name = "POKE_TYKE_SEQ") + @ApiParam("防错顺序") + private Integer pokeTypeSeq; + + @Column(name = "EFF_START_TIME") + @ApiParam("有效起始日期") + private Date effStartTime; + + @Column(name = "EFF_END_TIME") + @ApiParam("有效截至日期") + private Date effEndTime; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + +} From 18e037da7f52e9c0c9f4c7ca3d83ebe936d0ae3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 15 May 2020 09:41:28 +0800 Subject: [PATCH 13/45] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E3=80=901842?= =?UTF-8?q?=E3=80=91-=E6=B7=BB=E5=8A=A0=E6=B5=B7=E7=BA=B3=E5=B7=9D?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=9A=84Repository?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/repository/MesModelGradeRepository.java | 16 ++++++++++++++++ .../pojo/mes/repository/MesPartColorRepository.java | 16 ++++++++++++++++ .../pojo/mes/repository/MesProdModelCfgRepository.java | 16 ++++++++++++++++ .../mes/repository/MesScatterPartCfgBomRepository.java | 16 ++++++++++++++++ .../mes/repository/MesScatterPartProdCfgRepository.java | 16 ++++++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesModelGradeRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartColorRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdModelCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartCfgBomRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartProdCfgRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesModelGradeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesModelGradeRepository.java new file mode 100644 index 0000000..4ec9c67 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesModelGradeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesModelGrade; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-05-15 + * @Modify: + **/ +@Repository +public interface MesModelGradeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartColorRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartColorRepository.java new file mode 100644 index 0000000..2f62bb1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartColorRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartColor; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-05-15 + * @Modify: + **/ +@Repository +public interface MesPartColorRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdModelCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdModelCfgRepository.java new file mode 100644 index 0000000..0fc9989 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdModelCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProdModelCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-05-15 + * @Modify: + **/ +@Repository +public interface MesProdModelCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartCfgBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartCfgBomRepository.java new file mode 100644 index 0000000..179a7b7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartCfgBomRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesScatterPartCfgBom; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-05-15 + * @Modify: + **/ +@Repository +public interface MesScatterPartCfgBomRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartProdCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartProdCfgRepository.java new file mode 100644 index 0000000..ee231bf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartProdCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesScatterPartProdCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-05-15 + * @Modify: + **/ +@Repository +public interface MesScatterPartProdCfgRepository extends BaseRepository { +} From 786c442d5580b1c15bb9613cf408603c5179b813 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 15 May 2020 11:14:32 +0800 Subject: [PATCH 14/45] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 1 - .../i3plus/pojo/andon/bean/AndonActionModule.java | 60 +++++++++++ .../pojo/andon/bean/AndonActionModuleGroup.java | 45 +++++++++ .../pojo/andon/bean/AndonActionModuleParam.java | 54 ++++++++++ .../i3plus/pojo/andon/bean/AndonActionRoute.java | 50 +++++++++ .../estsh/i3plus/pojo/andon/bean/AndonActor.java | 47 +++++++++ .../i3plus/pojo/andon/bean/AndonActorRule.java | 46 +++++++++ .../i3plus/pojo/andon/bean/AndonAlarmRoute.java | 49 +++++++++ .../andon/bean/AndonAlarmRouteModuleParam.java | 61 +++++++++++ .../i3plus/pojo/andon/bean/AndonAlarmType.java | 41 ++++++++ .../i3plus/pojo/andon/bean/AndonManageQueue.java | 26 ++++- .../i3plus/pojo/andon/bean/AndonManageRecord.java | 8 ++ .../i3plus/pojo/andon/bean/AndonMessageType.java | 42 ++++++++ .../pojo/andon/bean/AndonRouteModuleParam.java | 57 +++++++++++ .../i3plus/pojo/andon/bean/AndonRouteStatus.java | 91 +++++++++++++++++ .../i3plus/pojo/andon/model/ActionModuleModel.java | 27 +++++ .../pojo/andon/model/AndonRouteStatusModel.java | 84 ++++++++++++++++ .../i3plus/pojo/andon/model/CommonMsgModel.java | 46 +++++++++ .../andon/repository/IAndonActorRepository.java | 16 +++ .../repository/IAndonActorRuleRepository.java | 16 +++ modules/i3plus-pojo-aps/pom.xml | 1 - modules/i3plus-pojo-base/pom.xml | 1 - .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 112 +++++++++++++++++++++ modules/i3plus-pojo-form/pom.xml | 1 - modules/i3plus-pojo-hardswitch/pom.xml | 1 - modules/i3plus-pojo-ics/pom.xml | 1 - modules/i3plus-pojo-jobflow/pom.xml | 1 - modules/i3plus-pojo-lac/pom.xml | 1 - modules/i3plus-pojo-mes-pcn/pom.xml | 1 - modules/i3plus-pojo-mes/pom.xml | 1 - modules/i3plus-pojo-model/pom.xml | 1 - modules/i3plus-pojo-platform/pom.xml | 1 - modules/i3plus-pojo-ptl/pom.xml | 1 - .../estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java | 13 +++ .../i3plus/pojo/ptl/model/CommonMsgModel.java | 3 + modules/i3plus-pojo-report/pom.xml | 1 - modules/i3plus-pojo-softswitch/pom.xml | 1 - modules/i3plus-pojo-sweb/pom.xml | 1 - modules/i3plus-pojo-wms/pom.xml | 1 - modules/i3plus-pojo-workflow/pom.xml | 1 - 40 files changed, 993 insertions(+), 19 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ActionModuleModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRuleRepository.java diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 4b9154c..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-andon jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java new file mode 100644 index 0000000..d9c9896 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.andon.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 org.springframework.data.annotation.Transient; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ACTION_MODULE") +@EqualsAndHashCode(callSuper = true) +@Api("作业组件") +public class AndonActionModule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8909733530761576575L; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "AM_NAME") + @ApiParam("组件名称") + private String amName; + + @Column(name = "AM_DESC") + @ApiParam("组件描述") + private String amDesc; + + @Column(name = "CALL_CLASS") + @ApiParam("实现类") + private String callClass; + + @Column(name = "AM_TYPE") + @ApiParam("组件类型") + private Integer amType; + + @Column(name = "INTERFACE_NO") + @ApiParam("界面编号") + private String interfaceNo; + + @Transient + @ApiParam("执行顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java new file mode 100644 index 0000000..6a3af09 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.andon.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 java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ACTION_MODULE_GROUP") +@EqualsAndHashCode(callSuper = true) +@Api("组件集") +public class AndonActionModuleGroup extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8905502301880084578L; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "SEQ") + @ApiParam("执行顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java new file mode 100644 index 0000000..5364d0b --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.andon.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 java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ACTION_MODULE_PARAM") +@EqualsAndHashCode(callSuper = true) +@Api("组件参数") +public class AndonActionModuleParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8216680446587969610L; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_TYPE") + @ApiParam("参数类型") + private String paramType; + + @Column(name = "DEFAULT_VALUE") + @ApiParam("默认值") + private String defaultValue; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java new file mode 100644 index 0000000..c24541f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.andon.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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/05/08 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ACTION_ROUTE") +@EqualsAndHashCode(callSuper = true) +@Api("作业流程") +public class AndonActionRoute extends BaseBean implements Serializable { + + private static final long serialVersionUID = 917593748015715793L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "ROUTE_NAME") + @ApiParam("流程名称") + private String routeName; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型") + private Integer routeType; + + @Lob + @Column(name = "POSITION") + @ApiParam("GOJS位置") + private String position; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java new file mode 100644 index 0000000..315564b --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.andon.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 java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ACTOR") +@EqualsAndHashCode(callSuper = true) +@Api("ACTOR信息") +public class AndonActor extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1472090790204808649L; + + @Column(name = "ACTOR_CODE") + @ApiParam("actor代码") + private String actorCode; + + @Column(name = "ACTOR_NAME") + @ApiParam("actor名称") + private String actorName; + + @Column(name = "ACTOR_Class") + @ApiParam("actor名称") + private String actorClass; + + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java new file mode 100644 index 0000000..4220d64 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.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 java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ACTOR_RULE") +@EqualsAndHashCode(callSuper = true) +@Api("ACTOR消息获取规则") +public class AndonActorRule extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3244584643305867326L; + + @Column(name = "ACTOR_CODE") + @ApiParam("actor代码") + private String actorCode; + + @Column(name = "MT_CODE") + @ApiParam("消息类型代码") + private String mtCode; + + @Column(name = "SPECIFIC_RULE") + @ApiParam("特定条件") + private String specificRule; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java new file mode 100644 index 0000000..b8ce4d5 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.andon.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 java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ALARM_ROUTE") +@EqualsAndHashCode(callSuper = true) +@Api("安灯作业流程配置") +public class AndonAlarmRoute extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7425423934619147746L; + + @Column(name = "ALARM_CODE") + @ApiParam("安灯类型代码") + private String alarmCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型") + private Integer routeType; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java new file mode 100644 index 0000000..8a9523c --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.andon.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 java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM") +@EqualsAndHashCode(callSuper = true) +@Api("安灯作业流程组件参数") +public class AndonAlarmRouteModuleParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6659953988053255710L; + + @Column(name = "ALARM_ROUTE_ID") + @ApiParam("安灯流程ID") + private Long alarmRouteId; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java new file mode 100644 index 0000000..76d4137 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.andon.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 java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ALARM_TYPE") +@EqualsAndHashCode(callSuper = true) +@Api("安灯类型") +public class AndonAlarmType extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3286588436625932653L; + + @Column(name = "ALARM_CODE") + @ApiParam("安灯类型代码") + private String alarmCode; + + @Column(name = "ALARM_NAME") + @ApiParam("安灯类型名称") + private String alarmName; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index e02d1a3..2c741b0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -46,6 +46,18 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { private static final long serialVersionUID = 183865984747203897L; + @Transient + @ApiParam(value ="触发事件") + private String triggerEvent; + + @Column(name = "ROUTE_CODE") + @ApiParam(value = "流程代码") + private String routeCode; + + @Column(name = "ROUTE_STATUS_CODE") + @ApiParam(value = "状态点代码") + private String routeStatusCode; + @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") private Double seq; @@ -287,9 +299,13 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { /** * 工位统计 构造函数 * @param workCenterCode + * @param workCenterNameRdd * @param workCellCode + * @param workCellNameRdd * @param equipmentCode + * @param equipmentNameRdd * @param shiftCode + * @param shiftNameRdd * @param alarmCode * @param andonCount */ @@ -308,12 +324,14 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { /** * 原因统计 使用Java内存计算（获取原始数据） + * @param acCode + * @param acNameRdd * @param workCenterCode * @param workCenterNameRdd * @param workCellCode * @param workCellNameRdd * @param alarmCode - * @param ecCodec + * @param ecCode * @param ecNameRdd * @param emCode * @param emNameRdd @@ -340,6 +358,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { /** * 人员统计 使用Java内存计算（获取原始数据） + * @param organizeCode + * @param workCenterNameRdd + * @param workCellCode + * @param workCellNameRdd * @param resetUser * @param alarmCode * @param callTime @@ -360,6 +382,7 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { /** * 统计分析柏拉图 使用JAVA内存计算（获取原始数据） + * @param workCenterNameRdd * @param alarmCode * @param ecCode * @param ecNameRdd @@ -405,4 +428,5 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { e.printStackTrace(); } } + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index 0c285bc..3e41a51 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -41,6 +41,14 @@ public class AndonManageRecord extends BaseManageQueue implements Serializable { private static final long serialVersionUID = 4667499369694353351L; + @Column(name = "ROUTE_CODE") + @ApiParam(value = "流程代码") + private String routeCode; + + @Column(name = "ROUTE_STATUS_CODE") + @ApiParam(value = "状态点代码") + private String routeStatusCode; + @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") private Double seq; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java new file mode 100644 index 0000000..519d5bf --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.andon.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 java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_MESSAGE_TYPE") +@EqualsAndHashCode(callSuper = true) +@Api("消息类型") +public class AndonMessageType extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6140381522677959027L; + + @Column(name = "MT_CODE") + @ApiParam("消息类型代码") + private String mtCode; + + @Column(name = "MT_NAME") + @ApiParam("消息类型名称") + private String mtName; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java new file mode 100644 index 0000000..49f2640 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.andon.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 java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ROUTE_MODULE_PARAM") +@EqualsAndHashCode(callSuper = true) +@Api("流程组件参数") +public class AndonRouteModuleParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = -282175947799144290L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java new file mode 100644 index 0000000..2e57b5d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.andon.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; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ROUTE_STATUS") +@EqualsAndHashCode(callSuper = true) +@Api("流程状态") +public class AndonRouteStatus extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2091426896667989586L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "STATUS_NAME") + @ApiParam("状态名称") + private String statusName; + + @Column(name = "NEXT_STATUS") + @ApiParam("下一状态") + private String nextStatus; + + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型") + private Integer triggerType; + + @Column(name = "TRIGGER_EVENT") + @ApiParam("触发事件") + private String triggerEvent; + + @Column(name = "TRIGGER_WHERE") + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @Column(name = "ACTION_AMG_ID") + @ApiParam("触发调用") + private Long actionAmgId; + + @Column(name = "IN_AMG_ID") + @ApiParam("进入状态调用") + private Long inAmgId; + + @Column(name = "OUT_AMG_ID") + @ApiParam("离开状态调用") + private Long outAmgId; + + @Column(name = "STATUS_TYPE") + @ApiParam("状态类型") + private Integer statusType; + + @Transient + @ApiParam("默认不缓存") + private boolean cacheFlag = false; + + @Transient + @ApiParam("触发组件集默认未执行") + private boolean actionAmgIdFalg = false; + + @Transient + @ApiParam("触发组件集默认未执行") + private boolean checkTriggerTypeFalg = false; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ActionModuleModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ActionModuleModel.java new file mode 100644 index 0000000..f88be43 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ActionModuleModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangjie + * @date 2020/2/12 18:18 + * @desc + */ +@Data +@ApiModel("作业组件model") +public class ActionModuleModel { + + @ApiModelProperty("组件代码") + private String amCode; + + @ApiModelProperty("调用类") + private String callClass; + + @ApiModelProperty("是否完成") + private Boolean isComplete; + + @ApiModelProperty("执行顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java new file mode 100644 index 0000000..b7dd7fb --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java @@ -0,0 +1,84 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@ApiModel("状态点model") +public class AndonRouteStatusModel implements Serializable { + + private static final long serialVersionUID = -6258870691272170423L; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("状态代码") + private String statusCode; + + @ApiParam("状态名称") + private String statusName; + + @ApiParam("下一状态") + private String nextStatus; + + @ApiParam("触发类型") + private Integer triggerType; + + @ApiParam("触发事件") + private String triggerEvent; + + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @ApiParam("触发调用") + private Long actionAmgId; + + @ApiParam("进入状态调用") + private Long inAmgId; + + @ApiParam("离开状态调用") + private Long outAmgId; + + @ApiParam("状态类型") + private Integer statusType; + + @ApiParam("安灯类型代码") + private String alarmCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("流程类型") + private Integer routeType; + + public AndonRouteStatusModel() { + } + + public AndonRouteStatusModel(String routeCode, String statusCode, String statusName, String nextStatus, Integer triggerType, + String triggerEvent, String triggerWhere, Long actionAmgId, Long inAmgId, Long outAmgId, + Integer statusType, String alarmCode, String workCenterCode, Integer routeType) { + this.routeCode = routeCode; + this.statusCode = statusCode; + this.statusName = statusName; + this.nextStatus = nextStatus; + this.triggerType = triggerType; + this.triggerEvent = triggerEvent; + this.triggerWhere = triggerWhere; + this.actionAmgId = actionAmgId; + this.inAmgId = inAmgId; + this.outAmgId = outAmgId; + this.statusType = statusType; + this.alarmCode = alarmCode; + this.workCenterCode = workCenterCode; + this.routeType = routeType; + } +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java new file mode 100644 index 0000000..449b959 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatus; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@ApiModel("通用数据传输对象") +public class CommonMsgModel implements Serializable { + + private static final long serialVersionUID = -1772176070851992335L; + + @ApiModelProperty("工厂") + private String organizeCode; + + @ApiModelProperty("用户信息") + private String userInfo; + + @ApiModelProperty("消息类型") + private String msgType; + + @ApiModelProperty("消息数据") + private Map msgData; + + @ApiModelProperty("流程状态集合") + private List routeStatusList; + + @ApiModelProperty("当前流程状态") + private AndonRouteStatus curRouteStatus; + + @ApiModelProperty("外部触发事件") + private String triggerEvent; + + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRepository.java new file mode 100644 index 0000000..c45812f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActor; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : actor + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 11:13 + * @Modify: + **/ +@Repository +public interface IAndonActorRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRuleRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRuleRepository.java new file mode 100644 index 0000000..2e788c4 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActorRule; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : actor rule + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 11:13 + * @Modify: + **/ +@Repository +public interface IAndonActorRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index da2f55a..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-aps jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a933723..9f9717e 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-base jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index a18d99a..f685c3c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -13,6 +13,100 @@ import org.apache.commons.lang3.StringUtils; public class AndonEnumUtil { /** + * 流程状态-触发类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_TRIGGER_TYPE { + INNER_TRIGGER(10, "内部触发"), + OUTER_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + ROUTE_TRIGGER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 组件状态类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_TYPE { + START(10, "START", "开始状态"), + EXECUTING(20, "EXECUTING", "执行中状态"), + TERMINATE(30, "TERMINATE", "中断状态"), + FINISH(40, "FINISH", "完成状态"); + + private int value; + private String code; + private String description; + + ROUTE_STATUS_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + /** + * 安灯作业组件-组件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTION_MODULE_AM_TYPE { + + METHOD_MODULE(10, "方法组件"), + INTERFACE_MODULE(20, "界面组件"); + + private int value; + private String description; + + ACTION_MODULE_AM_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + return tmp; + } + } + + /** * 安灯主界面产线或者站点运行状态 * 正常 = 10，故障 = 20 */ @@ -766,6 +860,15 @@ public class AndonEnumUtil { return description; } + public static ANDON_ACTION_TAG getByValue(int value) { + for (ANDON_ACTION_TAG actionTag : values()) { + if (actionTag.getValue() == value) { + return actionTag; + } + } + return null; + } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -924,6 +1027,15 @@ public class AndonEnumUtil { return description; } + public static ALARM_SOURCE_TYPE getByValue(String value) { + for (ALARM_SOURCE_TYPE sourceType : values()) { + if (sourceType.getValue().equals(value)) { + return sourceType; + } + } + return null; + } + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c86f822..a9e288f 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-form jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 36594a5..a44418c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-hardswitch jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 93dfe19..2de88b5 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-ics jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6b17e65..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-jobflow jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ff17bee..50ab2c2 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-lac jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index a2bb2df..d800ecf 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-mes-pcn jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 8664dd2..60fc467 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-mes jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 265f98d..d65e031 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-model jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 7545af8..a785f21 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-platform jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index c11bfc9..d6d2f8e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-ptl jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java index 77999b7..aea73c0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -75,5 +76,17 @@ public class PtlRouteStatus extends BaseBean implements Serializable { @ApiParam("状态类型") private Integer statusType; + @Transient + @ApiParam("默认不缓存") + private boolean cacheFlag = false; + + @Transient + @ApiParam("触发组件集默认未执行") + private boolean actionAmgIdFalg = false; + + @Transient + @ApiParam("触发组件集默认未执行") + private boolean checkTriggerTypeFalg = false; + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java index a379b44..3de028f 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java @@ -49,4 +49,7 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("当前流程状态") private PtlRouteStatus curRouteStatus; + @ApiModelProperty("外部触发事件") + private String triggerEvent; + } diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index f941c0d..0fbfb69 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-report jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 069a4e2..76739f9 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-softswitch jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 4c7b396..0368700 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-sweb jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index c6788d4..b2eedd4 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-wms jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 5c86a26..5fcd08a 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-workflow jar - 1.0-DEV-SNAPSHOT From b741b6950b904b73bbf69176ac36c4df561b70f7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 15 May 2020 14:42:48 +0800 Subject: [PATCH 15/45] =?UTF-8?q?bug:=20[8516]=20=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E8=AE=A1=E7=AE=97bug=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java index e05a54e..9a340e4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java @@ -50,8 +50,4 @@ public class MesOperateObjectAttribute extends BaseBean implements Serializable @Transient @ApiParam("属性值") private String attributeValue; - - @Transient - @ApiParam("是否自定义属性") - private boolean customAttribute = false; } From 1ea5b54052c5ba06352908038054b63423fb51cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 15 May 2020 15:07:09 +0800 Subject: [PATCH 16/45] =?UTF-8?q?=E3=80=90=E7=94=9F=E6=88=90=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E8=AE=A9?= =?UTF-8?q?=E6=AD=A5=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index c6a3d0a..3f0402c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -84,6 +84,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("间隔时间") private Integer checkInterval = 0; + @Column(name = "IS_CONCESSION") + @ApiParam("是否允许让步") + private Integer isConcession = 0; + @Transient @ApiParam("检测类型名称") private String checkTypeName; From 9778561725d8a14e5226f58cac854d2dc13f6726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 15 May 2020 15:30:30 +0800 Subject: [PATCH 17/45] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E3=80=901842?= =?UTF-8?q?=E3=80=91-=E6=B7=BB=E5=8A=A0=E6=B5=B7=E7=BA=B3=E5=B7=9D?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=BB=B4=E6=8A=A4=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 139 +++++++++++++++++++++ 1 file changed, 139 insertions(+) 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 644faba..80191ce 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 @@ -2720,4 +2720,143 @@ public class MesHqlPack { } return packBean; } + + /** + * MES 车型等级查询条件封装 + * + * @param modelGrade + * @return + */ + public static DdlPackBean getMesModelGrade(MesModelGrade modelGrade, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(modelGrade, organizeCode); + if (!StringUtils.isEmpty(modelGrade.getGradeCode())) { + DdlPreparedPack.getStringEqualPack(modelGrade.getGradeCode(), "gradeCode", packBean); + } + if (!StringUtils.isEmpty(modelGrade.getGradeName())) { + DdlPreparedPack.getStringLikerPack(modelGrade.getGradeName(), "gradeName", packBean); + } + if (!StringUtils.isEmpty(modelGrade.getGradeFlagValue())) { + DdlPreparedPack.getStringLikerPack(modelGrade.getGradeFlagValue(), "gradeFlagValue", packBean); + } + if (!StringUtils.isEmpty(modelGrade.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(modelGrade.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + return packBean; + } + + /** + * MES 产品颜色查询条件封装 + * + * @param partColor + * @return + */ + public static DdlPackBean getMesPartColor(MesPartColor partColor, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(partColor, organizeCode); + if (!StringUtils.isEmpty(partColor.getColorCode())) { + DdlPreparedPack.getStringEqualPack(partColor.getColorCode(), "colorCode", packBean); + } + if (!StringUtils.isEmpty(partColor.getColorName())) { + DdlPreparedPack.getStringLikerPack(partColor.getColorName(), "colorName", packBean); + } + if (!StringUtils.isEmpty(partColor.getIfColorCode())) { + DdlPreparedPack.getStringEqualPack(partColor.getIfColorCode(), "ifColorCode", packBean); + } + if (!StringUtils.isEmpty(partColor.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(partColor.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + if (!StringUtils.isEmpty(partColor.getProduceCtgyCode())) { + DdlPreparedPack.getStringEqualPack(partColor.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + if (!StringUtils.isEmpty(partColor.getModelYear())) { + DdlPreparedPack.getStringEqualPack(partColor.getModelYear(), "modelYear", packBean); + } + return packBean; + } + + /** + * MES 产品车型配置 + * + * @param prodModelCfg + * @return + */ + public static DdlPackBean getMesProdModelCfg(MesProdModelCfg prodModelCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(prodModelCfg, organizeCode); + if (!StringUtils.isEmpty(prodModelCfg.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(prodModelCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + if (!StringUtils.isEmpty(prodModelCfg.getProduceCtgyCode())) { + DdlPreparedPack.getStringEqualPack(prodModelCfg.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + if (!StringUtils.isEmpty(prodModelCfg.getModelYear())) { + DdlPreparedPack.getStringLikerPack(prodModelCfg.getModelYear(), "modelYear", packBean); + } + if (!StringUtils.isEmpty(prodModelCfg.getPartNo())) { + DdlPreparedPack.getStringEqualPack(prodModelCfg.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(prodModelCfg.getGradeCode())) { + DdlPreparedPack.getStringEqualPack(prodModelCfg.getGradeCode(), "gradeCode", packBean); + } + return packBean; + } + + /** + * MES 车型散件配置清单 + * + * @param scatterPartCfgBom + * @return + */ + public static DdlPackBean getMesScatterPartCfgBom(MesScatterPartCfgBom scatterPartCfgBom, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(scatterPartCfgBom, organizeCode); + if (!StringUtils.isEmpty(scatterPartCfgBom.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartCfgBom.getProduceCtgyCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartCfgBom.getModelYear())) { + DdlPreparedPack.getStringLikerPack(scatterPartCfgBom.getModelYear(), "modelYear", packBean); + } + if (!StringUtils.isEmpty(scatterPartCfgBom.getPartNo())) { + DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getPartNo(), "partNo", packBean); + } + return packBean; + } + + /** + * MES 散件零件生产配置 + * + * @param scatterPartProdCfg + * @return + */ + public static DdlPackBean getMesScatterPartProdCfg(MesScatterPartProdCfg scatterPartProdCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(scatterPartProdCfg, organizeCode); + if (!StringUtils.isEmpty(scatterPartProdCfg.getCfgId())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getCfgId(), "cfgId", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getWorkCellCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getPartNo())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getPartName())) { + DdlPreparedPack.getStringLikerPack(scatterPartProdCfg.getPartName(), "partName", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getGradeCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getGradeCode(), "gradeCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getColorCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getColorCode(), "colorCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getProduceCtgyCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + return packBean; + } } From 0e2f50e5626e0a3bdf86669e8f64d97108fa078f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 15 May 2020 17:16:47 +0800 Subject: [PATCH 18/45] =?UTF-8?q?Task1812:=E4=BB=93=E5=BA=93=E5=81=A5?= =?UTF-8?q?=E5=BA=B7=E5=BA=A6=E6=8C=87=E6=A0=87=E8=A7=86=E5=9B=BE=E5=8F=8A?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8C=87=E6=A0=87=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?(#476)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsHealthIndicatorModel.java | 41 ++++++++++++++++++++ .../model/wms/WmsHealthIndicatorReportModel.java | 35 +++++++++++++++++ .../model/wms/WmsHealthVariableParamsModel.java | 39 +++++++++++++++++++ .../model/wms/WmsHealthVariableResultModel.java | 45 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsHealthIndicator.java | 19 +++++++-- .../pojo/wms/bean/WmsHealthIndicatorLevel.java | 5 ++- .../pojo/wms/bean/WmsHealthIndicatorResult.java | 9 ++--- .../i3plus/pojo/wms/bean/WmsHealthVariable.java | 5 +++ .../pojo/wms/bean/WmsHealthVariableResult.java | 2 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 10 files changed, 190 insertions(+), 11 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableParamsModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableResultModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorModel.java new file mode 100644 index 0000000..ef929bb --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsHealthIndicator; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Wms健康指标模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-14 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsHealthIndicatorModel implements Serializable { + + private static final long serialVersionUID = -6376849949646448495L; + + @ApiParam(value = "模块名称") + public String groupName; + + @ApiParam(value = "指标代码") + public String indicatorCode; + + @ApiParam(value = "指标名称") + public String indicatorName; + + @ApiParam(value = "开始时间") + public String startDateTime; + + @ApiParam(value = "结束时间") + public String endDateTime; + + @ApiParam(value = "健康指标集合") + public List healthIndicatorList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java new file mode 100644 index 0000000..5e0d8f8 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : Wms健康指标报表模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-15 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsHealthIndicatorReportModel implements Serializable { + + private static final long serialVersionUID = -6376850049646448495L; + + @ApiParam(value = "图表标题名称") + public String titleName; + + @ApiParam(value = "图例集合") + public List legendList; + + @ApiParam(value = "X轴数据集合") + public List xAxisList; + + @ApiParam(value = "图表数据集合") + public List> seriesDataList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableParamsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableParamsModel.java new file mode 100644 index 0000000..d4cff64 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableParamsModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description : Wms健康变量参数 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-14 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsHealthVariableParamsModel implements Serializable { + + private static final long serialVersionUID = -6376849939646448495L; + + @ApiParam(value = "开始时间") + public String startDateTime; + + @ApiParam(value = "结束时间") + public String endDateTime; + + @ApiParam(value = "适应存储区") + private String applyArea; + + @ApiParam(value = "适应物料组") + private String applyPartGroup; + + @ApiParam(value = "变量参数") + private String variableParam; + + @ApiParam(value = "工厂代码") + private String organizeCode; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableResultModel.java new file mode 100644 index 0000000..c64a611 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableResultModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description : Wms健康变量参数 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-14 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsHealthVariableResultModel implements Serializable { + + private static final long serialVersionUID = -6376849949646448495L; + + @ApiParam(value = "订单号") + public String orderNo; + + @ApiParam(value = "供应商名称") + public String vendorName; + + @ApiParam(value = "需求数量") + private Double qty; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partNameRdd; + + @ApiParam(value = "计划到货日期") + private String planDateTime; + + @ApiParam(value = "实际到货日期") + private String actDateTime; + + @ApiParam(value = "物料组编号") + private String partGroupNo; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java index 9b4ac5c..e82b4f0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java @@ -10,9 +10,7 @@ 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.*; /** * @Description : 仓库健康度指标 @@ -23,7 +21,10 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_HEALTH_INDICATOR") +@Table(name="WMS_HEALTH_INDICATOR", indexes = { + @Index(columnList = "INDICATOR_CODE"), + @Index(columnList = "GROUP_NAME") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) @@ -51,4 +52,14 @@ public class WmsHealthIndicator extends BaseBean { @ApiParam(value = "指标测算公式") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String calcFormula; + + @Transient + @ApiParam(value = "指标等级") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorGrade; + + @Transient + @ApiParam(value = "指标颜色") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorColor; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java index fd49a58..317c3e9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_HEALTH_INDICATOR_LEVEL") +@Table(name="WMS_HEALTH_INDICATOR_LEVEL", indexes = { + @Index(columnList = "INDICATOR_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java index 8d051a5..f5d7d59 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java @@ -10,10 +10,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : 仓库健康度指标结果 @@ -24,7 +21,9 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_HEALTH_INDICATOR_RESULT") +@Table(name="WMS_HEALTH_INDICATOR_RESULT", indexes = { + @Index(columnList = "INDICATOR_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java index d57680e..831993b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java @@ -85,6 +85,11 @@ public class WmsHealthVariable extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String sqlStatement; + @Column(name = "CLASS_PATH") + @ApiParam(value = "调用类名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String className; + @Column(name = "FUNCTION_NAME") @ApiParam(value = "方法名称") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java index 7820d95..cd066ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java @@ -46,7 +46,7 @@ public class WmsHealthVariableResult extends BaseBean { @Column(name = "VARIABLE_VALUE") @ApiParam(value = "变量测算值") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) - private Double variableValue; + private Integer variableValue; @Lob @Column(name = "VARIABLE_DETAILS") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index c81035f..104f22f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -3296,6 +3296,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsHealthIndicatorResult(WmsHealthIndicatorResult healthIndicatorResult) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(healthIndicatorResult.getIndicatorCode(), "indicatorCode", result); + DdlPreparedPack.getStringEqualPack(healthIndicatorResult.getCreateDatetime(), "createDatetime", result); getStringBuilderPack(healthIndicatorResult, result); return result; } From 55a87bb6da651663abc8e2f020d5e277fb2b17a5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 15 May 2020 17:23:13 +0800 Subject: [PATCH 19/45] =?UTF-8?q?1841=20RFID=E5=B7=A5=E8=A3=85=E7=A7=BB?= =?UTF-8?q?=E5=BA=93=E5=A4=8D=E7=94=A8=E6=AC=A7=E6=B4=B2=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=A7=BB=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 43fe989..bb25c21 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -6,10 +6,10 @@ public class WmsInterfaceEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DIRECTION_TYPE { - SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), - WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), - MES2WMS(30, "MES2WMS", "MES --> WMS"), - WMS2MES(40, "WMS2MES", "WMS --> MES"); + SAP2WMS(10, "SAP2WMS-2", "SAP --> WMS"), + WMS2SAP(20, "WMS2SAP-2", "WMS --> SAP"), + MES2WMS(30, "MES2WMS-2", "MES --> WMS"), + WMS2MES(40, "WMS2MES-2", "WMS --> MES"); private int value; private String name; From 40e5297303b30901df26aa94e85916c4fac9531d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 15 May 2020 17:25:48 +0800 Subject: [PATCH 20/45] =?UTF-8?q?8442=20=E4=B8=AD=E8=88=AA-BH=E8=A7=A3?= =?UTF-8?q?=E7=BB=91-=E4=BA=8B=E5=8A=A1=E5=85=B3=E8=81=94=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index bb25c21..43fe989 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -6,10 +6,10 @@ public class WmsInterfaceEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DIRECTION_TYPE { - SAP2WMS(10, "SAP2WMS-2", "SAP --> WMS"), - WMS2SAP(20, "WMS2SAP-2", "WMS --> SAP"), - MES2WMS(30, "MES2WMS-2", "MES --> WMS"), - WMS2MES(40, "WMS2MES-2", "WMS --> MES"); + SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), + WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), + MES2WMS(30, "MES2WMS", "MES --> WMS"), + WMS2MES(40, "WMS2MES", "WMS --> MES"); private int value; private String name; From 7eb72ee5d1c5eab1c7c477a74ce3136f00314916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 16 May 2020 14:24:57 +0800 Subject: [PATCH 21/45] =?UTF-8?q?=E3=80=90=E8=B0=83=E8=AF=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=9B=9E=E4=BC=A0=E5=92=8C=E5=90=8C=E6=AD=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java index 924fc78..8e58dec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -94,4 +94,8 @@ public class IfQcOrder extends BaseBean implements Serializable { @ApiParam("发运时间") private String deliveryDate; + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java index 186a0ac..7972aa2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java @@ -29,7 +29,7 @@ import java.io.Serializable; @Api("IF_质检结果") public class IfQcResult extends BaseBean implements Serializable { - private static final long serialVersionUID = -5412635747424111476L; + //private static final long serialVersionUID = -5412635747424111476L; @Column(name = "ORDER_NO") @ApiParam("质检单号") private String orderNo; From 6e3da00fdaa5f0d923aa490cb0e9a35c2d07c7a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sat, 16 May 2020 18:53:13 +0800 Subject: [PATCH 22/45] =?UTF-8?q?Task1812:=E4=BB=93=E5=BA=93=E5=81=A5?= =?UTF-8?q?=E5=BA=B7=E5=BA=A6=E6=8C=87=E6=A0=87=E8=A7=86=E5=9B=BE=E5=8F=8A?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8C=87=E6=A0=87=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?(#476)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 60 ++++++++++++++++++++++ .../model/wms/WmsHealthIndicatorReportModel.java | 5 +- .../i3plus/pojo/wms/bean/WmsHealthIndicator.java | 5 ++ .../i3plus/pojo/wms/bean/WmsHealthVariable.java | 7 ++- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 +- 5 files changed, 77 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 6dd13e1..0be07d0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -6906,4 +6906,64 @@ public class WmsEnumUtil { return null; } } + + /** + * 仓库健康指标等级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HEALTH_INDICATOR_LEVEL { + HEALTH(10, "HEALTH", "健康"), + SUB_HEALTH(20, "SUB_HEALTH", "亚健康"), + NO_HEALTH(30, "NO_HEALTH", "不健康"); + private int value; + private String code; + private String description; + + HEALTH_INDICATOR_LEVEL(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java index 5e0d8f8..e408474 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java @@ -7,6 +7,7 @@ import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.List; import java.util.Map; +import java.util.Set; /** * @Description : Wms健康指标报表模型 @@ -25,10 +26,10 @@ public class WmsHealthIndicatorReportModel implements Serializable { public String titleName; @ApiParam(value = "图例集合") - public List legendList; + public Set legendList; @ApiParam(value = "X轴数据集合") - public List xAxisList; + public Set xAxisList; @ApiParam(value = "图表数据集合") public List> seriesDataList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java index e82b4f0..2ef602d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java @@ -62,4 +62,9 @@ public class WmsHealthIndicator extends BaseBean { @ApiParam(value = "指标颜色") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String indicatorColor; + + @Transient + @ApiParam(value = "指标测算值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Double indicatorCalcValue; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java index 831993b..d3572e5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java @@ -56,7 +56,7 @@ public class WmsHealthVariable extends BaseBean { @Column(name = "LAST_CALC_TIME") @ApiParam(value = "末次计算时间") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String LastCalcTime; + private String lastCalcTime; @Column(name = "NEXT_CALC_TIME") @ApiParam(value = "下次计算时间") @@ -99,4 +99,9 @@ public class WmsHealthVariable extends BaseBean { @ApiParam(value = "脚本编号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String scriptNo; + + @Column(name = "CALC_WAYS") + @ApiParam(value = "测算方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String calcWays; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 104f22f..d7ad228 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -3259,7 +3259,8 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsHealthIndicator(WmsHealthIndicator healthIndicator) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(healthIndicator.getIndicatorCode(), "indicatorCode", result); - DdlPreparedPack.getStringEqualPack(healthIndicator.getGroupName(), "groupName", result); + DdlPreparedPack.getStringLikerPack(healthIndicator.getIndicatorName(), "indicatorName", result); + DdlPreparedPack.getStringLikerPack(healthIndicator.getGroupName(), "groupName", result); getStringBuilderPack(healthIndicator, result); return result; } @@ -3284,6 +3285,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsHealthVariable(WmsHealthVariable wmsHealthVariable) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsHealthVariable.getVariableCode(), "variableCode", result); + DdlPreparedPack.getStringLikerPack(wmsHealthVariable.getVariableName(), "variableName", result); getStringBuilderPack(wmsHealthVariable, result); return result; } From 5d1c79ef13e5b360e733ea9727c5e4fcae2150c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 18 May 2020 13:13:18 +0800 Subject: [PATCH 23/45] =?UTF-8?q?Task1812:=E4=BB=93=E5=BA=93=E5=81=A5?= =?UTF-8?q?=E5=BA=B7=E5=BA=A6=E6=8C=87=E6=A0=87=E8=A7=86=E5=9B=BE=E5=8F=8A?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8C=87=E6=A0=87=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?(#476)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java index e408474..e940e8e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java @@ -29,7 +29,7 @@ public class WmsHealthIndicatorReportModel implements Serializable { public Set legendList; @ApiParam(value = "X轴数据集合") - public Set xAxisList; + public List xAxisList; @ApiParam(value = "图表数据集合") public List> seriesDataList; From 1f55c06368d0c6f349a732cc54dde5216f967838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 18 May 2020 14:04:21 +0800 Subject: [PATCH 24/45] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E3=80=901842?= =?UTF-8?q?=E3=80=91-=E6=B5=B7=E7=BA=B3=E5=B7=9D=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=BA=94=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB=E3=80=81=E5=AE=9E=E4=BD=93=E5=92=8Cmodel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 171 +++++++++++++++++++++ .../pojo/mes/bean/template/BasImportTemplate.java | 75 +++++++++ .../bean/template/BasImportTemplateDetails.java | 117 ++++++++++++++ .../i3plus/pojo/mes/model/BasBeanFieldModel.java | 39 +++++ .../BasImportTemplateDetailsRepository.java | 17 ++ .../repository/BasImportTemplateRepository.java | 17 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 28 ++++ .../pojo/model/mes/BasBeanFieldInfoModel.java | 48 ++++++ .../i3plus/pojo/model/mes/BasBeanInfoModel.java | 38 +++++ .../i3plus/pojo/model/mes/ExcelsImportModel.java | 40 +++++ 10 files changed, 590 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BasBeanFieldModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateDetailsRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateRepository.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanFieldInfoModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelsImportModel.java 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 86a9633..81d92e8 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 @@ -5822,4 +5822,175 @@ public class MesEnumUtil { } } + /** + * 数据格式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_FORMAT { + STRING_FORMAT(1, "String", "字符串格式"), + INTEGER_FORMAT(2, "Integer", "整数格式"), + DOUBLE_FORMAT(3, "Double", "高精度浮点格式"), + DATE_FORMAT(4, "Date", "日期格式"), + FLOAT_FORMAT(5, "Float", "浮点格式"), + BOOL_FORMAT(6, "Boolean", "布尔格式"), + LONG_FORMAT(7, "LONG", "长整数格式"); + + private int value; + private String code; + private String description; + + DATA_FORMAT(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 数据导入类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TEMPLATE_IMPORT_TYPE { + SINGLE_TABLE(10, "SINGLE_TABLE", "单表"), + MULTI_TABLE(20, "MULTI_TABLE", "多表"); + + private int value; + private String code; + private String description; + + TEMPLATE_IMPORT_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 数据更新类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TEMPLATE_UPDATE_TYPE { + FULL_COVERAGE(10, "FULL_COVERAGE", "全覆盖"), + DIFF_UPDATE(20, "DIFF_UPDATE", "差异更新"), + REPEATE_NO_IMPORT(30, "REPEATE_NO_IMPORT", "重复不导入"); + + private int value; + private String code; + private String description; + + TEMPLATE_UPDATE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java new file mode 100644 index 0000000..a043ec9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.bean.template; + +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; +import java.util.List; + +/** + * @Description : 导入模板信息 + * @Reference : + * @Author : adair.song --复用--> siliter.yuan + * @CreateDate : 2020-05-18 16:49 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_IMPORT_TEMPLATE") +@Api("导入模板信息") +public class BasImportTemplate extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592889L; + @Column(name="TEMPLATE_CODE") + @ApiParam("模板代码") + private String templateCode; + + @Column(name="TEMPLATE_NAME") + @ApiParam("模板名称") + private String templateName; + + @Column(name="TEMPLATE_DESC") + @ApiParam("模板描述") + private String templateDesc; + + @Column(name="GROUP_NAME") + @ApiParam("分组名称") + private String groupName; + + /** + * 10-单表，20-多表 + */ + @Column(name="IMPORT_TYPE") + @ApiParam(value = "导入类型", example = "0") + private Integer importType; + + /** + * 10-全覆盖，20-差异更新，30-重复不导入 + */ + @Column(name="UPDATE_TYPE") + @ApiParam(value = "更新类型", example = "0") + private Integer updateType; + + @Column(name="SCRIPT_NO") + @ApiParam("脚本编号") + private String scriptNo; + + @Column(name="START_ROW") + @ApiParam(value = "起始行", example = "0") + private Integer startRow; + + @Transient + @ApiParam("模板明细列表") + private List templateDetailsList; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java new file mode 100644 index 0000000..736b6ba --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java @@ -0,0 +1,117 @@ +package cn.estsh.i3plus.pojo.mes.bean.template; + +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; + +/** + * @Description : 导入模板明细信息 + * @Reference : + * @Author : adair.song --复用--> siliter.yuan + * @CreateDate : 2020-05-18 16:49 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_IMPORT_TEMPLATE_DETAILS") +@Api("导入模板明细信息") +public class BasImportTemplateDetails extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592999L; + @Column(name="TEMPLATE_CODE") + @ApiParam("模板代码") + private String templateCode; + + @Column(name="TABLE_NAME") + @ApiParam("表名称") + private String tableName; + + @Column(name="FIELD_CODE") + @ApiParam("字段英文名称") + private String fieldCode; + + @Column(name="FIELD_ALIAS") + @ApiParam("字段别名") + private String fieldAlias; + + @Column(name="LABEL_CODE") + @ApiParam("标签代码") + private String labelCode; + + @Column(name="LABEL_NAME") + @ApiParam("标签名称") + private String labelName; + + @Column(name="DEFAULT_VALUE") + @ApiParam("默认值") + private String defaultValue; + + /** + * 数据格式 文本、整数、小数、日期 + */ + @Column(name="DATA_FORAMT") + @ApiParam("数据格式") + private String dataFormat; + + /** + * 1-是，2-否 + */ + @Column(name="IS_REQUIRE") + @ApiParam(value = "是否必填", example = "0") + private Integer isRequire; + + @Column(name="DECIMAIL_SPLIT") + @ApiParam("小数点分隔符") + private String decimalSplit; + + @Column(name="THOUSANDS_SPLIT") + @ApiParam("千分位分隔符") + private String thousandsSplit; + + // YYYY-MM-DD/DD-MM-YY/YYYY-MM-DD HH:mm:ss + @Column(name="DATE_FORMAT") + @ApiParam("日期格式") + private String dateFormat; + + @Column(name="REMARK") + @ApiParam("备注") + private String remark; + + @Column(name="SEQ") + @ApiParam(value = "序号", example = "0") + private Integer seq; + + @Column(name="MAX_LENGTH") + @ApiParam(value = "最大长度", example = "0") + private Integer maxLength; + + @Column(name="RELATION_TABLE") + @ApiParam("关联表名") + private String relationTable; + + @Column(name="RELATION_FIELD") + @ApiParam("关联字段") + private String relationField; + + /** + * 是否主键 1-是，2-否 + */ + @Column(name="IS_PK") + @ApiParam(value = "是否主键", example = "0") + private Integer isPk; + + @Column(name="SHEET_NAME") + @ApiParam("工作薄名称") + private String sheetName; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BasBeanFieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BasBeanFieldModel.java new file mode 100644 index 0000000..c8747c9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BasBeanFieldModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @description 数据库实例字段模型 + * @author adair.song --复用--> siliter.yuan + * @CreateDate : 2020-05-18 16:49 + */ +@Data +@Api("数据库实例字段模型") +public class BasBeanFieldModel { + + @ApiParam("表名") + private String tableName; + + @ApiParam("表描述") + private String tableDesc; + + @ApiParam("字段英文名称") + private String fieldEnName; + + @ApiParam("字段类型") + public String fieldType; + + @ApiParam("字段描述") + private String fieldDesc; + + @ApiParam("实例类名") + public String entityName; + + @ApiParam("实例字段名称") + public String propertyName; + + @ApiParam("实例类全名") + public String entityClassName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateDetailsRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateDetailsRepository.java new file mode 100644 index 0000000..164974a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateDetailsRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 导入模板明细数据操作仓库 + * @Reference : + * @Author : adair.song --复用--> siliter.yuan + * @CreateDate : 2020-05-18 16:49 + * @Modify: + **/ +@Repository +public interface BasImportTemplateDetailsRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateRepository.java new file mode 100644 index 0000000..e5d8957 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; +import org.springframework.stereotype.Repository; + +/** + * @Description : 导入模板数据操作仓库 + * @Reference : + * @Author : adair.song --复用--> siliter.yuan + * @CreateDate : 2020-05-18 16:49 + * @Modify: + **/ +@Repository +public interface BasImportTemplateRepository extends BaseRepository { + +} 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 80191ce..e7d3159 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 @@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; +import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; +import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; import org.springframework.util.StringUtils; @@ -2859,4 +2861,30 @@ public class MesHqlPack { } return packBean; } + + /** + * 导入模板信息分页查询条件 + * @param template + * @return + */ + public static DdlPackBean packHqlBasImportTemplate(BasImportTemplate template) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result); + DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result); + DdlPreparedPack.getStringEqualPack(template.getGroupName(), "groupName", result); + getStringBuilderPack(template, result); + return result; + } + + /** + * 导入模板明细信息分页查询条件 + * @param details + * @return + */ + public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result); + getStringBuilderPack(details, result); + return result; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanFieldInfoModel.java new file mode 100644 index 0000000..2155452 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanFieldInfoModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description : Wms实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-24 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class BasBeanFieldInfoModel implements Serializable { + + private static final long serialVersionUID = -6376845639646448895L; + + @ApiParam(value = "表名称") + public String tableName; + + @ApiParam(value = "表字段名称") + private String fieldName; + + @ApiParam(value = "表字段描述") + private String fieldDesc; + + @ApiParam(value = "表字段类型") + private String fieldType; + + @ApiParam(value = "主键") + private String isFieldPrimaryKey; + + @ApiParam(value = "非空") + private String isFieldNull; + + @ApiParam(value = "外键") + private String isFieldForeignKey; + + @ApiParam(value = "唯一约束") + private String isFieldUnique; + + @ApiParam(value = "自增") + private String isFieldGeneric; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java new file mode 100644 index 0000000..de64920 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import cn.estsh.i3plus.pojo.model.mes.BasBeanFieldInfoModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Wms实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-24 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class BasBeanInfoModel implements Serializable { + + private static final long serialVersionUID = -6376845639646448495L; + + @ApiParam(value = "系统名称") + public String systemName; + + @ApiParam(value = "实体名称") + public String entityName; + + @ApiParam(value = "数据表名称") + private String tableName; + + @ApiParam(value = "数据表描述") + private String tableDesc; + + @ApiParam(value = "字段列表数据") + private List fieldInfoModelList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelsImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelsImportModel.java new file mode 100644 index 0000000..7e412c4 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelsImportModel.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.model.mes; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; + +/** + * @Author: siliter.yuan + * @CreateDate: 2020/4/21 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("导入结果model") +public class ExcelsImportModel implements Serializable { + + private static final long serialVersionUID = 1444172647244864339L; + @ApiParam("结果") + private boolean result; + + @ApiParam("成功行数量") + private int successRowNum; + + @ApiParam("工作薄名称") + private String sheetName; + + @ApiParam("导入数据集合") + private List> excelList; + + @ApiParam("错误信息集合") + private List ImportErrorModels; +} From 8ab6e7762059da557c7aca4575d1c7b274ef9245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 18 May 2020 15:01:20 +0800 Subject: [PATCH 25/45] =?UTF-8?q?=E3=80=908528=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E6=A3=80=E9=AA=8C-=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=9C=AA=E5=BC=80=E5=8F=91=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesQcOrderAccessory.java | 44 ++++++++++++++++++++++ .../repository/MesQcOrderAccessoryRepository.java | 14 +++++++ 2 files changed, 58 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderAccessoryRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java new file mode 100644 index 0000000..df69cde --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER_ACCESSORY") +@Api("MES_检验单附件") +public class MesQcOrderAccessory extends BaseBean implements Serializable { + + //private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "ACCESSORY_NAME") + @ApiParam("附件名称") + private String accessoryName; + + @Column(name = "ACCESSORY_URL") + @ApiParam("附件路径") + private String accessoryUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderAccessoryRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderAccessoryRepository.java new file mode 100644 index 0000000..d9c9157 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderAccessoryRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderAccessory; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesQcOrderAccessoryRepository extends BaseRepository { +} From 0ccadab4bed238df4a5d869e268b30af6947cc6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 18 May 2020 16:17:51 +0800 Subject: [PATCH 26/45] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E3=80=901842?= =?UTF-8?q?=E3=80=91-=E6=B5=B7=E7=BA=B3=E5=B7=9D=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=BA=94=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB=E3=80=81=E5=AE=9E=E4=BD=93=E5=92=8Cmodel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/mes/ExcelsImportModel.java | 40 ---------------------- 1 file changed, 40 deletions(-) delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelsImportModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelsImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelsImportModel.java deleted file mode 100644 index 7e412c4..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelsImportModel.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.model.mes; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; - -/** - * @Author: siliter.yuan - * @CreateDate: 2020/4/21 9:19 AM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("导入结果model") -public class ExcelsImportModel implements Serializable { - - private static final long serialVersionUID = 1444172647244864339L; - @ApiParam("结果") - private boolean result; - - @ApiParam("成功行数量") - private int successRowNum; - - @ApiParam("工作薄名称") - private String sheetName; - - @ApiParam("导入数据集合") - private List> excelList; - - @ApiParam("错误信息集合") - private List ImportErrorModels; -} From 88a0d6d02faca1b6afbd138477430b54bcdcb7b8 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 18 May 2020 19:48:10 +0800 Subject: [PATCH 27/45] =?UTF-8?q?=E4=BB=BB=E5=8A=A1:[1828]=20=E5=8D=8A?= =?UTF-8?q?=E6=88=90=E5=93=81=E7=BB=91=E5=AE=9A=E5=B7=A5=E6=AD=A5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 45 ++++++++++++++++++++-- .../pojo/mes/model/PartStockScheduleModel.java | 23 +++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartStockScheduleModel.java 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 6ed4888..498cdfb 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 @@ -1809,8 +1809,10 @@ public class MesPcnEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), - BH_ORDER(40, "B&H工单"); -// JIT_ORDER(50, "JIT工单"); + BH_ORDER(40, "B&H工单"), + JIT_ORDER(50, "JIT工单"), + STOCK_ORDER(60, "库存工单"), + REPAIR(70,"返修插单"); private int value; private String description; @@ -2005,7 +2007,8 @@ public class MesPcnEnumUtil { public enum QUEUE_ORDER_DETAIL_STATUS { NORMAL(10, "正常"), - CLOSE(20, "关闭"); + CLOSE(20, "关闭"), + FINISH(30, "完成"); private int value; private String description; @@ -3639,4 +3642,40 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 生产队列 队列类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_ORDER_QUEUE_TYPE { + PRODUCT_QUEUE(10, "生产队列"), + PRELOAD_QUEUE(20, "预装队列"); + + private int value; + private String description; + + QUEUE_ORDER_QUEUE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartStockScheduleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartStockScheduleModel.java new file mode 100644 index 0000000..efc1571 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartStockScheduleModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/5/18 5:10 下午 + * @Modify: + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PartStockScheduleModel { + + private String partNo; + + private Integer boxQty; + + private Double qty; +} From 6c7a88b962294521261b9ef009af8e69da5e876a Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 18 May 2020 20:10:37 +0800 Subject: [PATCH 28/45] =?UTF-8?q?bug:=E3=80=908520=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/{engine/script => bean}/EngineScriptPersistence.java | 2 +- .../{engine/script => bean}/EngineScriptPersistenceHistory.java | 2 +- .../wms/repository/EngineScriptPersistenceHistoryRepository.java | 2 +- .../pojo/wms/repository/IEngineScriptPersistenceRepository.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 +++++--- 5 files changed, 9 insertions(+), 7 deletions(-) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/{engine/script => bean}/EngineScriptPersistence.java (97%) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/{engine/script => bean}/EngineScriptPersistenceHistory.java (97%) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java similarity index 97% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java index c7e9d7c..345b775 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.engine.script; +package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java similarity index 97% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java index 4615324..18c15f2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.engine.script; +package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java index 52818f2..449fe2d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistenceHistory; +import cn.estsh.i3plus.pojo.wms.bean.EngineScriptPersistenceHistory; import org.springframework.stereotype.Repository; @Repository diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java index de8bf6d..0870082 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; +import cn.estsh.i3plus.pojo.wms.bean.EngineScriptPersistence; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index c81035f..61a567d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -15,13 +15,15 @@ import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; -import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; -import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistenceHistory; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; /** From e2ce63a9cd70507c50aa43021451c83c2daa8d15 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 19 May 2020 11:33:50 +0800 Subject: [PATCH 29/45] =?UTF-8?q?bug:=20[8533]=20plc=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BA=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 88 ++++++++++++++++------ 1 file changed, 63 insertions(+), 25 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 eba9bab..d524f9f 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 @@ -14,14 +14,14 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_EXPRESSION { - GT(">",">","大于"), - LT("<","<","小于"), - EQ("=","=","等于"), - NEQ("!=","!=","不等于"), - GTE(">=",">=","大于等于"), - LTE("<=","<=","小于等于"), - LIKE("like","like","LIKE"), - IN("in","in","包含"); + GT(">", ">", "大于"), + LT("<", "<", "小于"), + EQ("=", "=", "等于"), + NEQ("!=", "!=", "不等于"), + GTE(">=", ">=", "大于等于"), + LTE("<=", "<=", "小于等于"), + LIKE("like", "like", "LIKE"), + IN("in", "in", "包含"); private String value; private String code; @@ -240,7 +240,7 @@ public class MesEnumUtil { } /** - * 排序校验模式 + * 排序校验模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CHECK_PROD_SEQ_FLAG { @@ -307,7 +307,7 @@ public class MesEnumUtil { } /** - * 排序校验模式 + * 排序校验模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TOOLING_ACTION_RECORD_TYPE { @@ -371,6 +371,7 @@ public class MesEnumUtil { return valueOf(val); } } + /** * JIS发运是否按主队列顺序扫描 */ @@ -3241,7 +3242,7 @@ public class MesEnumUtil { BH_ORDER(40, "B&H工单"), JIT_ORDER(50, "JIT工单"), STOCK_ORDER(60, "库存工单"), - REPAIR(70,"返修插单"); + REPAIR(70, "返修插单"); private int value; private String description; @@ -5009,7 +5010,7 @@ public class MesEnumUtil { } /** - * 作业校验模式 + * 作业校验模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CHECK_MODEL { @@ -5044,7 +5045,7 @@ public class MesEnumUtil { } /** - * PLC类型 + * PLC类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PLC_TYPE { @@ -5079,7 +5080,7 @@ public class MesEnumUtil { } /** - * 看板类型 + * 看板类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum BOARD_TYPE { @@ -5124,7 +5125,7 @@ public class MesEnumUtil { } /** - * 看板类型 + * 看板类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum BOARD_OBJECT_TYPE { @@ -5207,7 +5208,7 @@ public class MesEnumUtil { } /** - * 界面类型 + * 界面类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WINDOW_TYPE { @@ -5243,7 +5244,7 @@ public class MesEnumUtil { /** - * 运算对象属性 运算类型 + * 运算对象属性 运算类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OPERATE_TYPE { @@ -5279,7 +5280,7 @@ public class MesEnumUtil { } /** - * 运算对象属性 属性类型 + * 运算对象属性 属性类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ATTRIBUTE_TYPE { @@ -5314,7 +5315,7 @@ public class MesEnumUtil { } /** - * 运算对象属性配置 赋值类型 + * 运算对象属性配置 赋值类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum VALUE_TYPE { @@ -5360,7 +5361,7 @@ public class MesEnumUtil { } /** - * 运算对象 对象代码 + * 运算对象 对象代码 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OBJECT_CODE { @@ -5406,7 +5407,7 @@ public class MesEnumUtil { } /** - * 脚本类型（组件、表单、报表、JOB、其他） + * 脚本类型（组件、表单、报表、JOB、其他） */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SCRIPT_TYPE { @@ -5444,7 +5445,7 @@ public class MesEnumUtil { } /** - * 语言类型（Groovy、Python、JavaScript、Scala、Ruby） + * 语言类型（Groovy、Python、JavaScript、Scala、Ruby） */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SCRIPT_LANGUAGE { @@ -5482,9 +5483,8 @@ public class MesEnumUtil { } - /** - * 运算对象代码 + * 运算对象代码 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OPERATE_OBJECT_CODE { @@ -5530,7 +5530,7 @@ public class MesEnumUtil { } /** - * oee 运算状态 + * oee 运算状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OEE_STATUS { @@ -5730,4 +5730,42 @@ public class MesEnumUtil { } } + + /** + * MES_PLC 数据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_DATA_TYPE { + + INT("int", "数字"), + STRING("string", "字符串"), + BOOLEAN("boolean", "布尔"); + + private String value; + private String description; + + PLC_DATA_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } From e47f050ff339264cf71e1698c1d7579b6fe230ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 19 May 2020 13:44:58 +0800 Subject: [PATCH 30/45] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B7=A5=E5=85=B7=E7=B1=BB=E5=92=8C=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/mes/ExcelImportModel.java | 3 ++ .../i3plus/pojo/model/wms/ExcelImportModel.java | 41 ---------------------- 2 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java index f355ca3..a4d0580 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java @@ -43,4 +43,7 @@ public class ExcelImportModel implements Serializable { @ApiParam("导入进度") private String importSpeed; + @ApiParam("Sheet名称") + private String sheetName; + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java deleted file mode 100644 index a8eb1fd..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.estsh.i3plus.pojo.model.wms; - - -import cn.estsh.i3plus.pojo.model.mes.ImportErrorModel; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; - -/** - * @Author: siliter.yuan - * @CreateDate: 2020/4/21 9:19 AM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("导入结果model") -public class ExcelImportModel implements Serializable { - - private static final long serialVersionUID = 1444427447244864339L; - @ApiParam("结果") - private boolean result; - - @ApiParam("成功行数量") - private int successRowNum; - - @ApiParam("工作薄名称") - private String sheetName; - - @ApiParam("导入数据集合") - private List> excelList; - - @ApiParam("错误信息集合") - private List ImportErrorModels; -} From f8ccd0166e86b5543c7554fcbe2e8a1715119295 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 19 May 2020 15:25:25 +0800 Subject: [PATCH 31/45] =?UTF-8?q?BUG=E3=80=908554=E3=80=91=20=E4=B8=AD?= =?UTF-8?q?=E8=88=AA-=E5=B7=A5=E8=A3=85=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=90=8E=EF=BC=8C=E4=B8=80=E4=B8=AAexcel?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E4=BA=A7=E7=94=9F=E4=B8=80=E7=AC=94=E4=BA=8B?= =?UTF-8?q?=E7=89=A9=EF=BC=8C=E6=98=8E=E7=BB=86=E6=8C=89=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 30 ++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index e85e34c..bb0066f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; -import cn.estsh.i3plus.pojo.base.util.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,7 +10,12 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库存移动单主表信息 @@ -235,6 +239,28 @@ public class WmsMoveMaster extends BaseBean { this.orderStatus = orderStatus; } + + public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, + Integer isUrgent, String carNo, Integer busiTypeCode, String refOrderNo, String remark, + String organizeCode, String createDatetime, String createUser, String modifyDatetime, String modifyUser, String fixId + ) { + this.orderNo = orderNo; + this.orderStatus = orderStatus; + this.remark = remark; + this.isUrgent = isUrgent; + this.transTypeCode = transTypeCode; + this.errorMessage = errorMessage; + this.busiTypeCode = busiTypeCode; + this.refOrderNo = refOrderNo; + this.carNo = carNo; + this.organizeCode = organizeCode; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + this.fixId = fixId; + } + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } From 6a28329d757c0bab04376fa20bacccec35b60d8f Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 19 May 2020 15:28:06 +0800 Subject: [PATCH 32/45] =?UTF-8?q?=E3=80=908441=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=9B=9E=E6=89=A7=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 392c8e6..03deeea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -143,7 +143,7 @@ public class WmsASNMasterDetails extends BaseBean { public WmsASNMasterDetails(){} - public WmsASNMasterDetails(Double recQty,String partNo,String orderNo,String partNameRdd,String item,String unit,String erpAreaNo,String organizeCode){ + public WmsASNMasterDetails(Double recQty,String partNo,String orderNo,String partNameRdd,String item,String unit,String erpAreaNo,String organizeCode,String planDate,String planTime){ this.recQty = recQty; this.partNo = partNo; this.orderNo = orderNo; @@ -152,5 +152,7 @@ public class WmsASNMasterDetails extends BaseBean { this.unit = unit; this.erpAreaNo = erpAreaNo; this.organizeCode = organizeCode; + this.planDate = planDate; + this.planTime = planTime; } } From e3accbf24e2214f32599cac45d706993c13dd36a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 19 May 2020 16:01:28 +0800 Subject: [PATCH 33/45] =?UTF-8?q?=E3=80=908441=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=9B=9E=E6=89=A7=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 03deeea..9ff19b8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -143,8 +143,9 @@ public class WmsASNMasterDetails extends BaseBean { public WmsASNMasterDetails(){} - public WmsASNMasterDetails(Double recQty,String partNo,String orderNo,String partNameRdd,String item,String unit,String erpAreaNo,String organizeCode,String planDate,String planTime){ + public WmsASNMasterDetails(Double recQty,Double qty,String partNo,String orderNo,String partNameRdd,String item,String unit,String erpAreaNo,String organizeCode,String planDate,String planTime){ this.recQty = recQty; + this.qty = qty; this.partNo = partNo; this.orderNo = orderNo; this.partNameRdd = partNameRdd; From 8a2d54ce615508f856a527b988c2e23d0c7b6389 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 19 May 2020 18:07:14 +0800 Subject: [PATCH 34/45] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/modelbean/WmsAutoPurchasePartModel.java | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java new file mode 100644 index 0000000..5f9f35f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 零件自动采购单信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-18 + * @Modify: + **/ +@Data +@Api("收货追踪地图信息") +public class WmsAutoPurchasePartModel { + @ApiParam("合同号") + private String orderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("物料数量") + private String qty; + + @ApiParam("Erp库存地") + private String erpWarehouse; +} From 8d2f6fb8d118a2994ddb68a7c6831544319c57d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 19 May 2020 18:29:13 +0800 Subject: [PATCH 35/45] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E3=80=901842?= =?UTF-8?q?=E3=80=91-=E6=B5=B7=E7=BA=B3=E5=B7=9D=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index 4d177e8..48a037a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -12,7 +12,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.io.Serializable; -import java.util.Date; /** * @Description:散件零件生产配置 @@ -133,11 +132,11 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @Column(name = "EFF_START_TIME") @ApiParam("有效起始日期") - private Date effStartTime; + private String effStartTime; @Column(name = "EFF_END_TIME") @ApiParam("有效截至日期") - private Date effEndTime; + private String effEndTime; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") From 4ba0e6b26481372e4e4d507cd5cbd64830586fb8 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 19 May 2020 21:07:24 +0800 Subject: [PATCH 36/45] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java index 5f9f35f..ac17a25 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -24,8 +24,19 @@ public class WmsAutoPurchasePartModel { private String partName; @ApiParam("物料数量") - private String qty; + private Integer qty; @ApiParam("Erp库存地") private String erpWarehouse; + + public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse) { + this.partNo = partNo; + this.partName = partName; + this.qty = qty; + this.erpWarehouse = warehouse; + } + + public WmsAutoPurchasePartModel() { + + } } From 08b03c9eb8ffcbf79ef08b8cadc4a5f954726787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 20 May 2020 09:32:11 +0800 Subject: [PATCH 37/45] =?UTF-8?q?Task1858:=E7=94=B5=E6=9E=AA=E6=9E=AA?= =?UTF-8?q?=E5=A4=B4=E6=9B=B4=E6=8D=A2=E8=AE=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java | 11 ++++++++++- 3 files changed, 25 insertions(+), 2 deletions(-) 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 498cdfb..71cc67b 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 @@ -2544,10 +2544,11 @@ public class MesPcnEnumUtil { TABLE("table", "表格"), TEXT("text", "正常文本"), EXP_TEXT("exp_text", "异常文本"), - FILE("file", "定制内容文件"), + FILE("file", "打印模板文件"), IMAGE("image", "图片"), BUTTON("button", "按钮"), TABLES("tables", "多个表格"), + CUSTOM("custom", "定制页面"), FORM("form", "文本按钮"); private String value; @@ -3246,6 +3247,7 @@ public class MesPcnEnumUtil { public enum TABLE_COLOR { GREEN("green", "绿色"), + RED("red", "红色"), YELLOW("Yellow", "黄色"); private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java index 9353299..23cb9bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java @@ -63,10 +63,22 @@ public class MesEquipmentTooling extends BaseBean implements Serializable { @ApiParam("更换结束时间") private String endTime; + @Column(name = "REMIND_COUNT") + @ApiParam("提醒次数") + private Integer remindCount; + @Transient @ApiParam("最大次数") private Integer useCountMax; + @Transient + @ApiParam("按钮名称") + private String btnName; + + @Transient + @ApiParam("按钮颜色") + private String btnColor; + public Integer getToolingType() { return this.toolingType == null ? 0 : this.toolingType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java index cf099ca..e436ea3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -30,7 +31,7 @@ import java.io.Serializable; public class MesTooling extends BaseBean implements Serializable { private static final long serialVersionUID = -5033127912658757665L; - @Column(name = "TOOLING_CODE ") + @Column(name = "TOOLING_CODE") @ApiParam("工装代码") private String toolingCode ; @@ -49,4 +50,12 @@ public class MesTooling extends BaseBean implements Serializable { @Column(name = "USE_TIME_MAX") @ApiParam("最大使用时间") private String useTimeMax; + + @Column(name = "REMIND_COUNT") + @ApiParam("提醒次数") + private Integer remindCount; + + @Transient + @ApiParam("使用次数") + private Integer useCount; } From 8e94cbb8fa475965a7d2c84f6c5d11446fa69dad Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 20 May 2020 10:54:22 +0800 Subject: [PATCH 38/45] =?UTF-8?q?pojo=20=E5=BA=8F=E5=88=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java index df69cde..5a8deb4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java @@ -29,7 +29,8 @@ import java.io.Serializable; @Api("MES_检验单附件") public class MesQcOrderAccessory extends BaseBean implements Serializable { - //private static final long serialVersionUID = -5412635747424111476L; + private static final long serialVersionUID = 2648132773643541110L; + @Column(name = "ORDER_NO") @ApiParam("质检单号") private String orderNo; From 281a2dccb5d1e924b024e9a815806fcb3465e130 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 20 May 2020 11:42:05 +0800 Subject: [PATCH 39/45] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=87=87=E8=B4=AD=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/WmsAutoPurchasePartModel.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java index ac17a25..f6df34c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -4,6 +4,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; + /** * @Description : 零件自动采购单信息 * @Reference : @@ -23,13 +25,22 @@ public class WmsAutoPurchasePartModel { @ApiParam("物料名称") private String partName; + @ApiParam(value = "单位") + private String unit; + @ApiParam("物料数量") - private Integer qty; + private Double qty; @ApiParam("Erp库存地") private String erpWarehouse; - public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse) { + @ApiParam("供应商编码") + private String vendorNo; + + @ApiParam("供应商名称") + private String vendorName; + + public WmsAutoPurchasePartModel(String partNo, String partName, Double qty, String warehouse) { this.partNo = partNo; this.partName = partName; this.qty = qty; From f161270af87d1dea13fa83a725ce69669c6002db Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 20 May 2020 14:49:03 +0800 Subject: [PATCH 40/45] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java index d1cc3c6..32281e5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java @@ -7,7 +7,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; import java.io.Serializable; -import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.Objects; @@ -41,7 +40,7 @@ public class ImppLicense implements Serializable { /* 基础信息 */ @ApiParam(value ="授权ID") - private Long Id; // ID + private Long id; // ID @ApiParam(value ="授权应用ID") private Long appId; // APP_ID @ApiParam(value ="授权读取授权数据ID") From 56ae714283f44c353f62dd516c58964a0206cf64 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 20 May 2020 17:38:04 +0800 Subject: [PATCH 41/45] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1845?= =?UTF-8?q?=EF=BC=8C=E5=AE=89=E7=81=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonActionModule.java | 4 - .../estsh/i3plus/pojo/andon/bean/AndonActor.java | 2 +- .../i3plus/pojo/andon/bean/AndonActorRule.java | 2 +- .../pojo/andon/bean/AndonRouteModuleParam.java | 2 +- .../i3plus/pojo/andon/bean/AndonRouteStatus.java | 10 +- .../andon/bean/AndonRouteStatusErrorRecord.java | 67 ++++++++++ .../pojo/andon/model/AndonRouteStatusModel.java | 12 +- .../i3plus/pojo/andon/model/CommonMsgModel.java | 4 +- .../IAndonActionModuleParamRepository.java | 16 +++ .../repository/IAndonActionModuleRepository.java | 16 +++ .../IAndonAlarmRouteModuleParamRepository.java | 16 +++ .../repository/IAndonAlarmTypeRepository.java | 16 +++ .../repository/IAndonMessageTypeRepository.java | 16 +++ .../IAndonRouteStatusErrorRecordRepository.java | 16 +++ .../repository/IAndonRouteStatusRepository.java | 16 +++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 142 +++++++++++++++++--- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 147 ++++++++++++++++----- 17 files changed, 443 insertions(+), 61 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleParamRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteModuleParamRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmTypeRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageTypeRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusErrorRecordRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java index d9c9896..979bd4b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java @@ -50,10 +50,6 @@ public class AndonActionModule extends BaseBean implements Serializable { @ApiParam("组件类型") private Integer amType; - @Column(name = "INTERFACE_NO") - @ApiParam("界面编号") - private String interfaceNo; - @Transient @ApiParam("执行顺序") private Integer seq; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java index 315564b..9e23c15 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java @@ -40,7 +40,7 @@ public class AndonActor extends BaseBean implements Serializable { private String actorName; @Column(name = "ACTOR_Class") - @ApiParam("actor名称") + @ApiParam("actor类名") private String actorClass; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java index 4220d64..81e2f4b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ACTOR_RULE") @EqualsAndHashCode(callSuper = true) -@Api("ACTOR消息获取规则") +@Api("ACTOR消息类型配置") public class AndonActorRule extends BaseBean implements Serializable { private static final long serialVersionUID = 3244584643305867326L; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java index 49f2640..fd7db4f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java @@ -24,7 +24,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "PTL_ROUTE_MODULE_PARAM") +@Table(name = "ANDON_ROUTE_MODULE_PARAM") @EqualsAndHashCode(callSuper = true) @Api("流程组件参数") public class AndonRouteModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java index 2e57b5d..1724576 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java @@ -76,6 +76,14 @@ public class AndonRouteStatus extends BaseBean implements Serializable { @ApiParam("状态类型") private Integer statusType; + @Column(name = "INTERFACE_NO") + @ApiParam("界面编号") + private String interfaceNo; + + @Transient + @ApiParam("安灯流程ID") + private Long alarmRouteId; + @Transient @ApiParam("默认不缓存") private boolean cacheFlag = false; @@ -85,7 +93,7 @@ public class AndonRouteStatus extends BaseBean implements Serializable { private boolean actionAmgIdFalg = false; @Transient - @ApiParam("触发组件集默认未执行") + @ApiParam("触发类型默认不需要外部触发") private boolean checkTriggerTypeFalg = false; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java new file mode 100644 index 0000000..b6cbca9 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.andon.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; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ROUTE_STATUS_ERROR_RECORD") +@EqualsAndHashCode(callSuper = true) +@Api("流程状态异常记录") +public class AndonRouteStatusErrorRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4046192879130584866L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "ANDON_ORDER_NO") + @ApiParam(value = "安灯队列编号") + public String andonOrderNo; + + @Column(name = "ERROR_DESC") + @ApiParam(value = "失败描述") + public String errorDesc; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心") + public String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作中心") + public String workCellCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + public String alarmCode; + + @Column(name = "SOURCE_TYPE") + @ApiParam(value = "安灯来源类型") + private String sourceType; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java index b7dd7fb..a1849c2 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java @@ -60,12 +60,18 @@ public class AndonRouteStatusModel implements Serializable { @ApiParam("流程类型") private Integer routeType; + @ApiParam("界面编号") + private String interfaceNo; + + @ApiParam("安灯流程ID") + private Long alarmRouteId; + public AndonRouteStatusModel() { } public AndonRouteStatusModel(String routeCode, String statusCode, String statusName, String nextStatus, Integer triggerType, - String triggerEvent, String triggerWhere, Long actionAmgId, Long inAmgId, Long outAmgId, - Integer statusType, String alarmCode, String workCenterCode, Integer routeType) { + String triggerEvent, String triggerWhere, Long actionAmgId, Long inAmgId, Long outAmgId, Integer statusType, + String interfaceNo, String alarmCode, String workCenterCode, Integer routeType, Long alarmRouteId) { this.routeCode = routeCode; this.statusCode = statusCode; this.statusName = statusName; @@ -77,8 +83,10 @@ public class AndonRouteStatusModel implements Serializable { this.inAmgId = inAmgId; this.outAmgId = outAmgId; this.statusType = statusType; + this.interfaceNo = interfaceNo; this.alarmCode = alarmCode; this.workCenterCode = workCenterCode; this.routeType = routeType; + this.alarmRouteId = alarmRouteId; } } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java index 449b959..109a2cc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java @@ -39,8 +39,10 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("当前流程状态") private AndonRouteStatus curRouteStatus; - @ApiModelProperty("外部触发事件") + @ApiModelProperty("触发事件") private String triggerEvent; + @ApiModelProperty("下个触发事件，一个组件集执行完毕后这个值赋给triggerEvent") + private String nextTriggerEvent; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleParamRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleParamRepository.java new file mode 100644 index 0000000..386ff91 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleParam; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 11:07 + * @Modify: + **/ +@Repository +public interface IAndonActionModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleRepository.java new file mode 100644 index 0000000..7b30626 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 11:07 + * @Modify: + **/ +@Repository +public interface IAndonActionModuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteModuleParamRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteModuleParamRepository.java new file mode 100644 index 0000000..6d1f805 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteModuleParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRouteModuleParam; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 11:07 + * @Modify: + **/ +@Repository +public interface IAndonAlarmRouteModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmTypeRepository.java new file mode 100644 index 0000000..89ffba6 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-30 11:05 + * @Modify: + **/ +@Repository +public interface IAndonAlarmTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageTypeRepository.java new file mode 100644 index 0000000..c591caa --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonMessageType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-11-12-14:24 + * @Modify: + **/ +@Repository +public interface IAndonMessageTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusErrorRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusErrorRecordRepository.java new file mode 100644 index 0000000..f65809a --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusErrorRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatusErrorRecord; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface IAndonRouteStatusErrorRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusRepository.java new file mode 100644 index 0000000..00fdc18 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatus; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface IAndonRouteStatusRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 74e3e2b..3cc844f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -3,14 +3,9 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; import cn.estsh.i3plus.pojo.andon.bean.*; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.bean.ListPager; -import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; +import org.springframework.util.StringUtils; /** * @Description : 安灯对象查询封装 @@ -62,7 +57,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpLevel(), "rpLevel", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean); - if(StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeEnd())){ + if(!StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeEnd())){ DdlPreparedPack.timeBuilder(andonMessageRecord.getCreateDateTimeStart(), andonMessageRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true); } return packBean; @@ -209,7 +204,7 @@ public class AndonHqlPack { public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { // 判断工厂代码是否为空 - if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + if (!StringUtils.isEmpty(bean.getOrganizeCode())) { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } @@ -373,7 +368,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEcCode(), "ecCode", packBean); DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEmCode(), "emCode", packBean); - if(StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeEnd())){ + if(!StringUtils.isEmpty(andonKnowledgeBase.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonKnowledgeBase.getCreateDateTimeEnd())){ DdlPreparedPack.timeBuilder(andonKnowledgeBase.getCreateDateTimeStart(), andonKnowledgeBase.getCreateDateTimeEnd(), "createDatetime", packBean, true); } @@ -418,7 +413,7 @@ public class AndonHqlPack { DdlPreparedPack.getInPackList(andonManageQueue.getTypeList(), "alarmCode", result); // 只有安灯任务管理特殊用途 DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); - if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){ + if(!StringUtils.isEmpty(andonManageQueue.getCallTimeStart()) || !StringUtils.isEmpty(andonManageQueue.getCallTimeEnd())){ DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true); } getStringBuilderPack(andonManageQueue, result); @@ -557,10 +552,10 @@ public class AndonHqlPack { */ public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode); - if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){ + if (!StringUtils.isEmpty(mesEquipment.getWorkCellCode())){ DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean); } - if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){ + if (!StringUtils.isEmpty(mesEquipment.getEquipmentCode())){ DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); } packBean.setOrderByStr(mesEquipment.orderBy()); @@ -575,13 +570,13 @@ public class AndonHqlPack { */ public static DdlPackBean getMesShift(MesShift shift, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode); - if (StringUtils.isNotEmpty(shift.getShiftCode())){ + if (!StringUtils.isEmpty(shift.getShiftCode())){ DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean); } - if (StringUtils.isNotEmpty(shift.getShiftName())){ + if (!StringUtils.isEmpty(shift.getShiftName())){ DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean); } - if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){ + if (!StringUtils.isEmpty(shift.getWorkCenterCode())){ DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean); } @@ -876,4 +871,121 @@ public class AndonHqlPack { DdlPreparedPack.timeBuilder(startDateTime, endDateTime, "createDatetime", result, true); return result; } + + /** + * actor信息 + * @param actor + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonActor(AndonActor actor, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actor, organizeCode); + if (!StringUtils.isEmpty(actor.getActorCode())) { + DdlPreparedPack.getStringLikerPack(actor.getActorCode(), "actorCode", packBean); + } + if (!StringUtils.isEmpty(actor.getActorName())) { + DdlPreparedPack.getStringLikerPack(actor.getActorName(), "actorName", packBean); + } + if (!StringUtils.isEmpty(actor.getActorClass())) { + DdlPreparedPack.getStringLikerPack(actor.getActorClass(), "actorClass", packBean); + } + return packBean; + } + + /** + * 消息类型 + * @param messageType + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonMessageType(AndonMessageType messageType, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(messageType, organizeCode); + if (!StringUtils.isEmpty(messageType.getMtCode())) { + DdlPreparedPack.getStringLikerPack(messageType.getMtCode(), "mtCode", packBean); + } + if (!StringUtils.isEmpty(messageType.getMtName())) { + DdlPreparedPack.getStringLikerPack(messageType.getMtName(), "mtName", packBean); + } + return packBean; + } + + /** + * actor消息类型配置 + * @param actorRule + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonActorRule(AndonActorRule actorRule, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actorRule, organizeCode); + if (!StringUtils.isEmpty(actorRule.getActorCode())) { + DdlPreparedPack.getStringLikerPack(actorRule.getActorCode(), "actorCode", packBean); + } + if (!StringUtils.isEmpty(actorRule.getMtCode())) { + DdlPreparedPack.getStringLikerPack(actorRule.getMtCode(), "mtCode", packBean); + } + return packBean; + } + + /** + * 安灯类型 + * @param alarmType + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonAlarmType(AndonAlarmType alarmType, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(alarmType, organizeCode); + if (!StringUtils.isEmpty(alarmType.getAlarmCode())) { + DdlPreparedPack.getStringLikerPack(alarmType.getAlarmCode(), "alarmCode", packBean); + } + if (!StringUtils.isEmpty(alarmType.getAlarmName())) { + DdlPreparedPack.getStringLikerPack(alarmType.getAlarmName(), "alarmName", packBean); + } + return packBean; + } + + /** + * 组件 + * @param actionModule + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonActionModule(AndonActionModule actionModule, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actionModule, organizeCode); + if (!StringUtils.isEmpty(actionModule.getAmCode())) { + DdlPreparedPack.getStringLikerPack(actionModule.getAmCode(), "amCode", packBean); + } + if (!StringUtils.isEmpty(actionModule.getAmName())) { + DdlPreparedPack.getStringLikerPack(actionModule.getAmName(), "amName", packBean); + } + if (!StringUtils.isEmpty(actionModule.getCallClass())) { + DdlPreparedPack.getStringLikerPack(actionModule.getCallClass(), "callClass", packBean); + } + if (!StringUtils.isEmpty(actionModule.getAmType())) { + DdlPreparedPack.getNumEqualPack(actionModule.getAmType(), "amType", packBean); + } + return packBean; + } + + /** + * 组件参数 + * @param actionModuleParam + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonActionModuleParam(AndonActionModuleParam actionModuleParam, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actionModuleParam, organizeCode); + if (!StringUtils.isEmpty(actionModuleParam.getAmCode())) { + DdlPreparedPack.getStringLikerPack(actionModuleParam.getAmCode(), "amCode", packBean); + } + if (!StringUtils.isEmpty(actionModuleParam.getParamCode())) { + DdlPreparedPack.getStringLikerPack(actionModuleParam.getParamCode(), "paramCode", packBean); + } + if (!StringUtils.isEmpty(actionModuleParam.getParamName())) { + DdlPreparedPack.getStringLikerPack(actionModuleParam.getParamName(), "paramName", packBean); + } + if (!StringUtils.isEmpty(actionModuleParam.getParamType())) { + DdlPreparedPack.getNumEqualPack(actionModuleParam.getParamType(), "paramType", packBean); + } + return packBean; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index f685c3c..2350d9d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -13,22 +13,29 @@ import org.apache.commons.lang3.StringUtils; public class AndonEnumUtil { /** - * 流程状态-触发类型 + * 状态点界面编号 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_TRIGGER_TYPE { - INNER_TRIGGER(10, "内部触发"), - OUTER_TRIGGER(20, "外部触发"); + public enum ANDON_ROUTE_STATUS_INTERFACE_NO { + EQUMENT_ALARM_CALL("EQUMENT_ALARM_CALL", "设备呼叫弹框界面"), + QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"), + PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"), + ROUTING_ALARM_CALL("ROUTING_ALARM_CALL", "工艺呼叫弹框界面"), + OTHER_ALARM_CALL("OTHER_ALARM_CALL", "自处理呼叫弹框界面"), + FIX_ERROR_CALL("FIX_ERROR_CALL", "自动报警呼叫弹框界面"), + ALARM_SIGN("ALARM_SIGN", "响应弹框界面"), + ALARM_CANCEL("ALARM_CANCEL", "撤销二次提醒框"), + ALARM_RESOLVE("ALARM_RESOLVE", "解决弹框界面"); - private int value; + private String value; private String description; - ROUTE_TRIGGER_TYPE(int value, String description) { + ANDON_ROUTE_STATUS_INTERFACE_NO(String value, String description) { this.value = value; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -38,20 +45,21 @@ public class AndonEnumUtil { } /** - * 组件状态类型 + * 组件参数类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_STATUS_TYPE { - START(10, "START", "开始状态"), - EXECUTING(20, "EXECUTING", "执行中状态"), - TERMINATE(30, "TERMINATE", "中断状态"), - FINISH(40, "FINISH", "完成状态"); + public enum ACTION_MODULE_PARAM_TYPE { + + QUALIFIED(10, "number", "数字"), + DEFECTED(20, "text", "字符串"), + SCRAPED(30, "select", "可选值"), + BUTTON(40, "button", "按钮"); private int value; private String code; private String description; - ROUTE_STATUS_TYPE(int value, String code, String description) { + ACTION_MODULE_PARAM_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -68,16 +76,24 @@ public class AndonEnumUtil { public String getDescription() { return description; } + + 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; + } + } + return tmp; + } } /** - * 安灯作业组件-组件类型 + * 组件类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ACTION_MODULE_AM_TYPE { - - METHOD_MODULE(10, "方法组件"), - INTERFACE_MODULE(20, "界面组件"); + COMMON_MODULE(10, "通用组件"); private int value; private String description; @@ -94,15 +110,63 @@ public class AndonEnumUtil { public String getDescription() { return description; } + } - 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; - } - } - return tmp; + /** + * 流程状态-触发类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_TRIGGER_TYPE { + INNER_TRIGGER(10, "内部触发"), + OUTER_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + ROUTE_TRIGGER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 组件状态类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_TYPE { + START(10, "START", "开始状态"), + EXECUTING(20, "EXECUTING", "执行中状态"), + TERMINATE(30, "TERMINATE", "中断状态"), + FINISH(40, "FINISH", "完成状态"); + + private int value; + private String code; + private String description; + + ROUTE_STATUS_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; } } @@ -831,21 +895,23 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ANDON_ACTION_TAG { - CALL(1,"10","呼叫"), - SIGN(2,"20","响应"), - RESOLVE(3,"30","解决"), - CANCEL(4,"40", "撤销"), - COMMIT(5,"50","解决待审"), - PASS(6,"60","审批完成"), - REJECT(7,"70","驳回"), - CONFIRMED_CANCEL(8,"80","撤销已确认"); + CALL(1, "1","10","呼叫"), + SIGN(2, "2","20","响应"), + RESOLVE(3, "3","30","解决"), + CANCEL(4, "4","40", "撤销"), + COMMIT(5, "5","50","解决待审"), + PASS(6, "6","60","审批完成"), + REJECT(7, "7","70","驳回"), + CONFIRMED_CANCEL(8, "8","80","撤销已确认"); private int value; + private String valueStr; private String code; private String description; - ANDON_ACTION_TAG(int value, String code, String description) { + ANDON_ACTION_TAG(int value, String valueStr, String code, String description) { this.value = value; + this.valueStr = valueStr; this.code = code; this.description = description; } @@ -854,6 +920,8 @@ public class AndonEnumUtil { return value; } + public String getValueStr(){ return valueStr; } + public String getCode(){ return code; } public String getDescription() { @@ -869,6 +937,15 @@ public class AndonEnumUtil { return null; } + public static ANDON_ACTION_TAG getByValueStr(String valueStr) { + for (ANDON_ACTION_TAG actionTag : values()) { + if (actionTag.getValueStr().equals(valueStr)) { + return actionTag; + } + } + return null; + } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { From 654f1dcc84cc4f5bb61014b852ebb468e3174ad0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 20 May 2020 17:43:48 +0800 Subject: [PATCH 42/45] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1845?= =?UTF-8?q?=EF=BC=8C=E5=AE=89=E7=81=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 89d1c41..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ modules/i3plus-pojo-lac modules/i3plus-pojo-ptl modules/i3plus-pojo-ics -` modules/i3plus-pojo-mdm + modules/i3plus-pojo-mdm From 99d3c9d7213dccd5c5543e6a87b13f076c496931 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 20 May 2020 18:15:22 +0800 Subject: [PATCH 43/45] =?UTF-8?q?=E6=8F=90=E6=B5=8B=E5=90=88=E5=B9=B6=20?= =?UTF-8?q?=E8=BF=98=E5=8E=9Fpom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..9f9717e 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b948580..a9e288f 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..a44418c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index c338f71..2de88b5 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..50ab2c2 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..7f94617 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index bf96e57..d800ecf 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index a758a6a..60fc467 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index efacfd2..d65e031 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index dba12cc..a785f21 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 81670b2..d6d2f8e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..0fbfb69 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index eaf2544..76739f9 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0f615b6..0368700 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9e5f745..b2eedd4 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0fea52b..5fcd08a 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From f50b76cd1f9cd550099bd1eef72fc7024d046549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 21 May 2020 09:26:56 +0800 Subject: [PATCH 44/45] =?UTF-8?q?Task1858:=E7=94=B5=E6=9E=AA=E6=9E=AA?= =?UTF-8?q?=E5=A4=B4=E6=9B=B4=E6=8D=A2=E8=AE=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 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 81d92e8..920a748 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 @@ -313,7 +313,8 @@ public class MesEnumUtil { public enum TOOLING_ACTION_RECORD_TYPE { REPLACE(10, "REPLACE", "更换"), WAREHOUSE(20, "WAREHOUSE", "入库"), - Use(30, "Use", "领用"); + Use(30, "Use", "领用"), + ERROR(40, "ERROR", "异常操作"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java index 23cb9bf..167372a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java @@ -63,15 +63,15 @@ public class MesEquipmentTooling extends BaseBean implements Serializable { @ApiParam("更换结束时间") private String endTime; + @Column(name = "USE_COUNT_MAX") + @ApiParam("最大使用次数") + private Integer useCountMax; + @Column(name = "REMIND_COUNT") @ApiParam("提醒次数") private Integer remindCount; @Transient - @ApiParam("最大次数") - private Integer useCountMax; - - @Transient @ApiParam("按钮名称") private String btnName; From e578cb882a47e7e97111bc0b956e7e7abf9c746a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 21 May 2020 09:27:40 +0800 Subject: [PATCH 45/45] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BB=A3=E7=A0=81=E6=A8=A1=E7=B3=8A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index d7ad228..bcef8c7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -3144,7 +3144,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlBasImportTemplate(BasImportTemplate template) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result); - DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result); + DdlPreparedPack.getStringLikerPack(template.getTemplateCode(), "templateCode", result); DdlPreparedPack.getStringEqualPack(template.getGroupName(), "groupName", result); getStringBuilderPack(template, result); return result;