From 2cc43af4313d9ebc77c794fe3d8b9e25e3a5b961 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Apr 2020 20:30:28 +0800 Subject: [PATCH 01/32] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpom=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-base/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 8f44402..8debbf6 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-base jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 5bfdd66..e0d305b 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-PROD-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 06ec837..4f24980 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-mes-pcn 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 6ae777d..b5c2cd3 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-model jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index cb6c1ce..788be96 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-softswitch jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT From a1eb3c3bc2d412a6d374330cab864057fa7b38e4 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Apr 2020 20:56:23 +0800 Subject: [PATCH 02/32] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpom=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 | 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 | 4 ++-- 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 +- sonar-project.properties | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..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-PROD-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 0cf8b6d..3d6cbc0 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-PROD-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 8f44402..96472ad 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-PROD-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 0bfac69..3937425 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-PROD-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 b7991cc..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-PROD-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 91f8894..8b15a31 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-PROD-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 3b9e57a..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-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 06ec837..f9957c9 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-PROD-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 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 6ae777d..846c302 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-PROD-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 8767603..23f68bd 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-PROD-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 977c14a..28cf55f 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-PROD-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 dc4ea86..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-PROD-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 cb6c1ce..1b72275 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-PROD-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 3930e69..910d630 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-PROD-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 284329f..e5b4e5c 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-PROD-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 8bc1aa2..0ecf190 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index c4793b9..fbbe86f 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 37922cab29e0d6244fd72ff7a5d0a5db1f7818ae Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 24 Apr 2020 13:42:28 +0800 Subject: [PATCH 03/32] =?UTF-8?q?POM=20=E6=96=87=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20Merge=20remote-tracking=20branch=20'remotes/origin/?= =?UTF-8?q?test'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # modules/i3plus-icloud-report/pom.xml --- 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 | 4 ++-- 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, 19 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 3d6cbc0..0cf8b6d 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index faafb0b..8debbf6 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 3937425..0bfac69 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..b7991cc 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 8b15a31..91f8894 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..3b9e57a 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-PROD-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 cb73a5c..4f24980 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 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 a70170d..b5c2cd3 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 23f68bd..8767603 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 28cf55f..977c14a 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..dc4ea86 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index c8f1cbc..788be96 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 910d630..3930e69 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index e5b4e5c..284329f 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0ecf190..8bc1aa2 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 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 64daf3641002433cb58647f67ee248401b3bd343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 24 Apr 2020 13:54:59 +0800 Subject: [PATCH 04/32] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=BC=80=E7=AA=97=E5=A4=84=E7=90=86,BUG:8097?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index a2420d6..6506c66 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -82,8 +82,8 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", + listColumnName = "name", explicitColumnName = "name") public String createUser; @Indexed(direction = IndexDirection.DESCENDING) @@ -95,8 +95,8 @@ public abstract class BaseBean implements Serializable { @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", + listColumnName = "name", explicitColumnName = "name") public String modifyUser; @Column(name="MODIFY_DATE_TIME") From d5f69eeefd2e12411163f94e922496a595451992 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sat, 25 Apr 2020 11:22:51 +0800 Subject: [PATCH 05/32] =?UTF-8?q?task=201565=20=E5=8F=91=E8=BF=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 --- 2 files changed, 2 insertions(+), 5 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 b7d0c56..900dbb7 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 @@ -3277,7 +3277,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SHIPPING_ACTUAL_STATUS { CREATE(10, "创建"), - CANCEL(20, "已发运"); + SHIPPED(20, "已发运"); private int value; private String description; @@ -3338,7 +3338,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FSM_STATE_TYPE { BEGIN(10, "begin", "开始状态点"), - END(20, "end", "结束状态点"); + END(40, "end", "结束状态点"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 7bd7307..78826ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -132,9 +132,6 @@ public class StationRequestBean implements Serializable { @ApiParam("客户工厂代码") private String customerFactoryCode; - @ApiParam("发运命令") - private String shippingCmd; - @Override public String toString() { return "StationRequestBean{" + From a8ae48b1328b48ec4aabc6bb8d4910c22a061200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 26 Apr 2020 10:38:52 +0800 Subject: [PATCH 06/32] =?UTF-8?q?=E3=80=907937=20=E5=8D=8A=E6=88=90?= =?UTF-8?q?=E5=93=81=E7=AE=B1=E6=9D=A1=E7=A0=81=E7=BB=91=E5=AE=9A=E5=B7=A5?= =?UTF-8?q?=E6=AD=A5-=E6=95=B0=E6=8D=AE=E5=86=99=E5=85=A5=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=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/pcn/bean/IfPackageDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java index 5e7684b..651f8dc 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java @@ -93,4 +93,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; } From ff6e5ac92657ccbffebe70069cffae4d700721ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 26 Apr 2020 15:20:46 +0800 Subject: [PATCH 07/32] =?UTF-8?q?=E3=80=908239=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A-=E5=8D=95=E4=BA=A7=E5=93=81=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=EF=BC=88=E6=95=B0=E6=8D=AE=E5=86=99=E5=85=A5=E6=9C=89?= =?UTF-8?q?=E8=AF=AF=EF=BC=89=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/IfPackageDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index d08568e..0549d1f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -93,4 +93,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; } From f414274aeb3fdbb40b211c542c74ed0a89106b89 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 26 Apr 2020 15:31:12 +0800 Subject: [PATCH 08/32] =?UTF-8?q?=E4=BE=9B=E8=B4=A7=E8=BF=BD=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index ebf9603..b077ae5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -41,6 +41,10 @@ public class BasVendor extends BaseBean{ @ApiParam("供应商全称") private String vendorDesc; + @Column(name = "USER_NAME") + @ApiParam("用户名") + private String userName; + @Column(name="VENDOR_ADDR") @ApiParam("供应商地址") private String vendorAddr; @@ -57,10 +61,6 @@ public class BasVendor extends BaseBean{ @ApiParam(value = "是否发ASN", example = "0") private Integer isAsn; - @Column(name = "USER_NAME") - @ApiParam(value = "用户名") - private String userName; - @Column(name = "PASSWORD") @ApiParam(value = "密码") private String password; From de7d007ef1ca974e424ef91ca6e19384daf9152a Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 27 Apr 2020 14:27:34 +0800 Subject: [PATCH 09/32] =?UTF-8?q?[=E8=8E=B7=E5=8F=96=E5=B7=A5=E6=AD=A5sql?= =?UTF-8?q?=20server=E5=88=86=E7=BB=84=E5=87=BD=E6=95=B0=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java index 4a8aec6..a4b29ec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java @@ -43,6 +43,13 @@ public class ButtonDynamicModel { this.buttonName = buttonName; } + + public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode){ + this.buttonCode = buttonCode; + this.buttonName = buttonName; + this.paramCode = paramCode; + } + public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){ this.id = id; this.buttonCode = buttonCode; From fb15536a347bf512fc8bc0ef07cf9f15f7a57c24 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 28 Apr 2020 10:22:29 +0800 Subject: [PATCH 10/32] =?UTF-8?q?=E3=80=908254=20=E4=B8=AD=E8=88=AA-?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95-=E5=AE=A2=E6=88=B7=E5=8F=91?= =?UTF-8?q?=E8=BF=90-=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5=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/WmsDocSoDetails.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java index 20e8f31..32ce767 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 销售订单明细表 @@ -67,4 +68,8 @@ public class WmsDocSoDetails extends BaseBean { @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; + + @Transient + @ApiParam(value = "客户编号") + private String custCode; } From a575b4eed4e3bbdd181779b74babe779b8d05e4f Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 28 Apr 2020 13:17:12 +0800 Subject: [PATCH 11/32] bug:8287;8288;8290 --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 57e81fc..ce953ae 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 @@ -5720,8 +5720,7 @@ public class WmsEnumUtil { public enum DOCK_ORDER_STATUS { WAIT_SEND(10, "待送货"), ARRIVED(20, "已到达"), - RECEIVED(30, "已收货"), - CANCELED(40, "已取消"); + CANCELED(30, "已取消"); private int value; private String description; From 97d7fdbf24140a312d5a0fea0cacd5fe7586b485 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 28 Apr 2020 13:44:05 +0800 Subject: [PATCH 12/32] =?UTF-8?q?=E3=80=908181=2020011--=20=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=89=93=E5=8D=B0=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=89=93=E5=8D=B0=E7=BB=84=E5=8F=B7=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E7=94=A8=E4=BA=8E=E7=8E=B0=E5=9C=BA=E6=AF=8D?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=B8=A2=E5=A4=B1=E6=88=96=E8=80=85=E6=8D=9F?= =?UTF-8?q?=E5=9D=8F=E7=9A=84=E5=9C=BA=E6=99=AF=E6=9D=A5=E8=A1=A5=E6=89=93?= =?UTF-8?q?=E6=AF=8D=E6=9D=A1=E7=A0=81=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 | 3 ++- 1 file changed, 2 insertions(+), 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 9b21eb1..cbe0f2c 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 @@ -1663,7 +1663,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); From 32f6215be7340264ef745ca9ebc502886f5b31b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 28 Apr 2020 19:12:30 +0800 Subject: [PATCH 13/32] =?UTF-8?q?=E3=80=908309=20=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E9=85=8D=E6=96=B9=E5=AF=BC=E5=85=A5-=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java | 4 ++++ .../estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java | 17 +++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) 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 0bc3879..48a7682 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 @@ -91,6 +91,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @Transient private List childQcList; + @Transient + @ApiParam("备注") + private String memo; + public MesQcCheckStandard() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java index d7ca7a5..9fce24b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java @@ -16,23 +16,28 @@ import lombok.Data; @Api(value="生产工单导入",description = "生产工单导入") public class MesWorkOrderModel { - @ApiParam("工单号") + //工单号 + @ApiParam("OrderCode") @AnnoOutputColumn private String orderNo; - @ApiParam("物料号") + //物料号 + @ApiParam("ItemCode") @AnnoOutputColumn private String partNo; - @ApiParam("客户产线代码") + //客户产线代码 + @ApiParam("ProductionLineID") @AnnoOutputColumn - private String custProdLineCode; + private String workCenterCode; - @ApiParam("数量") + //数量 + @ApiParam("DemandQty") @AnnoOutputColumn private Double qty; - @ApiParam("开始时间") + //开始时间 + @ApiParam("ProductDate") @AnnoOutputColumn private String startTime; From 90edd435e3b27d01a65bba54ec84b8eb74c9788b Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 29 Apr 2020 11:50:33 +0800 Subject: [PATCH 14/32] bug:8293;8297 --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ce953ae..d55adea 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 @@ -5720,7 +5720,7 @@ public class WmsEnumUtil { public enum DOCK_ORDER_STATUS { WAIT_SEND(10, "待送货"), ARRIVED(20, "已到达"), - CANCELED(30, "已取消"); + CANCELED(40, "已取消"); private int value; private String description; From ae156ad82fc216fff93557e183e22d53621631ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 29 Apr 2020 14:57:38 +0800 Subject: [PATCH 15/32] =?UTF-8?q?=E3=80=90=E5=8A=A8=E6=80=81=E6=8C=89?= =?UTF-8?q?=E9=92=AE--=E5=AE=8C=E6=88=90=E6=8C=89=E9=92=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9mes=E5=92=8Cmespcn=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/MesWorkOrder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 6a70107..f244016 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -260,6 +260,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("计划类型") private Integer planType; + @Transient + @ApiParam(value = "完成按钮编号") + public String comButtonCode; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 32460a3272aa4ac76fef70a5ff5127b1a48e4e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 29 Apr 2020 15:07:54 +0800 Subject: [PATCH 16/32] =?UTF-8?q?sqlserver=20=E9=80=82=E9=85=8D=E5=A4=84?= =?UTF-8?q?=E7=90=86=EF=BC=8Cin=20=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 839d22a..8e68d4d 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 @@ -53,6 +53,21 @@ public class CoreHqlPack { return result.toString(); } + + /** + * In 参数封装 + * @param columnName + * @return + */ + public static DdlPackBean packHqlInStr(String columnName, String[] params){ + DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean); + DdlPreparedPack.getInPack(params, columnName, ddlPackBean); + return ddlPackBean; + } + + /** * 资源查询 * @param resource From 6e2344b30342e4c3c480aacd3579895c027fb761 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 29 Apr 2020 15:25:29 +0800 Subject: [PATCH 17/32] bug:8330 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java index b7e6d03..e2ff9c2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java @@ -72,6 +72,10 @@ public class WmsDockOrderInfo extends BaseBean { private String orderNo; @Transient + @ApiParam("驾驶员编码") + private String driverNo; + + @Transient @ApiParam("库位代码") private Integer masterStatus; } From f03e11956118778f5761e5785b90f157295628ad Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 29 Apr 2020 16:37:19 +0800 Subject: [PATCH 18/32] bug:8268;8267;8266;8265 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 9 ++- .../estsh/i3plus/pojo/wms/bean/WmsCustWindow.java | 10 +++ .../pojo/wms/bean/WmsDocMovementDetails.java | 7 ++- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 +++ .../estsh/i3plus/pojo/wms/dto/AssignmentDto.java | 72 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java | 3 + .../pojo/wms/dto/WmsSupplierExtensionDto.java | 6 +- 7 files changed, 110 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java 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 8bc0ba9..870d120 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 @@ -715,8 +715,8 @@ public class WmsEnumUtil { PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), - EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"); - + EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), + LOADING_ORDER(530, "LOADING_ORDER", "装车单"); private int value; private String code; private String description; @@ -3567,7 +3567,10 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_STOCK_TYPE { - SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码"); + SOURCE(10, "实物条码"), + TARGET(20, "虚拟条码"), + CUST_SN(30, "客户条码"), + FIRST_MIDDLE_LAST(40, "首中末件"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java index f250b58..90d32ae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java @@ -47,4 +47,14 @@ public class WmsCustWindow extends BaseBean { @Column(name = "DELAY_HOUR") @ApiParam(value = "容差") private Integer delayHour; + + public WmsCustWindow(WmsCustWindow custWindow) { + this.custNo = custWindow.getCustNo(); + this.custWindowTime = custWindow.getCustWindowTime(); + this.weeks = custWindow.getWeeks(); + this.delayHour = custWindow.getDelayHour(); + } + + public WmsCustWindow() { + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 574361d..5398ffd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; @@ -359,4 +358,10 @@ public class WmsDocMovementDetails extends BaseBean { this.modifyDatetime = modifyDatetime; } + + public WmsDocMovementDetails(WmsPOMasterDetails poMasterDetails) { + this.orderNo = poMasterDetails.getOrderNo(); + this.planDate = poMasterDetails.getPlanDate(); + this.planTime = poMasterDetails.getPlanTime(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 3fe234b..9b74c53 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -217,4 +217,12 @@ public class WmsDocMovementMaster extends BaseBean { public int getBusiTypeVal() { return this.busiType == null ? 0 : this.busiType; } + + public WmsDocMovementMaster(WmsPOMaster wmsPoMaster) { + this.orderNo = wmsPoMaster.getOrderNo(); + this.vendorNo = wmsPoMaster.getVendorNo(); + } + + public WmsDocMovementMaster() { + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java new file mode 100644 index 0000000..45776dc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description : 发运计划任务跟踪 + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-27 4:37 下午 + * @Modify: + **/ +@Data +@Entity +public class AssignmentDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @ApiParam(value = "主键", example = "0") + public Long id; + + @ApiParam(value = "单号") + private String orderNo; + + @ApiParam(value = "时间") + private String createDatetime; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件号名称") + private String partNameRdd; + + @ApiParam(value = "源存储区") + private String srcZoneNo; + + @ApiParam(value = "客户编码") + private String custNo; + + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + + @ApiParam(value = "状态中文描述", example = "1") + private String itemStatusStr; + + @ApiParam(value = "出库数量") + private Double outQty; + + public AssignmentDto(String orderNo, String createDatetime, String partNameRdd, + String srcZoneNo, String custNo, Integer itemStatus, Double outQty, String partNo) { + this.orderNo = orderNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.srcZoneNo = srcZoneNo; + this.custNo = custNo; + this.itemStatus = itemStatus; + this.outQty = outQty; + this.partNo = partNo; + } + + public AssignmentDto() { + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java index ffaf492..9f03900 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java @@ -72,4 +72,7 @@ public class WmsStockSnDto { this.partSpec = partSpec; this.zoneNo = zoneNo; } + + public WmsStockSnDto() { + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java index 680c401..a1db922 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java @@ -21,6 +21,9 @@ public class WmsSupplierExtensionDto { @ApiParam(value = "供应商编号") private String vendorNo; + @ApiParam(value = "供应商编号") + private String vendorName; + @ApiParam(value = "数量") private Integer num; @@ -28,8 +31,9 @@ public class WmsSupplierExtensionDto { } - public WmsSupplierExtensionDto(String vendorNo, Integer num) { + public WmsSupplierExtensionDto(String vendorNo, Integer num, String vendorName) { this.vendorNo = vendorNo; this.num = num; + this.vendorName = vendorName; } } From e5e41f09e7eec67a2be528e46cfa97431f962fbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 29 Apr 2020 16:44:12 +0800 Subject: [PATCH 19/32] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=A3=E4=BB=B6?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 24 ++++++++++++++++++++++ 1 file changed, 24 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 0e1510d..f429143 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 @@ -2495,6 +2495,30 @@ public class MesHqlPack { return packBean; } + /** + * 散件产品组配置 + * + * @param mesProdScatterDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesScatterDetail(MesProdScatterDetail mesProdScatterDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdScatterDetail, organizeCode); + if (!StringUtils.isEmpty(mesProdScatterDetail.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesProdScatterDetail.getPartName())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartName(), "partName", packBean); + } + if (!StringUtils.isEmpty(mesProdScatterDetail.getProduceCtgyCode())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + if (!StringUtils.isEmpty(mesProdScatterDetail.getSpCfgCode())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getSpCfgCode(), "spCfgCode", packBean); + } + return packBean; + } + public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) { DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean); From e63601716fa03490c5b6fcf20e1b2950d64aa119 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Wed, 29 Apr 2020 16:51:33 +0800 Subject: [PATCH 20/32] =?UTF-8?q?1736-MES=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 69 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java | 61 +++++++++++++++++++ .../estsh/i3plus/pojo/mes/model/FilterGroup.java | 11 ++++ .../cn/estsh/i3plus/pojo/mes/model/FilterRule.java | 10 ++++ .../i3plus/pojo/mes/model/FilterRuleAndOr.java | 11 ++++ .../i3plus/pojo/mes/model/PojoFieldModel.java | 48 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/model/PojoModel.java | 38 ++++++++++++ .../pojo/mes/repository/MesDataAuthRepository.java | 17 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 11 ++++ 9 files changed, 276 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoFieldModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataAuthRepository.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 686e6eb..5088598 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 @@ -11,6 +11,75 @@ import com.fasterxml.jackson.annotation.JsonFormat; **/ public class MesEnumUtil { + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HQL_EXPRESSION { + GT(10,">","大于"), + LT(20,"<","小于"), + EQ(30,"=","等于"), + NEQ(40,"!=","不等于"), + GTE(50,">=","大于等于"), + LTE(60,"<=","小于等于"), + LIKE(70,"like","LIKE"), + IN(80,"in","包含"); + + private int value; + private String code; + private String description; + + HQL_EXPRESSION(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 codeOf(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 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/MesDataAuth.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java new file mode 100644 index 0000000..10f8597 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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; +import java.util.List; + +/** + * @Description :数据权限 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-26 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DATA_AUTH") +@Api("数据权限") +public class MesDataAuth extends BaseBean implements Serializable { + private static final long serialVersionUID = -8665559475167190408L; + @Column(name = "ROLE_ID") + @ApiParam("角色编号") + private Long roleId; + + @Column(name = "ROLE_NAME") + @ApiParam("角色名称") + private String roleName; + + @Column(name = "DATA_OBJECT") + @ApiParam("数据对象") + private String dataObject; + + @Column(name = "DATA_OBJECT_NAME") + @ApiParam("数据对象名称") + private String dataObjectName; + + @Column(name = "FILTER_RULE", columnDefinition = "TEXT") + @ApiParam("过滤规则") + private String filterRule; + + public long getRoleIdVal() { + return this.roleId == null ? 0 : this.roleId.longValue(); + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java new file mode 100644 index 0000000..a262480 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.util.List; + +@Data +public class FilterGroup { + private String andOr; + private List groups; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java new file mode 100644 index 0000000..0d91df9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +@Data +public class FilterRule { + private String filed; + private String op; + private String value; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java new file mode 100644 index 0000000..1991cfd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.util.List; + +@Data +public class FilterRuleAndOr { + private String andOr; + private List rules; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoFieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoFieldModel.java new file mode 100644 index 0000000..21671e7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoFieldModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : PojoField模型 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2020-04-28 + * @Modify: + * @Modify: + **/ +@Data +public class PojoFieldModel implements Serializable { + private static final long serialVersionUID = 6761788924707802928L; + + @ApiParam(value ="属性名") + private String fieldName; + + @ApiParam(value ="属性类型") + private String fieldType; + + @ApiParam(value ="属性描述") + private String fieldDesc; + + @ApiParam(value ="字段名称") + private String fieldColumnName; + + @ApiParam(value = "数据来源") + private String dataSrc; + + @ApiParam(value = "开窗列表显示列名称") + private String listColumnName; + + @ApiParam(value = "开窗搜索列名称") + private String searchColumnName; + + @ApiParam(value = "回显列名") + private String explicitColumnName; + + @ApiParam(value = "下拉框规则") + private Integer selectRule; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoModel.java new file mode 100644 index 0000000..230c8a2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Pojo模型 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2020-04-28 + * @Modify: + **/ +@Data +public class PojoModel implements Serializable { + private static final long serialVersionUID = -3617516560880011259L; + @ApiParam(value ="包名") + private String packageName; + + @ApiParam(value ="POJO类名") + private String simpleName; + + @ApiParam(value ="POJO类全名") + private String fullName; + + @ApiParam(value ="表名称名") + private String tableName; + + @ApiParam(value ="POJO类描述") + private String pojoDesc; + + @ApiParam(value ="属性集合") + private List fieldList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataAuthRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataAuthRepository.java new file mode 100644 index 0000000..73d98eb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataAuthRepository.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.MesBom; +import cn.estsh.i3plus.pojo.mes.bean.MesDataAuth; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesDataAuthRepository 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 0e1510d..51701ae 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 @@ -2625,4 +2625,15 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + if (!StringUtils.isEmpty(dataAuth.getDataObject())) { + DdlPreparedPack.getStringLikerPack(dataAuth.getDataObject(), "dataObject", packBean); + } + if (dataAuth.getRoleIdVal() > 0) { + DdlPreparedPack.getNumEqualPack(dataAuth.getRoleIdVal(), "roleId", packBean); + } + return packBean; + } } From fdaa4c174050d857b5990948dd01c4d4611ca869 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 29 Apr 2020 17:12:10 +0800 Subject: [PATCH 21/32] bug:8268;8267;8266;8265 --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 7 ++----- 1 file changed, 2 insertions(+), 5 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 870d120..06d2317 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 @@ -3567,10 +3567,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_STOCK_TYPE { - SOURCE(10, "实物条码"), - TARGET(20, "虚拟条码"), - CUST_SN(30, "客户条码"), - FIRST_MIDDLE_LAST(40, "首中末件"); + SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码"); private int value; private String description; @@ -5723,6 +5720,7 @@ public class WmsEnumUtil { public enum DOCK_ORDER_STATUS { WAIT_SEND(10, "待送货"), ARRIVED(20, "已到达"), + RECEIVED(30, "已收货"), CANCELED(40, "已取消"); private int value; @@ -6612,5 +6610,4 @@ public class WmsEnumUtil { return valueOf(val); } } - } From dd706887544ec0600aa5b088c8faa37c4ffab794 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 29 Apr 2020 20:21:41 +0800 Subject: [PATCH 22/32] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=84=9A=E6=9C=ACWebSo?= =?UTF-8?q?cket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/ScriptLoggerModel.java | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java new file mode 100644 index 0000000..4e90509 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.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-04-29 + * @Modify: + **/ +@Data +@Api("插件日志") +public class ScriptLoggerModel { + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("用户编号") + private String userCode; + + @ApiParam("脚本编号") + private String scriptNo; + + @ApiParam("日志内容") + private String context; + + @ApiParam("日志打印日期") + private String printDate; +} From f38a47cc6856ef84a86cc2e49d0f94526779c5bc Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 29 Apr 2020 23:03:50 +0800 Subject: [PATCH 23/32] =?UTF-8?q?[oee=20=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 143 ++++++++++++++++++--- .../java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 14 ++ .../i3plus/pojo/mes/bean/MesOffLineRecord.java | 31 +++++ .../pojo/mes/bean/MesOperateObjectAttribute.java | 9 ++ 4 files changed, 176 insertions(+), 21 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 37a9a56..1eda477 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 @@ -5320,20 +5320,20 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum VALUE_TYPE { - MANUAL_ASSIGNMENT(10, "手工赋值"), - SPEL_EXPRESSION(20, "spel表达式"), - FUNCTION_ASSIGNMENT(30, "函数赋值"), - JOB_ASSIGNMENT(40, "job赋值"); + MANUAL_ASSIGNMENT("10", "手工赋值"), + SPEL_EXPRESSION("20", "spel表达式"), + FUNCTION_ASSIGNMENT("30", "函数赋值"), + JOB_ASSIGNMENT("40", "job赋值"); - private int value; + private String value; private String description; - VALUE_TYPE(int value, String description) { + VALUE_TYPE(String value, String description) { this.value = value; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -5341,10 +5341,19 @@ public class MesEnumUtil { return description; } - public static String valueOfDescription(int val) { + public static VALUE_TYPE getByValue(String value) { + for (VALUE_TYPE valueType : values()) { + if (valueType.getValue().equals(value)) { + return valueType; + } + } + return null; + } + + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -5353,24 +5362,24 @@ public class MesEnumUtil { } /** - * 运算对象 运算类型 + * 运算对象 对象代码 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OBJECT_CODE { - ORGANIZE_OEE(10, "工厂OEE"), - WORK_CENTER_OEE(20, "产线OEE"), - WORK_CELL_CEE(30, "工位OEE"), - EQU_OEE(40, "设备OEE"); + ORGANIZE_OEE("10", "工厂OEE"), + WORK_CENTER_OEE("20", "产线OEE"), + WORK_CELL_CEE("30", "工位OEE"), + EQU_OEE("40", "设备OEE"); - private int value; + private String value; private String description; - OBJECT_CODE(int value, String description) { + OBJECT_CODE(String value, String description) { this.value = value; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -5378,10 +5387,19 @@ public class MesEnumUtil { return description; } + public static OBJECT_CODE getByValue(String value) { + for (OBJECT_CODE objectCode : values()) { + if (objectCode.getValue().equals(value)) { + return objectCode; + } + } + return null; + } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -5394,9 +5412,9 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SCRIPT_TYPE { - ORGANIZE_OEE(10, "组件"), - WORK_CENTER_OEE(20, "表单"), - WORK_CELL_CEE(30, "报表"), + ASSEMBLY(10, "组件"), + FORM(20, "表单"), + REPORT_FORM(30, "报表"), JOB(40, "JOB"), OTHER(50, "其他"); @@ -5465,4 +5483,87 @@ public class MesEnumUtil { } } + + + /** + * 运算对象代码 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPERATE_OBJECT_CODE { + ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"), + ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"), + WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"), + EQU_OEE_DAY("EQU_OEE_Day", "设备OEE(天)"); + + private String value; + private String description; + + OPERATE_OBJECT_CODE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static OPERATE_OBJECT_CODE getByValue(String value) { + for (OPERATE_OBJECT_CODE objectCode : values()) { + if (objectCode.getValue().equals(value)) { + return objectCode; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * oee 运算状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OEE_STATUS { + STAY_OPERATE(10, "待运算"), + ALREADY_OPERATE(20, "已运算"); + + private int value; + private String description; + + OEE_STATUS(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/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index 81b3951..2a3b94c 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 @@ -11,7 +11,9 @@ 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; +import java.util.List; /** * @Description: @@ -109,4 +111,16 @@ public class MesOee extends BaseBean implements Serializable { @Column(name = "BUSI_DATA") @ApiParam("自定义数据") private String busiData; + + @Transient + @ApiParam("开始日期") + private String oeeDateStart; + + @Transient + @ApiParam("结束日期") + private String oeeDateEnd; + + @Transient + @ApiParam("自定义数据map") + private List operateObjectAttributes; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java index 46fe2ed..6c668db 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.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; /** @@ -65,4 +66,34 @@ public class MesOffLineRecord extends BaseBean implements Serializable { @Column(name = "OFF_LINE_TIME") @ApiParam("下线时间") private String offLineTime; + + /*************冗余字段****************/ + + @Transient + @ApiParam("设备代码") + private String equCode; + + @Transient + @ApiParam("运算对象代码") + private String objectCode; + + @Transient + @ApiParam("日期") + private String oeeDate; + + @Transient + @ApiParam("开始时段") + private String startTime; + + @Transient + @ApiParam("结束时段") + private String endTime; + + @Transient + @ApiParam("一次合格数") + private Integer qualifiedQty; + + @Transient + @ApiParam("总生产数") + private Integer totalQty; } 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 56649b6..e05a54e 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 @@ -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; /** @@ -45,4 +46,12 @@ public class MesOperateObjectAttribute extends BaseBean implements Serializable @Column(name = "OPERATE_TYPE") @ApiParam("运算类型") private Integer operateType; + + @Transient + @ApiParam("属性值") + private String attributeValue; + + @Transient + @ApiParam("是否自定义属性") + private boolean customAttribute = false; } From 888d87f12e7d892d6b4eeeb9efd56b99ab4f7eaa Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 30 Apr 2020 09:25:53 +0800 Subject: [PATCH 24/32] task edi --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++ .../cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java | 42 ++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.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 e126301..614b6b5 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 @@ -430,6 +430,9 @@ public class MesEnumUtil { NEVER(-1, "不过期"), ONE_HOUR(3600, "一小时"), + HALF_HOUR(1800, "半小时"), + ONE_QUARTER(900, "一刻钟"), + TEN_MIN(300, "十分钟"), ONE_MIN(60, "一分钟"); private int value; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java new file mode 100644 index 0000000..f21e756 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.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/4/28 21:30 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EDI_DATA") +@Api("EDI数据") +public class MesEdiData extends BaseBean implements Serializable { + private static final long serialVersionUID = 4671561947551462256L; + + @Column(name = "HOST") + @ApiParam("edi电脑名") + private String host; + + @Column(name = "DATA") + @ApiParam("数据") + private String data; + + @Column(name = "CONFIG") + @ApiParam("edi配置") + private String config; +} From 2b85a056455cb2db14747c2df6d1269f27d6527d Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 30 Apr 2020 09:41:58 +0800 Subject: [PATCH 25/32] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=84=9A=E6=9C=ACWebSo?= =?UTF-8?q?cket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/EngineScriptPersistenceHistory.java | 63 ++++++++++++++++++++++ .../EngineScriptPersistenceHistoryRepository.java | 9 ++++ 2 files changed, 72 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java 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/engine/script/EngineScriptPersistenceHistory.java new file mode 100644 index 0000000..edefeab --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.wms.engine.script; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +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.Transient; + +/** + * 脚本持久化历史记录 + * + * @author jason.niu + * @since 2020-04-29 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "SCRIPT_PERSISTENCE_HISTORY") +@Api("系统动态脚本") +public class EngineScriptPersistenceHistory extends BaseBean { + + // 脚本调用的唯一编号，例如：WMS_PDA_0001 + @Column(name = "SCRIPT_NO", length = 50) + private String scriptNo; + + // 脚本的中文名称 + @Column(name = "SCRIPT_NAME", length = 50) + private String scriptName; + + // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 + @Column(name = "SCRIPT_TYPE") + private Integer scriptType; + + // 脚本编写的语言 + // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby + @Column(name = "LANGUAGE_TYPE") + private Integer languageType; + + // 脚本的具体内容 + @Lob + @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + private String scriptContent; + + // 脚本的描述，包含脚本的用法，参数说明等 + @Column(name = "SCRIPT_REMARK", length = 2000) + private String scriptRemark; + + // 编译后的脚本内容，通过预编译加快脚本的运行速度 + @Transient + private Object compiledScript; + +} 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 new file mode 100644 index 0000000..52818f2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java @@ -0,0 +1,9 @@ +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 org.springframework.stereotype.Repository; + +@Repository +public interface EngineScriptPersistenceHistoryRepository extends BaseRepository { +} From c5d4cd7dad4b5abce0de6760449ea4cd055b9bd0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 30 Apr 2020 10:10:41 +0800 Subject: [PATCH 26/32] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=BC=96=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/ExcelDataParamModel.java | 181 +++++++++++++++++++++ .../pojo/mes/model/ProdPlanBatchCompileModel.java | 51 +++++- 2 files changed, 229 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java new file mode 100644 index 0000000..f9eeea2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java @@ -0,0 +1,181 @@ +//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; +//import org.apache.poi.ss.usermodel.CellStyle; +//import org.springframework.util.StringUtils; +// +//import java.io.Serializable; +//import java.math.BigDecimal; +// +///** +// * @Author: wangjie +// * @CreateDate: 2019/8/21 9:19 AM +// * @Description: +// **/ +//@Data +//@NoArgsConstructor +//@AllArgsConstructor +//@Api("EXCEL参数model") +//public class ExcelDataParamModel implements Serializable { +// +// public ExcelDataParamModel(Class clazz){ +// this.clazz = clazz; +// } +// +// @ApiParam("获取相对应的类，用来映射数据,如果不设置此值，那么整个数据将会用String[]作为数据，不再通过映射拿取数据") +// private Class clazz; +// +// @ApiParam("对应类的映射字段名，String类型") +// private String[] strField; +// +// @ApiParam("对应类的标题，需要一一对应") +// private String[] titleStr; +// +// @ApiParam("大标题") +// private String title; +// +// @ApiParam("文件名，如果传入的ExcelDataParamModel是一个List的时候，以sheetNo = 1为文件名，如果sheetNo为空，则默认随机") +// private String fileName; +// +// @ApiParam("后缀") +// private String sufix; +// +// @ApiParam("大标题样式") +// private CellStyle bigTitleCellStyle; +// +// @ApiParam("标题样式") +// private CellStyle titleCellStyle; +// +// @ApiParam("数据样式") +// private CellStyle cellStyle; +// +// @ApiParam("sheet名") +// private String sheetName; +// +// @ApiParam("每个格子的宽度") +// private BigDecimal[] cellWidth; +// +// @ApiParam("如果传入的ExcelDataParamModel是List的时候，默认以sheetNo排序") +// private Integer sheetNo; +// +// @ApiParam("导出数据转换器") +// private QueryDataInterface queryDataInterface; +// +// public Class getClazz() { +// return clazz; +// } +// +// public String[] getStrField() { +// return strField; +// } +// +// public String[] getTitleStr() { +// return titleStr; +// } +// +// public String getTitle() { +// if(StringUtils.isEmpty(this.title)){ +// return "无效的标题"; +// }else{ +// return title; +// } +// } +// +// public String getFileName() { +// if(StringUtils.isEmpty(this.fileName)){ +// return "未命名"; +// }else{ +// return this.fileName; +// } +// } +// +// public CellStyle getBigTitleCellStyle() { +// return bigTitleCellStyle; +// } +// +// public CellStyle getTitleCellStyle() { +// return titleCellStyle; +// } +// +// public CellStyle getCellStyle() { +// return cellStyle; +// } +// +// public String getSheetName() { +// return sheetName; +// } +// +// public Integer getSheetNo() { +// return sheetNo; +// } +// +// public BigDecimal[] getCellWidth() { +// return cellWidth; +// } +// +// public String getSufix() { +// return sufix; +// } +// +// public QueryDataInterface getQueryDataInterface() { +// return queryDataInterface; +// } +// +// public void setClazz(Class clazz) { +// this.clazz = clazz; +// } +// +// public void setStrField(String[] strField) { +// this.strField = strField; +// } +// +// public void setTitleStr(String[] titleStr) { +// this.titleStr = titleStr; +// } +// +// public void setTitle(String title) { +// this.title = title; +// } +// +// public void setFileName(String fileName) { +// this.fileName = fileName; +// } +// +// public void setSufix(String sufix) { +// this.sufix = sufix; +// } +// +// public void setBigTitleCellStyle(CellStyle bigTitleCellStyle) { +// this.bigTitleCellStyle = bigTitleCellStyle; +// } +// +// public void setTitleCellStyle(CellStyle titleCellStyle) { +// this.titleCellStyle = titleCellStyle; +// } +// +// public void setCellStyle(CellStyle cellStyle) { +// this.cellStyle = cellStyle; +// } +// +// public void setSheetName(String sheetName) { +// this.sheetName = sheetName; +// } +// +// public void setCellWidth(BigDecimal[] cellWidth) { +// this.cellWidth = cellWidth; +// } +// +// +// public void setSheetNo(Integer sheetNo) { +// this.sheetNo = sheetNo; +// } +// +// public void setQueryDataInterface(QueryDataInterface queryDataInterface) { +// this.queryDataInterface = queryDataInterface; +// } +// +//} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java index f82a656..1a6ff37 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java @@ -42,9 +42,6 @@ public class ProdPlanBatchCompileModel { @ApiParam("班次") private String shiftCode; - @ApiParam("客户名称") - private String custCodeName; - @ApiParam("客户代码") private String custCode; @@ -75,4 +72,52 @@ public class ProdPlanBatchCompileModel { @ApiParam("计划类型名称") private String planTypeName; + @ApiParam("数量1") + private String qty1; + + @ApiParam("完成数量1") + private String completeQty1; + + @ApiParam("数量2") + private String qty2; + + @ApiParam("完成数量2") + private String completeQty2; + + @ApiParam("数量3") + private String qty3; + + @ApiParam("完成数量3") + private String completeQty3; + + @ApiParam("数量4") + private String qty4; + + @ApiParam("完成数量4") + private String completeQty4; + + @ApiParam("数量5") + private String qty5; + + @ApiParam("完成数量5") + private String completeQty5; + + @ApiParam("数量6") + private String qty6; + + @ApiParam("完成数量6") + private String completeQty6; + + @ApiParam("数量7") + private String qty7; + + @ApiParam("完成数量7") + private String completeQty7; + + @ApiParam("合计") + private String amountStr; + + @ApiParam("完成合计") + private String completeAmountStr; + } From f9dfc8e0e21ad11a9f012b495a4a4db27bfb465a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 30 Apr 2020 12:45:10 +0800 Subject: [PATCH 27/32] =?UTF-8?q?plc=E5=9C=B0=E5=9D=80=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0plc=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5(?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE)=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E6=B7=BB=E5=8A=A0=E4=BD=9C=E4=B8=9A=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=AD=97=E6=AE=B5(=E6=9E=9A=E4=B8=BE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index 19d1a22..d1220a7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -97,6 +97,9 @@ public class MesEquipmentModel implements Serializable { @ApiParam("连接类型") private String connectTypeName; + @ApiParam("作业校验模式") + private Integer checkModel; + public MesEquipmentModel() { @@ -139,7 +142,7 @@ public class MesEquipmentModel implements Serializable { } //获取设备分页数据 queryMesEquipmentByPager - public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -163,6 +166,7 @@ public class MesEquipmentModel implements Serializable { this.createDatetime = createDatetime; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.checkModel = checkModel; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java index 9ea903c..1e4ee99 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -96,6 +96,9 @@ public class MesPlcModel implements Serializable { @ApiParam("OPCUA路径") private String opcUrl; + @ApiParam("PLC类型") + private Integer plcType; + public MesPlcModel() { } @@ -103,7 +106,7 @@ public class MesPlcModel implements Serializable { public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel, String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName, - String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) { + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl, Integer plcType) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -131,5 +134,6 @@ public class MesPlcModel implements Serializable { this.device = device; this.objectCode = objectCode; this.opcUrl = opcUrl; + this.plcType = plcType; } } From 345b261118a223687fcb26c0e4dfff0ea941215f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 30 Apr 2020 14:44:57 +0800 Subject: [PATCH 28/32] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9E=9A=E4=B8=BEEQU=5FDEFECT=5FCAUSE=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0,EQU=5FDEFECT=5FMETHOD=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8E=AA=E6=96=BD,EQU=5FDEFECT=5FPHENOMENON?= =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=8E=B0=E8=B1=A1;?= 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 e126301..88b9646 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 @@ -644,7 +644,10 @@ public class MesEnumUtil { SCRAP("SCRAP", "报废原因"), QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), WC_CHECK("WC_CHECK", "开线检查项"), - BOARD("BOARD", "看板类型"); + BOARD("BOARD", "看板类型"), + EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"), + EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"), + EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"); private String value; private String description; From 363ac22adeb062d62a7d6dbd4a7a29b9e8ff5c62 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 30 Apr 2020 15:28:54 +0800 Subject: [PATCH 29/32] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1750=20OEE?= =?UTF-8?q?=E8=BF=90=E7=AE=97JOB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesOffLineRecord.java | 30 --------------- .../pojo/mes/model/OperateObjectParamModel.java | 44 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 30 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java index 6c668db..bc7b401 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java @@ -66,34 +66,4 @@ public class MesOffLineRecord extends BaseBean implements Serializable { @Column(name = "OFF_LINE_TIME") @ApiParam("下线时间") private String offLineTime; - - /*************冗余字段****************/ - - @Transient - @ApiParam("设备代码") - private String equCode; - - @Transient - @ApiParam("运算对象代码") - private String objectCode; - - @Transient - @ApiParam("日期") - private String oeeDate; - - @Transient - @ApiParam("开始时段") - private String startTime; - - @Transient - @ApiParam("结束时段") - private String endTime; - - @Transient - @ApiParam("一次合格数") - private Integer qualifiedQty; - - @Transient - @ApiParam("总生产数") - private Integer totalQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java new file mode 100644 index 0000000..2b25ff8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/30 2:01 下午 + * @Modify: + */ +@Data +public class OperateObjectParamModel { + + private String organizeCode; + + @ApiParam("设备代码") + private String equCode; + + @ApiParam("运算对象代码") + private String objectCode; + + @ApiParam("日期") + private String oeeDate; + + @ApiParam("开始时段") + private String startTime; + + @Transient + @ApiParam("结束时段") + private String endTime; + + @ApiParam("属性值") + private Integer attributeValue = 0; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + +} From 1dff3327d7e69ed2dda5b30fdbd8d5db20635536 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 30 Apr 2020 17:09:19 +0800 Subject: [PATCH 30/32] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A1733=20?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=A8=A1=E6=9D=BF=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java | 4 ++ .../pojo/mes/model/SnPrintLabelTemplateModel.java | 48 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintLabelTemplateModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java index 80fd5fd..6357830 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java @@ -41,6 +41,10 @@ public class MesProdPack extends BaseBean implements Serializable { @ApiParam("包装规格") private String packSpec; + @Column(name = "PROCESS_LABEL_TEMPLATE") + @ApiParam("过程标签模板") + private String processLabelTemplate; + @Column(name = "PROD_LABEL_TEMPLATE") @ApiParam("产品标签模板") private String prodLabelTemplate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintLabelTemplateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintLabelTemplateModel.java new file mode 100644 index 0000000..e16935b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintLabelTemplateModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 条码打印模版model + * @Reference: + * @Author: wangjie + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("条码打印模版model") +public class SnPrintLabelTemplateModel { + + @ApiParam("模版信息") + private MesLabelTemplate labelTemplate; + + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("条码类型 10-过程条码，20-产品条码，30-包装条码") + private Integer snType; + + @ApiParam("包装条码层级 1-第一层，2-第二层，3-第三层，4-第四层") + private Integer packLevel; + + public SnPrintLabelTemplateModel() { + } + + public SnPrintLabelTemplateModel(String organizeCode, String partNo, String custCode, Integer snType, Integer packLevel, MesLabelTemplate labelTemplate) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.custCode = custCode; + this.snType = snType; + this.packLevel = packLevel; + this.labelTemplate = labelTemplate; + } +} From 6760ed79ddf7110721d857f2662a9f1338bbed58 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Thu, 30 Apr 2020 20:46:07 +0800 Subject: [PATCH 31/32] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=AF=E7=94=A8=E7=A6=81=E7=94=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java index 10f8597..f727900 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java @@ -46,6 +46,10 @@ public class MesDataAuth extends BaseBean implements Serializable { @ApiParam("数据对象") private String dataObject; + @Column(name = "DATA_OBJECT_FULL_NAME") + @ApiParam("数据对象全称") + private String dataObjectFullName; + @Column(name = "DATA_OBJECT_NAME") @ApiParam("数据对象名称") private String dataObjectName; From 40a87d83b3ccb8f72f2c10b56083b664be67e75a Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 30 Apr 2020 20:55:20 +0800 Subject: [PATCH 32/32] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?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 | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 4 ++-- 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-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 | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..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-PROD-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 0cf8b6d..9302dfc 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-PROD-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 8debbf6..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-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 0bfac69..712a842 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-PROD-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 b7991cc..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-PROD-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 e0d305b..375d0fd 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-PROD-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 91f8894..d1ea30d 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-PROD-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 3b9e57a..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-PROD-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 4f24980..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-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index c7bebed..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-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b5c2cd3..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-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 8767603..0080b0c 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-PROD-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 977c14a..24de8cf 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-PROD-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 dc4ea86..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-PROD-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 788be96..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-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 3930e69..590b56c 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-PROD-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 284329f..ac9e7dd 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-PROD-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 8bc1aa2..f153994 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-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index c4793b9..1bef72c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform