From 06551fdd66ac04a8444079411fc2e264f0bf3506 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 25 Mar 2020 18:04:10 +0800 Subject: [PATCH 1/9] =?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-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/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 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 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 4fa7c5a..1414885 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 e97c0bb..d790ef1 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 90e744d..c6141da 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 0ba3645..23e5bee 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-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 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 ffcac19..856da5f 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-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 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 62ebe64..82fdbe8 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 39d9423..b7b2dfc 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 e310bfd..ec9e100 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 92de049..0db7b7d 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 e36fcf7..bd09726 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 81fb02b..4c96781 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 1f622d9..2c24e41 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 bc41914..18c811c 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 93f9732..1171f4e 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 2ffb2ae..bca9cbb 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 bf427bbb31034a718bd50a9ea2b2f45c3196ae21 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 26 Mar 2020 16:08:05 +0800 Subject: [PATCH 2/9] =?UTF-8?q?bug7918=E3=80=907918=20=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=9C=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=90=8E=EF=BC=8C=E7=BC=BA=E5=B0=91=E4=B8=80=E8=A1=8C?= =?UTF-8?q?=E5=85=B3=E8=81=94=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=EF=BC=88=E6=9B=B4=E6=96=B0=E5=90=8E=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=89=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/WmsSnOperateRecord.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/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 8688652..468634a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -80,6 +80,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "ref_sn") @ApiParam(value = "关联二维码") - private String refSN; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String refSN; } From 1cf4943751cdc4b8fc25a37f92e32d38f1a0ada3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 26 Mar 2020 18:15:06 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 87a1750..4591fe3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,12 +5,12 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 - i3plus-pojo-andon + i3plus-pojo-aps jar @@ -18,6 +18,10 @@ i3plus.pojo i3plus-pojo-base + + org.hibernate.validator + hibernate-validator + From 5e2c592bbd5356485746f13829c446537551cfcb Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 26 Mar 2020 18:15:36 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E3=80=90IOT=E6=B5=8B=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 4591fe3..2bb8b09 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - i3plus-pojo-aps + i3plus-pojo-andon jar @@ -18,10 +18,6 @@ i3plus.pojo i3plus-pojo-base - - org.hibernate.validator - hibernate-validator - From d80b341620329dc83ff48146a7b144f027b3033f Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 27 Mar 2020 10:23:33 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=BF=98=E5=8E=9Ftest=20pom?= 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-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- .../i3plus/pojo/mes/model/StepDispatchModel.java | 5 +++- 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 | 34 +--------------------- 19 files changed, 22 insertions(+), 51 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index a616b12..f8fa98e 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-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 4591fe3..5ad51a1 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-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 0e3621b..e74f5ed 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-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 4d0a808..aa8f7a2 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-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 ecf48ed..7e87d1a 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-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 2241e93..062455e 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-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 c9fd4ee..a6258be 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-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 27731be..e958e79 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-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 2ba9ddd..d5ed765 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-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java index bf9d485..7585012 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java @@ -18,12 +18,15 @@ public class StepDispatchModel { private String cellParamKey; + private String requestBeanKey; + private String scanInfo; - public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String scanInfo) { + public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String scanInfo) { this.stepListKey = stepListKey; this.firstScanKey = firstScanKey; this.cellParamKey = cellParamKey; + this.requestBeanKey = requestBeanKey; this.scanInfo = scanInfo; } } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 3fd87ac..1c2fd71 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-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 c0524de..12f9ad0 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-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 4b73b1a..27e1b60 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-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 4ebc2f7..91d3fdd 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-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 b3c4fc8..756086b 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-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 b601666..770ace5 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-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 2d56516..c4dbbbe 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-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 4395f3c..6f974d5 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-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 96a06e4..37371d2 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -222,36 +222,4 @@ - - - dev - - DEV - - - true - - - - test - - TEST - - - - docker - - DOCKER - - - - prod - - PROD - - - - - ${project.artifactId}-${profileActive}-${project.version} - \ No newline at end of file From bcb8dee045544a7e3495a3c264dd9821e9c9b0f5 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 30 Mar 2020 10:48:02 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E3=80=901558=20=E7=94=9F=E4=BA=A7=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86-=E6=B3=B0=E5=9B=BD=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesContainer.java | 43 +++++++++++++++++ .../i3plus/pojo/mes/bean/MesContainerType.java | 55 ++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java new file mode 100644 index 0000000..12e6ad0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java @@ -0,0 +1,43 @@ +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; + +/** + * @Description : MES_容器 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-03-27 14:29 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTAINER") +@Api("MES_容器类型") +public class MesContainer extends BaseBean { + private static final long serialVersionUID = -3843389042411645111L; + + @Column(name = "CT_NO") + @ApiParam(value = "容器编号") + private String ctNo; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "USE_STATUS") + @ApiParam(value = "使用状态") + private String useStatus; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java new file mode 100644 index 0000000..b317f3c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.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 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 : MES_容器类型 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-03-27 14:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTAINER_TYPE") +@Api("MES_容器类型") +public class MesContainerType extends BaseBean { + + private static final long serialVersionUID = 2831600566482383573L; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_NAME") + @ApiParam(value = "容器类型名称") + private String ctName; + + @Column(name = "USE_LIMIT") + @ApiParam(value = "使用期限") + private Integer useLimit; + + @Column(name = "IS_RECYCLE") + @ApiParam(value = "是否回收") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + private Integer isRecycle; + + @Column(name = "LIMIT_UOM") + @ApiParam(value = "期限单位") + private String limitUom; +} From b12cb90c0da2c47bdd98069f5c005fd429978e73 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 30 Mar 2020 11:12:12 +0800 Subject: [PATCH 7/9] dev-pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 06660e0..c7523d4 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 75832427e87b5f8c5ebd2781b201e5764235f715 Mon Sep 17 00:00:00 2001 From: zcg Date: Mon, 30 Mar 2020 12:30:21 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E3=80=90task=201539=20=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E6=89=AB=E6=8F=8F-=E6=8C=89=E9=92=AE=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E6=90=AD=E5=BB=BA=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesWindowModule.java | 45 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesWindowModuleParam.java | 47 ++++++++++++++++++ .../pojo/mes/model/ButtonComponentReqModel.java | 55 ++++++++++++++++++++++ .../pojo/mes/model/ButtonComponentResultModel.java | 38 +++++++++++++++ .../estsh/i3plus/pojo/mes/model/ButtonModel.java | 28 +++++++++++ .../repository/MesWindowModuleParamRepository.java | 15 ++++++ .../mes/repository/MesWindowModuleRepository.java | 15 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 43 +++++++++++++++++ 8 files changed, 286 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleParamRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java new file mode 100644 index 0000000..f51864f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java @@ -0,0 +1,45 @@ +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 : zcg + * @Date : 2020/3/20 0020 - 16:21 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WINDOW_MODULE") +@Api("MES_界面组件配置") +public class MesWindowModule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -634938009999201410L; + + @Column(name = "WINDOW_NO") + @ApiParam("菜单编号") + private String windowNo; + + @Column(name = "MODULE_CODE") + @ApiParam("按钮组件代码") + private String moduleCode; + + @Column(name = "WINDOW_MODULE_BACK") + @ApiParam("回调界面方法") + private String windowModuleBack; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java new file mode 100644 index 0000000..4add812 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java @@ -0,0 +1,47 @@ +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 : zcg + * @Date : 2020/3/20 0020 - 16:25 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WINDOW_MODULE_PARAM") +@Api("MES_界面组件参数配置") +public class MesWindowModuleParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -5834883080240684524L; + + @Column(name = "WINDOW_NO") + @ApiParam("界面编号") + private String windowNo; + + @Column(name = "MODULE_CODE") + @ApiParam("组件代码") + private String moduleCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java new file mode 100644 index 0000000..46dcdbd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 工位扫描中，按钮组件之间传输的model + * @Reference : + * @Author : zcg + * @Date : 2020/3/23 0023 - 13:14 + */ +@Data +@Api("按钮组件传输请求Model") +public class ButtonComponentReqModel { + + @ApiParam("扫描信息") + private String scanInfo; + + @ApiParam("主队列编号") + private String orderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("确认码") + private String confirmNo; + + @ApiParam("组件代码") + private String moduleCode; + + @ApiParam("界面编号") + private String windowNo; + + @ApiParam("父界面编号") + private String parentWindowNo; + + @ApiParam("客户标识号") + private String custFlagNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java new file mode 100644 index 0000000..5553485 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/25 0025 - 19:41 + */ +@Data +@Api("按钮组件传输响应Model") +public class ButtonComponentResultModel { + + @ApiParam("成功信号") + private boolean isSuccess; + + @ApiParam("提示信息") + private String msg; + + @ApiParam("动态按钮组") + private List buttonModels; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("产品条码信息") + private MesProduceSn produceSn; + + @ApiParam("主队列编号") + private String orderNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonModel.java new file mode 100644 index 0000000..dc5d7a9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description : 按钮model + * @Reference : + * @Author : zcg + * @Date : 2020/3/25 0025 - 5:02 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("按钮组件") +public class ButtonModel { + @ApiParam("组件代码") + private String moduleCode; + + @ApiParam("组件名称") + private String moduleName; + + @ApiParam("界面回调方法") + private String windowModuleBack; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleParamRepository.java new file mode 100644 index 0000000..4392957 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleParamRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/20 0020 - 16:37 + */ +@Repository +public interface MesWindowModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleRepository.java new file mode 100644 index 0000000..c96dff8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWindowModule; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/20 0020 - 16:36 + */ +@Repository +public interface MesWindowModuleRepository 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 15b53e4..0fbed4b 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 @@ -2237,4 +2237,47 @@ public class MesHqlPack { } return packBean; } + + /** + * 界面组件配置 + * @param windowModule + * @param organizeCode + * @return + */ + public static DdlPackBean getMesWindowModule(MesWindowModule windowModule, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(windowModule, organizeCode); + if(!StringUtils.isEmpty(windowModule.getWindowNo())){ + DdlPreparedPack.getStringLikerPack(windowModule.getWindowNo(), "windowNo", packBean); + } + if(!StringUtils.isEmpty(windowModule.getModuleCode())){ + DdlPreparedPack.getStringLikerPack(windowModule.getModuleCode(), "moduleCode", packBean); + } + if(!StringUtils.isEmpty(windowModule.getWindowModuleBack())){ + DdlPreparedPack.getStringLikerPack(windowModule.getWindowModuleBack(), "windowModuleBack", packBean); + } + return packBean; + } + + /** + * 界面组件参数配置 + * @param windowModuleParam + * @param organizeCode + * @return + */ + public static DdlPackBean getMesWindowModuleParam(MesWindowModuleParam windowModuleParam, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(windowModuleParam, organizeCode); + if(!StringUtils.isEmpty(windowModuleParam.getWindowNo())){ + DdlPreparedPack.getStringLikerPack(windowModuleParam.getWindowNo(), "windowNo", packBean); + } + if(!StringUtils.isEmpty(windowModuleParam.getModuleCode())){ + DdlPreparedPack.getStringLikerPack(windowModuleParam.getModuleCode(), "moduleCode", packBean); + } + if(!StringUtils.isEmpty(windowModuleParam.getParamCode())){ + DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamCode(), "paramCode", packBean); + } + if(!StringUtils.isEmpty(windowModuleParam.getParamValue())){ + DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamValue(), "paramValue", packBean); + } + return packBean; + } } From 44696061eeabd78ff330cdc008aede293428cdf7 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 30 Mar 2020 13:48:36 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=BA=E6=9C=80=E6=96=B0?= 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 | 3 +- modules/i3plus-pojo-base/pom.xml | 4 +- modules/i3plus-pojo-form/pom.xml | 3 +- modules/i3plus-pojo-hardswitch/pom.xml | 4 +- modules/i3plus-pojo-jobflow/pom.xml | 4 +- modules/i3plus-pojo-lac/pom.xml | 3 +- modules/i3plus-pojo-mes-pcn/pom.xml | 3 +- modules/i3plus-pojo-mes/pom.xml | 3 +- .../i3plus/pojo/mes/bean/MesActionModuleGroup.java | 42 ++++++++++++ .../i3plus/pojo/mes/bean/MesProdRouteOptParam.java | 16 +++++ .../i3plus/pojo/mes/bean/MesRouteProcess.java | 4 ++ .../i3plus/pojo/mes/bean/MesSmRouteOptParam.java | 62 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesStateMachine.java | 48 ++++++++++++++ .../pojo/mes/bean/MesStateMachineStatus.java | 75 ++++++++++++++++++++++ modules/i3plus-pojo-model/pom.xml | 3 +- modules/i3plus-pojo-platform/pom.xml | 3 +- modules/i3plus-pojo-ptl/pom.xml | 3 +- modules/i3plus-pojo-report/pom.xml | 3 +- modules/i3plus-pojo-softswitch/pom.xml | 3 +- modules/i3plus-pojo-sweb/pom.xml | 3 +- modules/i3plus-pojo-wms/pom.xml | 3 +- modules/i3plus-pojo-workflow/pom.xml | 5 +- pom.xml | 34 +++++++++- 24 files changed, 318 insertions(+), 19 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 87a1750..a7393ab 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-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 5ad51a1..83da951 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e74f5ed..c39aa75 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-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index aa8f7a2..85be1d1 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-form jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 7e87d1a..b7d7acb 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,13 +5,15 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar + 1.0-${profileActive}-SNAPSHOT + dev diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 062455e..bee2e15 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,13 +5,15 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar + 1.0-${profileActive}-SNAPSHOT + dev diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index a6258be..598dbbc 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-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-lac jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e958e79..93bbef1 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index d5ed765..988d513 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java new file mode 100644 index 0000000..314f526 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java @@ -0,0 +1,42 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:28 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ACTION_MODULE_GROUP") +@Api("工步集") +public class MesActionModuleGroup extends BaseBean implements Serializable { + private static final long serialVersionUID = 1876053661752102998L; + + @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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index 074dea2..c0d1436 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -42,6 +42,18 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("工序代码") private String processCode; + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "AMG_ID") + @ApiParam("工步集代码") + private Long amgId; + @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; @@ -62,6 +74,10 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("工步参数值") private String paramValue; + @Column(name = "IS_ACTIVE") + @ApiParam("是否执行 1=是 2=否") + private Integer isActive; + @Transient @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java index fa6d9dd..70d3b44 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java @@ -54,6 +54,10 @@ public class MesRouteProcess extends BaseBean implements Serializable { @ApiParam("是否必须") private Integer isNecessary; + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + public int getSeqVal() { return this.seq == null ? 0 : this.seq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java new file mode 100644 index 0000000..521d413 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java @@ -0,0 +1,62 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:48 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SM_ROUTE_OPT_PARAM") +@Api("产品流程状态机配置操作参数表") +public class MesSmRouteOptParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -5466013923105175070L; + + @Column(name = "PROD_ROUTE_CFG_ID") + @ApiParam("产品流程Id") + private Integer prodRouteCfgId; + + @Column(name="ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name="PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name="STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name="STEP_SEQ") + @ApiParam("工步顺序") + private Integer stepSeq; + + @Column(name="PARAM_TYPE") + private Integer paramType; + + @Column(name="PARAM_CODE") + private String paramCode; + + @Column(name="PARAM_VALUE") + private String paramValue; + + @Column(name="IS_ACTION") + private Integer isAction; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java new file mode 100644 index 0000000..1672c91 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java @@ -0,0 +1,48 @@ +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:12 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STATE_MACHINE") +@Api("MES状态机") +public class MesStateMachine extends BaseBean implements Serializable { + private static final long serialVersionUID = 6093522587973076640L; + + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "SM_NAME") + @ApiParam("状态机名称") + private String smName; + + @Column(name = "SM_TYPE") + @ApiParam("状态机类型") + private String smType; + + @Lob + @Column(name = "POSITION") + @ApiParam("GOJS的位置") + private String position; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java new file mode 100644 index 0000000..90bcbf9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.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.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 Wynne.Lu + * @date 2020/3/30 11:12 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STATE_MACHINE_STATUS") +@Api("MES状态机步骤") +public class MesStateMachineStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = 6093522587973076640L; + + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "NEXT_STATUS") + @ApiParam("下一状态") + private String nextStatus; + + @Column(name = "STATUS_NAME") + @ApiParam("状态名称") + private String statusName; + + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型 10=内部触发 20=外部触发") + private Integer triggerType; + + @Column(name = "TRIGGER_EVENT") + @ApiParam("触发事件") + private String triggerEvent; + + @Column(name = "TRIGGER_WHERE") + @ApiParam("触发条件") + private String triggerWhere; + + @Column(name = "ACTION_AMG_ID") + @ApiParam("触发调用") + private Integer actionAmgId; + + @Column(name = "IN_AMG_ID") + @ApiParam("进入调用") + private Integer inAmgId; + + @Column(name = "OUT_AMG_ID") + @ApiParam("离开调用") + private Integer outAmgId; + + @Column(name = "STATUS_TYPE", columnDefinition = "tinyint default 0") + @ApiParam("状态类型 10=初始化状态") + private Integer statusType; +} diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 1c2fd71..da26f90 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 12f9ad0..ecb3a42 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-platform jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 27e1b60..ea09b06 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ptl jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 91d3fdd..52a69ad 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-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-report jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 756086b..a6b12c3 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 770ace5..f3452f8 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-sweb jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index c4dbbbe..9b39050 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-wms jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 6f974d5..2e098d8 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,13 +5,16 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar + 1.0-${profileActive}-SNAPSHOT + + dev diff --git a/pom.xml b/pom.xml index 37371d2..8b348a9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -221,5 +221,37 @@ + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file