From 2cc43af4313d9ebc77c794fe3d8b9e25e3a5b961 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Apr 2020 20:30:28 +0800 Subject: [PATCH 01/52] =?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/52] =?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/52] =?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/52] =?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/52] =?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/52] =?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/52] =?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/52] =?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/52] =?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/52] =?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/52] 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/52] =?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/52] =?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 3227cfa47eb0253840aca49824c9b528a05406a2 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 28 Apr 2020 21:19:31 +0800 Subject: [PATCH 14/52] [oee] --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 222 +++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 112 +++++++++++ .../i3plus/pojo/mes/bean/MesOperateObject.java | 45 +++++ .../pojo/mes/bean/MesOperateObjectAttribute.java | 48 +++++ .../i3plus/pojo/mes/bean/MesOperateObjectCfg.java | 65 ++++++ .../i3plus/pojo/mes/bean/MesScriptPersistence.java | 56 ++++++ .../pojo/mes/repository/MesOeeRepository.java | 15 ++ .../MesOperateObjectAttributeRepository.java | 15 ++ .../repository/MesOperateObjectCfgRepository.java | 15 ++ .../mes/repository/MesOperateObjectRepository.java | 15 ++ .../repository/MesScriptPersistenceRepository.java | 15 ++ 11 files changed, 623 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOeeRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectAttributeRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScriptPersistenceRepository.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..0629798 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 @@ -5174,4 +5174,226 @@ public class MesEnumUtil { } } + + /** + * 运算对象属性 运算类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPERATE_TYPE { + OEE(10, "OEE"), + MTBF(20, "MTBF平均故障间隔"), + MTTR(30, "MTTR平均修理时间"); + + private int value; + private String description; + + OPERATE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 运算对象属性 属性类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ATTRIBUTE_TYPE { + STANDARD_ATTRIBUTE(10, "标准属性"), + CUSTOM_ATTRIBUTE(20, "自定义属性"); + + private int value; + private String description; + + ATTRIBUTE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 运算对象属性配置 赋值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VALUE_TYPE { + MANUAL_ASSIGNMENT(10, "手工赋值"), + SPEL_EXPRESSION(20, "spel表达式"), + FUNCTION_ASSIGNMENT(30, "函数赋值"), + JOB_ASSIGNMENT(40, "job赋值"); + + private int value; + private String description; + + VALUE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 运算对象 运算类型 + */ + @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"); + + private int value; + private String description; + + OBJECT_CODE(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; + } + } + + /** + * 脚本类型（组件、表单、报表、JOB、其他） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRIPT_TYPE { + ORGANIZE_OEE(10, "组件"), + WORK_CENTER_OEE(20, "表单"), + WORK_CELL_CEE(30, "报表"), + JOB(40, "JOB"), + OTHER(50, "其他"); + + private int value; + private String description; + + SCRIPT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 语言类型（Groovy、Python、JavaScript、Scala、Ruby） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRIPT_LANGUAGE { + GROOVY(10, "Groovy"), + PYTHON(20, "Python"), + JAVA_SCRIPT(30, "JavaScript"), + SCALA(40, "Scala"), + RUBY(50, "Ruby"); + + private int value; + private String description; + + SCRIPT_LANGUAGE(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 new file mode 100644 index 0000000..81b3951 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -0,0 +1,112 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 4:19 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OEE") +@Api("MES_OEE数据") +public class MesOee extends BaseBean implements Serializable { + + private static final long serialVersionUID = -9163026983140909748L; + + @Column(name = "OBJECT_CODE") + @ApiParam("运算对象代码") + private String objectCode; + + @Column(name = "STATUS") + @ApiParam("运算状态") + private Integer status; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCode; + + @Column(name = "OEE_DATE") + @ApiParam("日期") + private String oeeDate; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "START_TIME") + @ApiParam("开始时段") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("结束时段") + private String endTime; + + @Column(name = "TOTAL_RUN_TIME") + @ApiParam("总生产时间") + private String totalRunTime; + + @Column(name = "TOTAL_STOP_TIME") + @ApiParam("总停机时间") + private String totalStopTime; + + @Column(name = "TOTAL_QTY") + @ApiParam("总生产数") + private Integer totalQty; + + @Column(name = "QUALIFIED_QTY") + @ApiParam("一次合格数") + private Integer qualifiedQty; + + @Column(name = "PLAN_TAKT") + @ApiParam("计划节拍") + private Integer planTakt; + + @Column(name = "ACTUAL_TAKT") + @ApiParam("实际节拍") + private Integer actualTakt; + + @Column(name = "TIME_RATE") + @ApiParam("时间开动率") + private String timeRate; + + @Column(name = "TAKT_RATE") + @ApiParam("性能开动率") + private String taktRate; + + @Column(name = "QUALIFIED_RATE") + @ApiParam("良品率") + private String qualifiedRate; + + @Column(name = "OEE") + @ApiParam("OEE") + private String oee; + + @Column(name = "BUSI_DATA") + @ApiParam("自定义数据") + private String busiData; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java new file mode 100644 index 0000000..99cc4bb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 4:04 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OPERATE_OBJECT") +@Api("MES_运算对象") +public class MesOperateObject extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7829216855303543146L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "OPERATE_TYPE") + @ApiParam("运算类型") + private Integer operateType; + +} 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 new file mode 100644 index 0000000..56649b6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 4:08 下午 + * @Modify:MES_OPERATE_OBJECT_CFG + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE") +@Api("MES_运算对象属性") +public class MesOperateObjectAttribute extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3916105499867386686L; + + @Column(name = "ATTRIBUTE_CODE") + @ApiParam("属性代码") + private String attributeCode; + + @Column(name = "ATTRIBUTE_NAME") + @ApiParam("属性名称") + private String attributeName; + + @Column(name = "ATTRIBUTE_TYPE") + @ApiParam("属性类型") + private Integer attributeType; + + @Column(name = "OPERATE_TYPE") + @ApiParam("运算类型") + private Integer operateType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java new file mode 100644 index 0000000..cc3a177 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java @@ -0,0 +1,65 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 4:12 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE") +@Api("MES_运算对象属性配置") +public class MesOperateObjectCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8066603810736365082L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "ATTRIBUTE_CODE") + @ApiParam("属性代码") + private String attributeCode; + + @Column(name = "VALUE_TYPE") + @ApiParam("赋值类型") + private String valueType; + + @Column(name = "METHOD_CODE") + @ApiParam("函数方法") + private String methodCode; + + @Column(name = "JOB_ID") + @ApiParam("job编号") + private String jobId; + + @Column(name = "SPEL_CONTENT") + @ApiParam("spel表达式") + private String spelContent; + + @Column(name = "SEQ") + @ApiParam("运算顺序") + private Integer seq; + + @Transient + @ApiParam("属性名称") + private String attributeName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java new file mode 100644 index 0000000..945aa56 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 4:58 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCRIPT_PERSISTENCE") +@Api("动态脚本") +public class MesScriptPersistence extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1941422535481564572L; + + @Column(name = "SCRIPT_NO") + @ApiParam("脚本编号") + private String scriptNo; + + @Column(name = "SCRIPT_NAME") + @ApiParam("脚本名称") + private String scriptName; + + @Column(name = "SCRIPT_REMARK") + @ApiParam("脚本描述") + private String scriptRemark; + + @Column(name = "SCRIPT_TYPE") + @ApiParam("脚本类型") + private Integer scriptType; + + @Column(name = "LANGUAGE_TYPE") + @ApiParam("语言类型") + private Integer languageType; + + @Column(name = "SCRIPT_CONTENT") + @ApiParam("脚本内容") + private String scriptContent; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOeeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOeeRepository.java new file mode 100644 index 0000000..427d72e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOeeRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesOee; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:04 下午 + * @Modify: + */ +@Repository +public interface MesOeeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectAttributeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectAttributeRepository.java new file mode 100644 index 0000000..e8add57 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectAttributeRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesOperateObjectAttribute; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:05 下午 + * @Modify: + */ +@Repository +public interface MesOperateObjectAttributeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectCfgRepository.java new file mode 100644 index 0000000..70241ae --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectCfgRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesOperateObjectCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:04 下午 + * @Modify: + */ +@Repository +public interface MesOperateObjectCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectRepository.java new file mode 100644 index 0000000..1d904cf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesOperateObject; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:05 下午 + * @Modify: + */ +@Repository +public interface MesOperateObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScriptPersistenceRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScriptPersistenceRepository.java new file mode 100644 index 0000000..d5ca681 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScriptPersistenceRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesScriptPersistence; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:03 下午 + * @Modify: + */ +@Repository +public interface MesScriptPersistenceRepository extends BaseRepository { +} From 90edd435e3b27d01a65bba54ec84b8eb74c9788b Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 29 Apr 2020 11:50:33 +0800 Subject: [PATCH 15/52] 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 16/52] =?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 17/52] =?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 18/52] 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 19/52] 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 20/52] =?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 21/52] =?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 22/52] 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 23/52] =?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 24/52] =?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 25/52] 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 26/52] =?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 27/52] =?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 28/52] =?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 29/52] =?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 30/52] =?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 31/52] =?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 005d0f7f8683c9b160f20d8f76b0b5015162d08d Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 30 Apr 2020 20:36:43 +0800 Subject: [PATCH 32/52] =?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 +- sonar-project.properties | 2 +- 20 files changed, 25 insertions(+), 25 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 8debbf6..96472ad 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 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-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index e0d305b..5bfdd66 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-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 4f24980..f9957c9 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index c7bebed..409b79a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b5c2cd3..846c302 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 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 788be96..1b72275 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 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 55e4e84..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-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 6760ed79ddf7110721d857f2662a9f1338bbed58 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Thu, 30 Apr 2020 20:46:07 +0800 Subject: [PATCH 33/52] =?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 34/52] =?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 From 1983602b3a4c4a3935f56b08d3f76c0f151d482c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 6 May 2020 09:36:35 +0800 Subject: [PATCH 35/52] =?UTF-8?q?8060=20AP-MGN-BJ-19081=20--=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E6=9F=A5=E8=AF=A2=E8=BE=93=E5=85=A5=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E9=9B=B6=E4=BB=B6=E6=95=B0=E9=87=8F=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java index 8d9a807..17c421d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -10,7 +10,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; @@ -71,7 +75,7 @@ public class WmsTransportRule extends BaseBean { public String partNo; @Column(name = "CUST_NO") - @ApiParam("客户代码") + @ApiParam("客户编号") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) public String custNo; From 2dac15c248322289ffd391f67ebd24b663daeeea Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 6 May 2020 11:34:06 +0800 Subject: [PATCH 36/52] =?UTF-8?q?=E3=80=901709=20BH-=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=80=BC=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 +- .../i3plus/pojo/wms/bean/WmsDocSoDetails.java | 5 ++ .../i3plus/pojo/wms/bean/WmsPartItemCheck.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 8 ++++ .../i3plus/pojo/wms/bean/WmsTestResultDetails.java | 15 ++++++ .../i3plus/pojo/wms/bean/WmsTestResultSummary.java | 1 - .../pojo/wms/modelbean/WmsDataAuthModel.java | 3 ++ .../pojo/wms/modelbean/WmsPartItemCheckModel.java | 53 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 ++++++ 9 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.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 79ea203..cf8e1ea 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 @@ -2244,7 +2244,8 @@ public class WmsEnumUtil { MATERIAL(40, "MATERIAL", "物料对象"), TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"), BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"), - BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"); + BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"), + BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象"); private String code; private String description; 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; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index 8498c36..17ae233 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -63,7 +63,7 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "STANDARD") @ApiParam("标准值") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Double standard; + private Integer standard; @Column(name = "MAX") @ApiParam("最大值") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 314f299..2a8d3bd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -353,6 +353,14 @@ public class WmsStockSn extends BaseBean { @Transient private String requerimentCode; + @Transient + @ApiParam("大检测项类型") + public Integer checkType; + + @Transient + @ApiParam("样本数") + private Integer sampleSize; + public WmsStockSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java index 5329861..a181556 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 检测结果明细表 @@ -64,4 +65,18 @@ public class WmsTestResultDetails extends BaseBean { @Column(name = "check_value") @ApiParam("检测值") public String checkValue; + + @Transient + @ApiParam("已检测数") + private Long checkSize; + + public WmsTestResultDetails() { + } + + public WmsTestResultDetails(String partNo, Integer checkType, String bhCode, Long checkSize) { + this.partNo = partNo; + this.checkType = checkType; + this.bhCode = bhCode; + this.checkSize = checkSize; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index c928e2b..e564dc9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -70,7 +70,6 @@ public class WmsTestResultSummary extends BaseBean { @Column(name = "PICK_STATUS") @ApiParam("挑选状态") @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description") - public Integer pickStatus; @Column(name = "PICK_RESULT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index 9cd45da..29d481e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -48,6 +48,9 @@ public class WmsDataAuthModel extends BaseBean { @ApiParam("业务类型列表") private List busiOperationTypeList; + @ApiParam("检测大类列表") + private List bhCheckTypeList; + @ApiParam( value = "新增操作", example = "0" diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.java new file mode 100644 index 0000000..d872ba4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 子检测项 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-29 16:23 + * @Modify: + **/ +@Data +@Api("子检测项model") +public class WmsPartItemCheckModel { + + @ApiParam("子检测项代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemCode; + + @ApiParam("子检测项名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemName; + + @ApiParam("子检测箱值类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + private Integer valueType; + + @ApiParam("检测值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double checkValue; + + @ApiParam("是否合格") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer isQualified; + + @ApiParam("标准值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer standard; + + @ApiParam("最大值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double max; + + @ApiParam("最小值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double min; + +} 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 9be3c1c..86700bb 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 @@ -3204,4 +3204,19 @@ public class WmsHqlPack { return result; } + + /** + * 根据条件分页查询物料检测大类 + * + * @param checkType + * @return + */ + public static DdlPackBean packHqlWmsPartCheckType(WmsPartCheckType checkType) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(checkType.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(checkType.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(checkType.getCheckType(), "checkType", result); + getStringBuilderPack(checkType, result); + return result; + } } From 28de0251ea814c8b4897f5a77dfc74862229637c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 6 May 2020 17:06:24 +0800 Subject: [PATCH 37/52] =?UTF-8?q?=E3=80=90sonar=20bug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9fce24b..b7a7eef 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 @@ -29,7 +29,7 @@ public class MesWorkOrderModel { //客户产线代码 @ApiParam("ProductionLineID") @AnnoOutputColumn - private String workCenterCode; + private String custProdLineCode; //数量 @ApiParam("DemandQty") From 25b2fb8e21c3384664a66cbe8efac0b61e6fc6a3 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 6 May 2020 17:35:04 +0800 Subject: [PATCH 38/52] =?UTF-8?q?jis=20pojo=20=E5=8E=BB=E9=99=A4rule=20?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index ef7ae49..627f7c1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -61,8 +61,8 @@ public class MesPatternJis extends BaseBean implements Serializable { private Integer patternType; @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; + @Column(name = "MATCH_RULE") + @ApiParam("匹配规则") + private String matchRule; } From 46a91a13bccbf3653411012a10ab6d3db1c6df62 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 6 May 2020 17:35:46 +0800 Subject: [PATCH 39/52] =?UTF-8?q?jis=20=E5=8E=BB=E9=99=A4rule=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index ef7ae49..bd154b1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -61,8 +61,8 @@ public class MesPatternJis extends BaseBean implements Serializable { private Integer patternType; @Lob - @Column(name = "RULE") + @Column(name = "MATCH_RULE") @ApiParam("规则") - private String rule; + private String matchRule; } From 63bc0b5928068ab836dff615f3416aa738ddac26 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 6 May 2020 18:19:17 +0800 Subject: [PATCH 40/52] merge test --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java | 5 +++++ 1 file changed, 5 insertions(+) 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 b7a7eef..1975440 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 @@ -41,4 +41,9 @@ public class MesWorkOrderModel { @AnnoOutputColumn private String startTime; + //开始时间 + @ApiParam("WORK_CENTER_CODE") + @AnnoOutputColumn + private String workCenterCode; + } From f41cd22258734e15b0485da98221d83f14f5b617 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 6 May 2020 19:25:35 +0800 Subject: [PATCH 41/52] =?UTF-8?q?[bug:=208353=20=E6=8B=8D=E7=85=A7?= =?UTF-8?q?=E9=87=87=E9=9B=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java | 2 ++ 6 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index 98d4fc0..39063b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; import java.math.BigDecimal; @@ -93,6 +94,7 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") 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 0549d1f..49363f3 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -84,6 +85,7 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 040228e..ddc37ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -96,6 +97,7 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index 91972fb..f7a2098 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -93,6 +94,7 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java index acc8c22..bb50de6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -75,6 +76,7 @@ public class IfRawPartData extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java index df240bc..221abea 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -47,6 +48,7 @@ public class IfWmsPpm extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") From b450df5754e419b8e44801c2d5e54b9702716a91 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 6 May 2020 21:05:17 +0800 Subject: [PATCH 42/52] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1752=E5=B7=A5?= =?UTF-8?q?=E5=8E=82oee]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java index cc3a177..a70cac7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java @@ -25,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE") +@Table(name = "MES_OPERATE_OBJECT_CFG") @Api("MES_运算对象属性配置") public class MesOperateObjectCfg extends BaseBean implements Serializable { @@ -62,4 +62,8 @@ public class MesOperateObjectCfg extends BaseBean implements Serializable { @Transient @ApiParam("属性名称") private String attributeName; + + @Transient + @ApiParam("属性类型") + private Integer attributeType; } From 543f0f5c4c684a4d30b6be52df04c1557ea68fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 7 May 2020 09:31:17 +0800 Subject: [PATCH 43/52] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=BF=98=E5=8E=9F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 1975440..70851a9 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 @@ -26,10 +26,10 @@ public class MesWorkOrderModel { @AnnoOutputColumn private String partNo; - //客户产线代码 + //产线代码 @ApiParam("ProductionLineID") @AnnoOutputColumn - private String custProdLineCode; + private String workCenterCode; //数量 @ApiParam("DemandQty") @@ -41,9 +41,4 @@ public class MesWorkOrderModel { @AnnoOutputColumn private String startTime; - //开始时间 - @ApiParam("WORK_CENTER_CODE") - @AnnoOutputColumn - private String workCenterCode; - } From f6e2a509f0df7224b6352942ec8bf8e9c63a1842 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 7 May 2020 16:18:32 +0800 Subject: [PATCH 44/52] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1751=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E5=B0=8F=E6=97=B6OEE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.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/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index cdb17df..6ccc9fa 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 @@ -5499,7 +5499,7 @@ public class MesEnumUtil { 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(天)"); + EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)"); private String value; private String description; From ba81a267004e7cc93fb060e4441f73f16b66359b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 7 May 2020 17:06:32 +0800 Subject: [PATCH 45/52] =?UTF-8?q?1778=20=E4=BA=A7=E5=93=81=E5=B7=A5?= =?UTF-8?q?=E8=A3=85=E5=85=B3=E7=B3=BB=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 57 ++++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 8 +++ .../estsh/i3plus/pojo/wms/bean/WmsBomHistory.java | 7 +++ 3 files changed, 72 insertions(+) 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 06d2317..fb73d5e 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 @@ -6610,4 +6610,61 @@ public class WmsEnumUtil { return valueOf(val); } } + + + /** + * 返修、挑选状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOM_TYPE { + INIT(10, "PART", "物料"), + BE_HANDLE(20, "OUT", "委外"), + FINISH(30, "UTENSIL", "器具"); + + private int value; + private String code; + private String description; + + BOM_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index c87d03b..14d7a05 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -112,6 +112,14 @@ public class WmsBom extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; + + @Column(name = "BOM_TYPE") + @ApiParam(value = "BOM类型") + @ColumnDefault("10") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 1) + @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description") + private Integer bomType; + @ApiParam(value = "目标存储区") @Transient public String destZoneNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java index 6475e26..3456584 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java @@ -115,6 +115,13 @@ public class WmsBomHistory extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String newBomVersion; + @Column(name = "BOM_TYPE") + @ApiParam(value = "BOM类型") + @ColumnDefault("10") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 1) + @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description") + private Integer bomType; + @ApiParam(value = "目标存储区") @Transient public String destZoneNo; From df2e8601c486d16f23dbf7725bd8f43956ec3846 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 7 May 2020 18:50:12 +0800 Subject: [PATCH 46/52] task:1719 --- .../cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java | 8 +------- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 9 +++++++++ 2 files changed, 10 insertions(+), 7 deletions(-) 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 index 4e90509..f49407c 100644 --- 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 @@ -15,13 +15,7 @@ import lombok.Data; @Api("插件日志") public class ScriptLoggerModel { @ApiParam("工厂") - private String organizeCode; - - @ApiParam("用户编号") - private String userCode; - - @ApiParam("脚本编号") - private String scriptNo; + private Boolean error; @ApiParam("日志内容") private String context; 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 792a479..4c77049 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 @@ -16,6 +16,7 @@ import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; +import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistenceHistory; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; @@ -2279,6 +2280,14 @@ public class WmsHqlPack { return packBean; } + public static DdlPackBean packHqlWmsScriptHistory(EngineScriptPersistenceHistory history) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(history.getScriptNo(), "scriptNo", packBean); + getStringBuilderPack(history, packBean); + + return packBean; + } + /** * 供应商窗口时间 条件封装 * From f87eeeb49129f7a06b2aff4c174381f41ac84bed Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 8 May 2020 13:58:05 +0800 Subject: [PATCH 47/52] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=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 +- sonar-project.properties | 2 +- 20 files changed, 25 insertions(+), 25 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 3d6cbc0..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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 96472ad..a933723 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 3937425..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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..a44418c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 5bfdd66..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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 8b15a31..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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..50ab2c2 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index f9957c9..a2bb2df 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 409b79a..8664dd2 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 846c302..265f98d 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 23f68bd..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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 28cf55f..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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..0fbfb69 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 1b72275..069a4e2 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 910d630..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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index e5b4e5c..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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0ecf190..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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index fbbe86f..1bef72c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..55e4e84 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 0b3d2d6815db509d0c40737c0ffee30138e869e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 8 May 2020 14:34:29 +0800 Subject: [PATCH 48/52] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8DREST=20?= =?UTF-8?q?=E9=80=82=E9=85=8D=E5=99=A8=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 9 +++++++++ .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java | 1 + .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java | 3 +++ 3 files changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index 3b2e47c..cb371c4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -8,6 +8,10 @@ import com.thoughtworks.xstream.annotations.XStreamOmitField; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; import java.util.List; import java.util.Map; @@ -20,9 +24,12 @@ import java.util.Map; **/ @Data @XStreamAlias("server") +@XmlRootElement(name ="server") +@XmlAccessorType(XmlAccessType.NONE) public class SuitServerModel { // 执行方法命令 + @XmlElement @ApiParam(value = "适配器code") private String suitCaseCode; /* 认证使用 以后使用 */ @@ -31,6 +38,7 @@ public class SuitServerModel { // 请求ID private String requestId; // 传输单对象 + @XmlElement(name = "data") private Object obj; // 传输集合 private List list; @@ -44,6 +52,7 @@ public class SuitServerModel { */ // @XStreamImplicit @XStreamCDATA + @XmlElement private String suitMessage; /** diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java index da487e2..4f87d41 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api(value = "长数据", description = "长数据") public class BsLongData extends BaseBean { + private static final long serialVersionUID = -329128754646765129L; @Column(name = "REF_ID") @ApiParam(value = "关联id") private Long refId; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java index fad903c..051d0c9 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -40,6 +42,7 @@ public class BsSuitCaseREST extends BaseBean { //CommonEnumUtil.HTTP_METHOD_TYPE @Column(name = "REQUEST_METHOD_ID") @ApiParam(value = "请求方式id") + @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class) private Integer requestMethodId; @Transient From eadf0d67f8ffa6eddac8b4118b83f5f018a3cd08 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Fri, 8 May 2020 14:49:26 +0800 Subject: [PATCH 49/52] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/bean/DdlPackBean.java | 19 ++++++++ .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 54 ++++++++-------------- .../estsh/i3plus/pojo/mes/model/FilterGroup.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/FilterRule.java | 2 +- .../{FilterRuleAndOr.java => FilterRules.java} | 2 +- 5 files changed, 41 insertions(+), 38 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{FilterRuleAndOr.java => FilterRules.java} (83%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index ded0d8d..c397de1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import java.util.HashMap; +import java.util.Map; /** * @Description : hql脚本封装类 @@ -141,6 +142,24 @@ public class DdlPackBean { } /** + * 添加查询条件-处理多个属性 + * @param hql + * @param hqlMap + */ + public void addColumnQuery(String hql,HashMap hqlMap){ + if(hqlPreparedMap == null){ + hqlPreparedMap = new HashMap<>(); + } + if(hqlMap != null && !hqlMap.isEmpty()) { + hqlPreparedMap.putAll(hqlMap); + } + + whereAppend.append(hql); + } + + + + /** * 需要查询属性的数量 * @return */ 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 cdb17df..6967548 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -14,26 +14,26 @@ 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","包含"); + GT(">",">","大于"), + LT("<","<","小于"), + EQ("=","=","等于"), + NEQ("!=","!=","不等于"), + GTE(">=",">=","大于等于"), + LTE("<=","<=","小于等于"), + LIKE("like","like","LIKE"), + IN("in","in","包含"); - private int value; + private String value; private String code; private String description; - HQL_EXPRESSION(int value, String code, String description) { + HQL_EXPRESSION(String value, String code, String description) { this.value = value; this.code = code; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -45,38 +45,22 @@ public class MesEnumUtil { 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; + public static String valueOfDesc(String val) { for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; + if (values()[i].value.equals(val)) { + return values()[i].description; } } - return tmp; + return null; } - public static int descOf(String desc) { - int tmp = 1; + public static HQL_EXPRESSION codeOf(String value) { for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; + if (values()[i].value.equals(value)) { + return values()[i]; } } - return tmp; - } - - public static String valueOfDescription(int val) { - return valueOf(val); + return null; } } 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 index a262480..2834455 100644 --- 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 @@ -7,5 +7,5 @@ import java.util.List; @Data public class FilterGroup { private String andOr; - private List groups; + 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 index 0d91df9..d38f6c9 100644 --- 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 @@ -4,7 +4,7 @@ import lombok.Data; @Data public class FilterRule { - private String filed; + private String field; 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/FilterRules.java similarity index 83% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRules.java index 1991cfd..1a74bdf 100644 --- 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/FilterRules.java @@ -5,7 +5,7 @@ import lombok.Data; import java.util.List; @Data -public class FilterRuleAndOr { +public class FilterRules { private String andOr; private List rules; } From ef6330675c7957fb4bf91524611a99ad61aa5045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 8 May 2020 17:42:53 +0800 Subject: [PATCH 50/52] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#1744=EF=BC=9A=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E6=9B=BF=E6=8D=A2=E8=87=AA=E5=AE=9A=E4=B9=89=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/annotation/DynamicField.java | 14 +- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 76 +++++----- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 108 +++++++++++++++ .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 144 ++++--------------- .../cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 10 ++ .../cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 21 ++- .../cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 14 ++ .../java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 4 +- .../estsh/i3plus/pojo/wms/bean/QadItemPacking.java | 4 +- .../java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java | 11 +- .../pojo/wms/bean/SwebProcurementPlanOrder.java | 16 +++ .../cn/estsh/i3plus/pojo/wms/bean/WareHouse.java | 16 +-- .../estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java | 27 ++++ .../pojo/wms/bean/WmsBhChildDetectionItem.java | 10 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 30 ++-- .../estsh/i3plus/pojo/wms/bean/WmsBomHistory.java | 32 ++--- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java | 52 ++++--- .../i3plus/pojo/wms/bean/WmsContainerType.java | 9 +- .../estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java | 44 +++--- .../i3plus/pojo/wms/bean/WmsCustomerPart.java | 20 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsDock.java | 10 +- .../i3plus/pojo/wms/bean/WmsDockOrderInfo.java | 18 +-- .../i3plus/pojo/wms/bean/WmsDockWindowTime.java | 6 +- .../estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java | 13 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 47 ++++--- .../estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 17 +++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 44 ++++++ .../estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java | 22 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 153 +++++++++++---------- .../i3plus/pojo/wms/bean/WmsPartCheckType.java | 12 +- .../estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 50 +++---- .../estsh/i3plus/pojo/wms/bean/WmsPartGroup.java | 4 + .../i3plus/pojo/wms/bean/WmsPartItemCheck.java | 20 +-- .../estsh/i3plus/pojo/wms/bean/WmsPartPackage.java | 8 +- .../estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java | 11 +- .../i3plus/pojo/wms/bean/WmsPullTaskMaster.java | 16 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 29 +++- .../cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java | 8 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsShift.java | 6 + .../i3plus/pojo/wms/bean/WmsShippingFlag.java | 17 +++ .../i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 7 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 79 ++++++++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java | 10 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java | 8 +- .../estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java | 10 ++ .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 39 ++++++ .../i3plus/pojo/wms/bean/WmsTransportRule.java | 23 ++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java | 5 + .../estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java | 5 + .../estsh/i3plus/pojo/wms/bean/WmsVendorPart.java | 25 +++- .../estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java | 15 ++ .../i3plus/pojo/wms/bean/WmsWorkCenterZone.java | 21 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java | 17 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 40 +++--- .../pojo/wms/bean/dynamictable/WmsFieldInfo.java | 30 ++-- .../pojo/wms/bean/dynamictable/WmsListElement.java | 4 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 58 files changed, 1001 insertions(+), 516 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index 9dfac91..2811481 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.base.annotation; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import java.lang.annotation.*; @@ -12,7 +12,7 @@ import java.lang.annotation.*; @Target({ElementType.FIELD, ElementType.TYPE}) public @interface DynamicField { // Web前端字段数据类型 - WmsEnumUtil.FIELD_TYPE webFieldType(); + CommonEnumUtil.FIELD_TYPE webFieldType(); // 条件表达式:>,<,>=等 String conditionExpre() default "="; // 条件连接符:and/or @@ -35,14 +35,16 @@ public @interface DynamicField { int isShow() default 1; // 是否跳过本字段扫描 0-不跳过，1-跳过 int isSkip() default 0; - // 下拉枚举名称 - String entityName() default ""; // 下拉列表显示列名称,多个列名需要根据逗号分隔 String listColumnName() default ""; // 下拉搜索列名称,多个列名需要根据逗号分隔 String searchColumnName() default ""; // 回显列名 String explicitColumnName() default ""; - // 下拉框规则 - WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE selectRule() default WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_ENUM; + // 是否多选:1-多选，默认2-单选 + int isMultiple() default 2; + // 数据来源 + String dataSrc() default ""; + // 取值方式 + CommonEnumUtil.DYNAMIC_FIELD_GET_WAY getValWay() default CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.ENUM; } 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 6506c66..69c6cd1 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 @@ -37,99 +37,97 @@ public abstract class BaseBean implements Serializable { @Id @GeneratedValue(generator = "IDGenerator") @GenericGenerator(name = "IDGenerator", strategy = "assigned") - @Column(name="ID") - @ApiParam(value = "主键",example = "0") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) public Long id; //get单独处理 public Long getId() { - if(id != null) { + if (id != null) { return id.longValue(); - }else{ + } else { return id; } } /** * MonogoDB _id映射 + * * @param id */ - @JSONField(name="_id") + @JSONField(name = "_id") public void setId(Long id) { this.id = id; } - @Column(name="ORGANIZE_CODE", nullable = false) - @ApiParam(value ="组织代码") + @Column(name = "ORGANIZE_CODE", nullable = false) + @ApiParam(value = "组织代码") // @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isQuery = 2, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2) public String organizeCode; - @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) - @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) + @Column(name = "IS_VALID", columnDefinition = "int default 1", nullable = false) + @ApiParam(value = "有效性", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; - @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) - @ApiParam(value = "是否已删除",example = "2") + @Column(name = "IS_DELETED", columnDefinition = "int default 2", nullable = false) + @ApiParam(value = "是否已删除", example = "2") @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA - @Column(name="CREATE_USER",updatable = false) + @Column(name = "CREATE_USER", updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", - listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") public String createUser; @Indexed(direction = IndexDirection.DESCENDING) - @Column(name="CREATE_DATE_TIME",updatable = false) + @Column(name = "CREATE_DATE_TIME", updatable = false) @ApiParam(value = "创建日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String createDatetime; - @Column(name="MODIFY_USER") + @Column(name = "MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", - listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") public String modifyUser; - @Column(name="MODIFY_DATE_TIME") + @Column(name = "MODIFY_DATE_TIME") @ApiParam(value = "修改日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String modifyDatetime; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00") + @ApiParam(value = "创建日期查询用，查询起始日期", example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String createDateTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String createDateTimeEnd; - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00") + // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "修改日期查询用，查询起始日期", example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "修改日期查询用，查询结束日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeEnd; @Transient @@ -138,19 +136,19 @@ public abstract class BaseBean implements Serializable { public String orderByParam = ""; @Transient - @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") + @ApiParam(value = "排序类型，1 正序，2 倒序", example = "1") @AnnoOutputColumn(hidden = true) //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; //排序方式 - public String orderBy(){ + public String orderBy() { String result = ""; - if (orderByParam!=null&&orderByParam.trim().length()>0) { + if (orderByParam != null && orderByParam.trim().length() > 0) { result = " order by " + orderByParam; - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { result += " asc"; - }else{ + } else { result += " desc"; } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 00f6f1b..e6bb72a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -2175,4 +2175,112 @@ public class CommonEnumUtil { return tmp; } } + + /** + * PC自定义搜索-字段类型 + * 10-文本，20-数字，30-下拉框，40，时间，50-开窗 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FIELD_TYPE { + TEXT(10, "text"), NUMBER(20, "number"), + SELECT(30, "select"), DATETIME(40, "datetime"), + LIST(50, "list"); + + private int value; + private String description; + + FIELD_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static FIELD_TYPE codeOf(Integer value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + } + + /** + * PC自定义搜索-取值方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DYNAMIC_FIELD_GET_WAY { + ENUM(10, "SINGLE_OBJ", "枚举"), + OBJ(20, "MULTIPLE_OBJ", "对象"), + URL(30, "SINGLE_OBJ", "接口"); + + private int value; + private String code; + private String description; + + DYNAMIC_FIELD_GET_WAY(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 DYNAMIC_FIELD_GET_WAY codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } 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..d57e601 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 @@ -139,6 +139,7 @@ public class WmsEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -2989,6 +2990,7 @@ public class WmsEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -3176,6 +3178,7 @@ public class WmsEnumUtil { } return tmp; } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -3189,7 +3192,10 @@ public class WmsEnumUtil { public static String valueOfDescription(int val) { return valueOf(val); } - public static int descriptionOfValue(String desc) {return descOf(desc);} + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } } @@ -4199,7 +4205,8 @@ public class WmsEnumUtil { } } - /**分类 + /** + * 分类 * 物流规则 处理单位 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -4363,7 +4370,7 @@ public class WmsEnumUtil { /** - * 日志推送至MQ的处理类型 + * 规格层级 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SPEC_LEVEL { @@ -4935,51 +4942,6 @@ public class WmsEnumUtil { } /** - * WEB页面字段类型 - * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum FIELD_TYPE { - TEXT(10, "text"), NUMBER(20, "number"), - SELECT(30, "select"), DATETIME(40, "datetime"), - LIST(50, "list"); - - private int value; - private String description; - - FIELD_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - public static FIELD_TYPE codeOf(Integer value) { - for (int i = 0; i < values().length; i++) { - if (values()[i].value==value) { - return values()[i]; - } - } - return null; - } - } - - /** * 推送类型单位 * 默认为 10 */ @@ -5053,6 +5015,7 @@ public class WmsEnumUtil { } return tmp; } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -5066,7 +5029,10 @@ public class WmsEnumUtil { public static String valueOfDescription(int val) { return valueOf(val); } - public static int descriptionOfValue(String desc) {return descOf(desc);} + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } } /** @@ -5239,7 +5205,7 @@ public class WmsEnumUtil { } /** - * 插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件 + * 插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件 * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -5301,70 +5267,7 @@ public class WmsEnumUtil { } /** - * 动态查询-下拉框规则 - * 默认为 10 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DYNAMIC_FIELD_SELECT_RULE { - SINGLE_ENUM(10, "SINGLE_ENUM", "单选枚举"), - MULTIPLE_ENUM(20, "MULTIPLE_ENUM", "多选枚举"), - SINGLE_URL(30, "SINGLE_URL", "单选接口"), - MULTIPLE_URL(40, "MULTIPLE_URL", "多选接口"); - - private int value; - private String code; - private String description; - - DYNAMIC_FIELD_SELECT_RULE(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 DYNAMIC_FIELD_SELECT_RULE codeOf(int value) { - for (int i = 0; i < values().length; i++) { - if (values()[i].value == value) { - return values()[i]; - } - } - return null; - } - - public static String valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - - public static int descOf(String desc) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; - } - } - return tmp; - } - } - - /** - * 波次合并规则 + * 波次合并规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RULE { @@ -5448,7 +5351,7 @@ public class WmsEnumUtil { } /** - * 波次合并规则 + * 波次合并规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RANGE { @@ -5563,7 +5466,7 @@ public class WmsEnumUtil { } /** - * 插件类型 10-合并规则，20-合并范围 + * 插件类型 10-合并规则，20-合并范围 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_TYPE { @@ -5806,7 +5709,7 @@ public class WmsEnumUtil { return null; } - public static String valueOfDescription ( int val){ + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -5822,7 +5725,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QAD_DOC_TYPE { - TYPE_S(10, "s","s"), TYPE_D(20, "d","d"); + TYPE_S(10, "s", "s"), TYPE_D(20, "d", "d"); private int value; private String code; @@ -5832,7 +5735,7 @@ public class WmsEnumUtil { return code; } - QAD_DOC_TYPE(int value,String code, String description) { + QAD_DOC_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -5898,6 +5801,7 @@ public class WmsEnumUtil { } return null; } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -6383,7 +6287,7 @@ public class WmsEnumUtil { private String code; private String description; - PURCHASE_PLAN_HISTORY_STATUS(int value, String code,String description) { + PURCHASE_PLAN_HISTORY_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index 60cabe4..2ea88ea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,33 +33,41 @@ public class BasCustomer extends BaseBean { private static final long serialVersionUID = -1980207700343546396L; @Column(name = "CUST_NO") @ApiParam(value = "客户编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String custNo; @Column(name = "CUST_NAME") @ApiParam(value = "客户简称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custName; @Column(name = "CUST_DESC") @ApiParam(value = "客户全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String custDesc; @Column(name = "CUST_ADDR") @ApiParam(value = "客户地址") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custAddr; @Column(name = "CUST_OWNER") @ApiParam(value = "联系人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custOwner; @Column(name = "CUST_EMAIL") @ApiParam(value = "邮箱") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custEmail; @Column(name = "CUST_TEL") @ApiParam(value = "电话号码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custTel; @Column(name = "CUST_FAX") @ApiParam(value = "传真") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custFax; } 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..a0a1765 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,14 +33,17 @@ public class BasVendor extends BaseBean{ private static final long serialVersionUID = 9214639813072592779L; @Column(name="VENDOR_NO") @ApiParam("供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String vendorNo; @Column(name="VENDOR_NAME") @ApiParam("供应商简称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String vendorName; @Column(name="VENDOR_DESC") @ApiParam("供应商全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String vendorDesc; @Column(name="VENDOR_ADDR") @@ -47,50 +52,64 @@ public class BasVendor extends BaseBean{ @Column(name="VENDOR_OWNER") @ApiParam("联系人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorOwner; @Column(name="VENDOR_EMAIL") @ApiParam("邮箱") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorEmail; @Column(name = "IS_ASN") @ApiParam(value = "是否发ASN", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isAsn; @Column(name = "USER_NAME") @ApiParam(value = "用户名") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName",listColumnName = "userLoginName,userName", explicitColumnName = "userName") private String userName; @Column(name = "PASSWORD") @ApiParam(value = "密码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String password; @Column(name = "VENDOR_CALL") @ApiParam("供应商电话") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorCall; @Column(name = "VENDOR_FAX") @ApiParam("传真") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorFax; @Column(name = "VENDOR_PHONE") @ApiParam("手机") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorPhone; @Column(name = "KILOBIT") @ApiParam("千位符号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String kilobit; @Column(name = "DECIMALS") @ApiParam("小数位符号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String decimals; - //20-承运商 @Column(name = "VENDOR_TYPE") + @ApiParam("供应商类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "VENDOR_TYPE") private Integer vendorType; @Column(name = "MAP_LOCATION") @ApiParam("经纬度") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String mapLocation; public BasVendor() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index 8ec1cae..2eb3864 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,34 +34,46 @@ public class MesPpMaster extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String woekorderNo; @Column(name="PDLINE_NO") @ApiParam("产线代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter", + searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode") private String pdlineNo; @Column(name="PLAN_PRODUCT_TIME") @ApiParam("生产日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String planProductTime; @Column(name="SHIFT_NO") @ApiParam("班次代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift", + searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo") private String shitNo; @Column(name="START_PRODUCT_TIME") @ApiParam("开始生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String startProductTime; @Column(name="END_PRODUCT_TIME") @ApiParam("结束生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String endProductTime; @Column(name="ORDER_STATUS") @ApiParam(value = "单据状态", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_MASTER_STATUS") private Integer orderStatus = 0; @Column(name="SEQ") @ApiParam(value = "排序号", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seq = 0; public Integer getOrderStatus() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java index 59f3f84..1e942f7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -2,7 +2,7 @@ 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.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -41,7 +41,7 @@ public class QadBop implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java index dfe4dab..b1433df 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java @@ -2,7 +2,7 @@ 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.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -40,7 +40,7 @@ public class QadItemPacking implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java index e33e3c1..4de7f0e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java @@ -2,7 +2,7 @@ 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.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -13,12 +13,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -45,7 +40,7 @@ public class SodDet implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index 338d1d1..6069c18 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,26 +33,40 @@ public class SwebProcurementPlanOrder extends BaseBean { private static final long serialVersionUID = -4332932784803175933L; @Column(name = "ORDER_NO") @ApiParam(value = "合同号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String orderNo; @Column(name = "VENDOR_CODE") @ApiParam(value = "供应商代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorCode; @Column(name = "VENDOR_NAME") @ApiParam(value = "供应商名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName") private String vendorName; @Column(name = "PART_NO") @ApiParam(value = "物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partName; @Column(name = "CONSIGNMENT") @ApiParam(value = "是否寄售") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer consignment=2; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index 2bbb7c8..55e2498 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,37 +35,37 @@ public class WareHouse extends BaseBean { private static final long serialVersionUID = 7914396535326597148L; @Column(name = "CODE") @ApiParam("仓库代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String code; @Column(name = "NAME") @ApiParam("仓库名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String name; @Column(name = "ADDRESS") @ApiParam("仓库地址") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String address; @Column(name = "WH_LENGTH") @ApiParam(value = "长(单位：全局设置参数中的基本单元)") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer whLength; @Column(name = "WH_WIDTH") @ApiParam(value = "宽(单位：全局设置参数中的基本单元)") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer whWidth; @Column(name = "WH_HEIGHT") @ApiParam(value = "高(单位：全局设置参数中的基本单元)") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer whHeight; @Column(name = "BASE_UNIT", columnDefinition = "decimal(18,8)") @ApiParam(value = "基本单元（米）") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double baseUnit; @Column(name = "MAP_LOCATION") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java index a852b02..015f5ed 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,38 +34,63 @@ public class WmsAreaOwner extends BaseBean { private static final long serialVersionUID = -5772266802563087135L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "LOCATE_NO") @ApiParam(value = "库位编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name="PART_NO") @ApiParam("物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") public String partNo; @Column(name="PART_NAME_RDD") @ApiParam("物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") public String partNameRdd; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorNo; @Column(name = "OWNER_USER_NO") @ApiParam(value = "负责人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName",listColumnName = "userLoginName,userName", explicitColumnName = "userName") private String ownerUserNo; @Column(name = "IS_PRE_ASSIGN") @ApiParam(value = "是否预分配人员") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isPreAssign; @Column(name="SHIFT_NO") @ApiParam("班次编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift", + searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo") private String shiftNo; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java index e157150..6be1fbb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,21 +32,21 @@ public class WmsBhChildDetectionItem extends BaseBean { @Column(name = "CHECK_TYPE") @ApiParam("检测大类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") private Integer checkType; @Column(name = "ITEM_CHECK_CODE") @ApiParam("子检测项代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemCheckCode; @Column(name = "ITEM_CHECK_NAME") @ApiParam("子检测项名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemCheckName; @Column(name = "VALUE_TYPE") @ApiParam("值类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") private Integer valueType; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index c87d03b..fcbabcf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -3,7 +3,7 @@ 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -37,61 +37,61 @@ public class WmsBom extends BaseBean { private static final long serialVersionUID = 5555657644784074446L; @Column(name = "PART_NO") @ApiParam(value = "父物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "父物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "UNIT") @ApiParam(value = "计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String unit; @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "数量") @ColumnDefault("0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Column(name = "ITEM_PART_NO") @ApiParam(value = "子物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String itemPartNo; @Column(name = "ITEM_PART_NAM") @ApiParam(value = "子料物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String itemPartNam; @Column(name = "ITEM_UNIT") @ApiParam(value = "子计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemUnit; @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "子用量") @ColumnDefault("0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double itemQty; @Column(name = "BOM_NUM") @ApiParam(value = "BOM编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomNum; @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomVersion; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_START_TIME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String effStartTime; @@ -99,17 +99,17 @@ public class WmsBom extends BaseBean { @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_END_TIME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String effEndTime; @Column(name = "LOCATE_NO") @ApiParam(value = "线边库位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String locateNo; @Column(name = "TERMINAL_NO") @ApiParam(value = "工位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; @ApiParam(value = "目标存储区") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java index 6475e26..1616169 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java @@ -3,7 +3,7 @@ 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -35,61 +35,61 @@ import javax.persistence.Transient; public class WmsBomHistory extends BaseBean { @Column(name = "PART_NO") @ApiParam(value = "父物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "父物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "UNIT") @ApiParam(value = "计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String unit; @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "数量") @ColumnDefault("0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Column(name = "ITEM_PART_NO") @ApiParam(value = "子物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String itemPartNo; @Column(name = "ITEM_PART_NAM") @ApiParam(value = "子料物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String itemPartNam; @Column(name = "ITEM_UNIT") @ApiParam(value = "子计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemUnit; @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "子用量") @ColumnDefault("0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double itemQty; @Column(name = "BOM_NUM") @ApiParam(value = "BOM编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomNum; @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomVersion; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_START_TIME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String effStartTime; @@ -97,22 +97,22 @@ public class WmsBomHistory extends BaseBean { @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_END_TIME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String effEndTime; @Column(name = "LOCATE_NO") @ApiParam(value = "线边库位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String locateNo; @Column(name = "TERMINAL_NO") @ApiParam(value = "工位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; @Column(name = "NEW_BOM_VERSION") @ApiParam(value = "工位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String newBomVersion; @ApiParam(value = "目标存储区") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java index 6c8b97a..f32d795 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,7 +14,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 车辆信息 @@ -26,43 +27,60 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_CAR") +@Table(name = "WMS_CAR") @Api("车辆信息") public class WmsCar extends BaseBean { - @Column(name="CAR_NO") - @ApiParam(value ="车牌号") + @Column(name = "CAR_NO") + @ApiParam(value = "车牌号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String carNo; - @Column(name="CAR_DESC") - @ApiParam(value ="车辆描述") + @Column(name = "CAR_DESC") + @ApiParam(value = "车辆描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String carDesc; - @Column(name="MAX_CAPACITY") - @ApiParam(value ="载重量(KG)") + @Column(name = "MAX_CAPACITY") + @ApiParam(value = "载重量(KG)") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String maxCapacity; - @Column(name="DRIVER_NO") - @ApiParam(value ="默认驾驶员") + @Column(name = "DRIVER_NO") + @ApiParam(value = "默认驾驶员") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsTmsDriver", + searchColumnName = "driverNo,driverName", listColumnName = "driverNo,driverName", explicitColumnName = "driverNo") private String driverNo; - @Column(name="PHONE") - @ApiParam(value ="车主电话") + @Column(name = "PHONE") + @ApiParam(value = "车主电话") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String phone; - @Column(name="VENDOR_NO") - @ApiParam(value ="所属供应商") + @Column(name = "VENDOR_NO") + @ApiParam(value = "所属供应商") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorNo; - @Transient - @ApiParam("司机名称") + @Column(name = "DRIVER_NAME_RDD") + @ApiParam("驾驶员名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsTmsDriver", + searchColumnName = "driverNo,driverName", listColumnName = "driverNo,driverName", explicitColumnName = "driverName") private String driverNameRdd; - @Transient + @Column(name = "VENDOR_NAME_RDD") @ApiParam(value = "供应商名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName") private String vendorNameRdd; @Column(name = "MAP_LOCATION") @ApiParam("经纬度") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String mapLocation; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java index 3c51124..5529e33 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java @@ -1,20 +1,20 @@ 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.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; -import org.hibernate.annotations.ColumnDefault; 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; /** * @Description :容器类型 @@ -33,22 +33,27 @@ import javax.persistence.Transient; public class WmsContainerType extends BaseBean { private static final long serialVersionUID = 4849044986767609347L; @ApiParam(value = "容器类型代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String ctCode; @Column(name = "CT_NAME") @ApiParam(value = "容器类型名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String ctName; @Column(name = "USE_LIMIT") @ApiParam(value = "使用期限") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private Integer useLimit; @Column(name = "IS_RECYCLE") @ApiParam(value = "是否回收") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isRecycle; @Column(name = "LIMIT_UOM") @ApiParam(value = "期限单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String limitUom; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java index a6845a4..4ceaa41 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -3,6 +3,7 @@ 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.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -37,77 +38,86 @@ public class WmsCsStrategy extends BaseBean implements Serializable { @Column(name = "STRATEGY_NAME") @ApiParam(value = "策略名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String strategyName; @Column(name = "part_type") @ApiParam(value = "物料分类") @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_ABC") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_ABC") private String partType; @Column(name = "STRATEGY_TYPE") @ApiParam(value = "策略分类", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "CS_STRATEGY_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "CS_STRATEGY_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class) private Integer strategyType; @Column(name = "CYCLE_RULE") @ApiParam(value = "循环规则") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String cycleRule; @Column(name = "START_DATE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "开始日期", example = "0") private String startDate; @Column(name = "END_DATE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "结束日期", example = "0") private String endDate; @Column(name = "NUM_MAX") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) @ApiParam(value = "明细数量上限") private Integer numMax; @Column(name = "COVERAGE_RATE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) @ApiParam(value = "抽盘覆盖率") private Double coverageRate; @Column(name = "ZONE_NOS") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "存储区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNos; @Column(name = "LOCATES") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "盘点库位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locates; @Column(name = "last_run_time") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "上次运行时间") private String lastRunTime; @Column(name = "next_run_time") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "下次运行时间") private String nextRunTime; @Column(name = "REMAKE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) @ApiParam(value = "备注") private String remake; - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "已盘物料") - @Column(name="INVENTORY_MATERIAL") + @Column(name = "INVENTORY_MATERIAL") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String inventoryMaterial; - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "已盘库位") - @Column(name="INVENTORY_LOCATION") - private String inventoryLocation; + @Column(name = "INVENTORY_LOCATION") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") + private String inventoryLocation; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java index 6e25a2b..3e7e870 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 客户零件关系表 @@ -32,21 +33,34 @@ public class WmsCustomerPart extends BaseBean { private static final long serialVersionUID = 3903166651913139058L; @Column(name = "CUSTOMER_CODE") @ApiParam(value = "客户代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") private String customerCode; @Column(name = "PART_NO") @ApiParam(value = "物料号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "CUSTOMER_PART_NO") @ApiParam(value = "客户零件号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String customerPartNo; - @Transient + @Column(name = "CUSTOMER_DESC") @ApiParam(value = "客户全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custDesc") private String custDesc; - @Transient + @Column(name = "PART_NAME") @ApiParam(value ="物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java index 2f2f3f9..4686917 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,21 +31,21 @@ import javax.persistence.Table; public class WmsDock extends BaseBean { @Column(name="DOCK_CODE") @ApiParam("道口代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockCode; @Column(name="DOCK_ADDRESS") @ApiParam("道口发运地址") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockAddress; @Column(name="DOCK_DESC") @ApiParam("道口发运地址描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockDesc; @Column(name="DOCK_TYPE") @ApiParam("道口类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "DOCK_TYPE") private Integer dockType; } 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..3c8d44e 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 @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,42 +33,42 @@ public class WmsDockOrderInfo extends BaseBean { @Column(name="DOCK_CODE") @ApiParam("道口代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockCode; @Column(name="ORDER_DATE") @ApiParam("预约日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String orderDate; @Column(name="WINDOW_TIME") @ApiParam("窗口时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String windowTime; @Column(name="ORDER_STATUS") @ApiParam("预约状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_ORDER_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "DOCK_ORDER_STATUS") private Integer orderStatus; @Column(name="SUPPLIER_CODE") @ApiParam("供应商编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String supplierCode; @Column(name="CAR_NO") @ApiParam("车辆编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String carNo; @Column(name="DRIVER_NAME") @ApiParam("驾驶员") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String driverName; @Column(name="ORDER_NO") @ApiParam("单据号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String orderNo; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java index 0084679..acdd899 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,11 +32,11 @@ public class WmsDockWindowTime extends BaseBean { @Column(name="DOCK_CODE") @ApiParam("道口代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String dockCode; @Column(name="WINDOW_TIME") @ApiParam("窗口时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String windowTime; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java index 9b7661f..3e63579 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -33,32 +35,43 @@ public class WmsIbCheckPlan extends BaseBean{ private static final long serialVersionUID = 3557978060450659460L; @Column(name="PART_NO") @ApiParam(value ="物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name="PART_NAME_RDD") @ApiParam(value ="物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name="START_DATE") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value ="开始日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String startDate; @Column(name="END_DATE") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value ="结束日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String endDate; @Column(name="LOT_QTY") @ApiParam(value ="样本数量", example = "-1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer lotQty; @Column(name="COUNTER") @ApiParam(value ="已收货件数", example = "-1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer counter; @Column(name="CHECK_COUNTER") @ApiParam(value ="已抽点件数", example = "-1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer checkCounter; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index a69e24b..dc5f9e6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -3,6 +3,7 @@ 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.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -35,12 +36,12 @@ public class WmsLocate extends BaseBean { private static final long serialVersionUID = -8425904594036746967L; @Column(name = "LOCATE_NO") @ApiParam(value = "库位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String locateNo; @Column(name = "LOCATE_NAME") @ApiParam(value = "库位名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String locateName; /** @@ -49,104 +50,106 @@ public class WmsLocate extends BaseBean { @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") @AnnoOutputColumn(refClass = WmsEnumUtil.LOCATE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LOCATE_TYPE") private Integer locateType; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WareHouse", + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "FURNITURE_NO") @ApiParam(value = "家具代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String furnitureNo; @Column(name = "X") @ApiParam(value = "X", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer x; @Column(name = "Y") @ApiParam(value = "Y", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer y; @Column(name = "Z") @ApiParam(value = "Z", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer z; @Column(name = "LC_LENGTH") @ApiParam(value = "长") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer lcLength; @Column(name = "LC_WIDTH") @ApiParam(value = "宽") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer lcWidth; @Column(name = "LC_HEIGHT") @ApiParam(value = "高") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer lcHeight; @Column(name = "SEQ") @ApiParam(value = "序号", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seq; @Column(name = "STATUS") @ApiParam(value = "库位状态", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "LOCATE_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "LOCATE_STATUS") private Integer status; @Column(name = "MAX_PACKAGE_QTY") @ApiParam(value = "最大包装数量", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer maxPackageQty; @Column(name = "MAX_PART_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大零件数量", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double maxPartQty; @Column(name = "STOCK_UNIT") @ApiParam(value = "存放单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockUnit; @Column(name = "LINE_CODE") @ApiParam(value = "生产线") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String lineCode; @Column(name = "BOX_QTY") @ApiParam(value = "箱数", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer boxQty; @Column(name = "PART_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "零件数", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double partQty; @Column(name = "ENCRYPTION_NO") @ApiParam(value = "加密编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String encryptionNo; @Column(name = "LAST_CS_TIME") @ApiParam(value = "末次盘点时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String lastCsTime; @Column(name = "POSITION") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index c4b5956..47d5248 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,38 +34,53 @@ public class WmsLocatePart extends BaseBean { private static final long serialVersionUID = 9134745988014340144L; @Column(name = "LOCATE_NO") @ApiParam(value = "库位编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name = "PART_NO") @ApiParam(value = "物料代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "PART_NAME_RDD") @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "拉动数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double pullQty; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double max; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最小值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double min; @Column(name = "IS_GENERATE_PICKLIST") @ApiParam(value = "是否生成领料单", example = "2") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isGeneratePicklist; @Column(name = "SAFETY_STOCK", columnDefinition = "decimal(18,8)") @ApiParam(value = "安全库存", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double safetyStock; @Column(name = "MOQ", columnDefinition = "decimal(18,8)") @ApiParam(value = "起订量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double moq; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index d221a61..87ab093 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -1,7 +1,9 @@ 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.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -37,41 +39,58 @@ public class WmsMoveDetails extends BaseBean { private static final long serialVersionUID = -5898637337319011710L; @Column(name = "ORDER_NO") @ApiParam("单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String orderNo; @Column(name = "ITEM") @ApiParam(value = "行号", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Integer item; @Column(name = "PART_NO") @ApiParam("物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") public String partNo; @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") public String partNameRdd; @Column(name = "VENDOR_NO") @ApiParam("供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") public String vendorNo; @Column(name = "CUST_NO") @ApiParam("客户编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") public String custNo; @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "处理数量", example = "0") @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double transQty; @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "已处理数量", example = "0") @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double handledQty; @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "不合格处理数量", example = "0") @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double rejectQty; public Double getRejectQty() { @@ -80,30 +99,49 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "UNIT") @ApiParam("单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String unit; @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") public String srcWhNo; @Column(name = "SRC_ZONE_NO") @ApiParam("源存储区代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") public String srcZoneNo; @Column(name = "SRC_LOCATE_NO") @ApiParam("源库位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") public String srcLocateNo; @Column(name = "DEST_WH_NO") @ApiParam("目标仓库代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") public String destWhNo; @Column(name = "DEST_ZONE_NO") @ApiParam("目标存储区代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") public String destZoneNo; @Column(name = "DEST_LOCATE_NO") @ApiParam("目标库位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") public String destLocateNo; /** @@ -112,10 +150,12 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "0") @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MOVE_ORDER_STATUS") public Integer itemStatus; @Column(name = "REF_ITEM") @ApiParam("关联单据行号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refItem; /** @@ -123,14 +163,17 @@ public class WmsMoveDetails extends BaseBean { */ @Column(name = "REF_TYPE") @ApiParam("关联单据类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LINK_ORDER_TYPE") public String refType; @Column(name = "REF_SRC") @ApiParam("关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; @Column(name = "GROUP_NO") @ApiParam("分组号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String groupNo; @ApiParam(value = "待出库数量", example = "0") @@ -200,6 +243,7 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "CONSIGNATION") @ApiParam("是否寄售 1-是 2-否") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer consignation = 2; public Integer getIsSnapshot() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java index 71eb010..702df84 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,14 +13,13 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** - * @Description :容器类型 + * @Description :包装规格 * @Reference : - * @Author : 容器类型 + * @Author : * @CreateDate : 2019-11-07 16:06 - * @Modify: + * @Modify: 2020-04-27 修改头部描述-dragon **/ @Data @Entity @@ -30,34 +31,45 @@ import javax.persistence.Transient; public class WmsPackageSpec extends BaseBean { private static final long serialVersionUID = 4849044986767609445L; @ApiParam(value = "包装规格代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String specCode; @Column(name = "SPEC_NAME") @ApiParam(value = "包装规格名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String specName; @Column(name = "QTY") @ApiParam(value = "包装数量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double qty; @Column(name = "PARENT_SPEC") @ApiParam(value = "上级规格") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specCode") private String parentSpec; @Column(name = "SPEC_LEVEL") @ApiParam(value = "规格层级") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "SPEC_LEVEL") private Integer specLevel; @Column(name = "IS_MIXED") @ApiParam(value = "是否混包") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isMixed; @Column(name = "POCKET_TYPE") @ApiParam(value = "容器类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/wms/wms-container-type/query", listColumnName = "ctName", explicitColumnName = "ctCode") private String pocketType; @ApiParam(value = "上级规格名称") - @Transient + @Column(name = "PARENT_NAME") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specName") private String parentName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 58f5123..77039cd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -3,6 +3,7 @@ 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.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -32,237 +33,239 @@ import javax.persistence.*; @Api("物料表") public class WmsPart extends BaseBean { private static final long serialVersionUID = 4849044986767609346L; + @Column(name = "PART_NO") @ApiParam(value = "物料编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; - @Column(name = "PART_SPEC") - @ApiParam(value = "物料规格") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) - private String partSpec; + @Column(name = "PART_TYPE_DESC") + @ApiParam(value = "物料类型描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partTypeDesc; @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "WMS_PART_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_PART_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class) private String partType; - @Column(name = "PART_TYPE_DESC") - @ApiParam(value = "物料类型描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) - private String partTypeDesc; + @Column(name = "STOCK_UNIT") + @ApiParam(value = "库存单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") + private String stockUnit; + + @Column(name = "IN_LOCATE_NO") + @ApiParam(value = "默认入库库位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") + private String inLocateNo; + + @Column(name = "SNP", columnDefinition = "decimal(18,8)") + @ApiParam(value = "标包", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double snp; + + @ColumnDefault("2") + @Column(name = "IQC") + @ApiParam(value = "是否免检", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") + private Integer iqc; + + @Column(name = "PART_SPEC") + @ApiParam(value = "物料规格") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partSpec; @Column(name = "GRAPHI_NO") @ApiParam(value = "图号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String graphiNo; @Column(name = "VERSION") @ApiParam(value = "版本") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String version; @Column(name = "COLOR") @ApiParam(value = "颜色") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String color; - @Column(name = "STOCK_UNIT") - @ApiParam(value = "库存单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") - private String stockUnit; - @Column(name = "ABC") @ApiParam(value = "分类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String abc; @Column(name = "BUY_UNIT") @ApiParam(value = "采购单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") private String buyUnit; @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double bu2su; @Column(name = "PRICE_UNIT") @ApiParam(value = "计价单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") private String priceUnit; @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double pu2su; - @Column(name = "SNP", columnDefinition = "decimal(18,8)") - @ApiParam(value = "标包", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Double snp; - - @ColumnDefault("2") - @Column(name = "IQC") - @ApiParam(value = "是否免检", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") - private Integer iqc; - @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double min; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double max; @Column(name = "PART_GROUP") @ApiParam(value = "物料组") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") private String partGroup; @Column(name = "LOT_CHECK_RULE") @ApiParam(value = "批次校验规则") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") private String lotCheckRule; @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer snControl; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorNo; - @Column(name = "IN_LOCATE_NO") - @ApiParam(value = "默认入库库位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", - searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") - private String inLocateNo; - @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeName; @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseFlag = "2"; @Column(name = "OUT_CLOSE_TYPE") @ApiParam("结算方式") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseType; @Column(name = "OUT_CLOSE_VENDOR") @ApiParam("结算供应商") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String outCloseVendor; @Column(name = "QUALITY_DAYS") @ApiParam("保质期天数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer qualityDays; @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @ApiParam("报工库位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportLocateNo; @Column(name = "REPORT_ZONE_NO") @ApiParam("报工存储区") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportZoneNo; @Column(name = "PRODUCT_LINES") @ApiParam("报工产线") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode") private String productLines; @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") @ApiParam(value = "待质检比例", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "IS_VALUABLE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "IS_VALUABLE") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; @Transient @ApiParam("总数量") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Transient @ApiParam("库存水平") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockLevelStatus; @Column(name = "verb_num") @ApiParam(value = "单次拆包数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double verbNum; @Column(name = "IS_PROD_LOT") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.MULTIPLE_ENUM, - isRequire = 2, entityName = "PULL_WAY_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, isRequire = 2, dataSrc = "PULL_WAY_STATUS") @ApiParam(value = "拉动方式") private String pullWay; @Column(name = "TAIL_QTY_MODE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE") @ApiParam(value = "尾数计算方式", example = "1") private Integer tailQtyMode; @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer cycleRquestPeriod = 0; @Column(name = "CYCLE_RQUEST_QTY") @ApiParam(value = "循环补货数量", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double cycleRquestQty = 0d; @Column(name = "CURING_TIME") @ApiParam(value = "固化时间", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double curingTime = 0d; public int getIqcVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java index 5af3d21..d96f8c2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,26 +32,26 @@ public class WmsPartCheckType extends BaseBean { @Column(name = "WORK_CENTER_CODE") @ApiParam("产线代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String workCenterCode; @Column(name = "PART_NO") @ApiParam("物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partNo; @Column(name = "PART_NAME") @ApiParam("物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partName; @Column(name = "CHECK_TYPE") @ApiParam("检测大类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") private Integer checkType; @Column(name = "SAMPLE_SIZE") @ApiParam("样本数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer sampleSize; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index e01c45c..75d3389 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -39,121 +39,121 @@ public class WmsPartExtend extends BaseBean { @Column(name = "IS_SETTLE") @ApiParam(value = "是否内部交易") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isSettle; @Column(name = "SETTLE_FACTORY_CODE") @ApiParam(value = "结算工厂") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String settleFactoryCode; @Column(name = "SETTLE_REC_ERP_WH") @ApiParam(value = "结算物料收货库存") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String settleRecErpWh; @Column(name = "VALUATION_CLASS") @ApiParam(value = "评估类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String valuationClass; @Column(name = "VALUATION_CLASS_NAME") @ApiParam(value = "评估类描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String valuationClassName; @Column(name = "MC_CODE") @ApiParam(value = "MRP控制者") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String mcCode; @Column(name = "MC_NAME") @ApiParam(value = "MRP控制者名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String mcName; @Column(name = "IS_STEEL") @ApiParam(value = "是否为钢卷料") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_STEEL_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_STEEL_TYPE") private Integer isSteel; @Column(name = "IS_PACKAGE_MATERIAL") @ApiParam(value = "是否为包材") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isPackageMaterial; @Column(name = "RECEIVING_TYPE") @ApiParam(value = "收货类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String receivingType; @Column(name = "LOT_CONTROL") @ApiParam(value = "批次控制") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lotControl; @Column(name = "RANGE_LOT") @ApiParam(value = "批次容差") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer rangeLot; @Column(name = "QUALITY_RATE") @ApiParam(value = "质检率") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double qualityRate; @Column(name = "ROUTING") @ApiParam(value = "工艺") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String routing; @Column(name = "PO_PART_MULTIPLE") @ApiParam(value = "乘倍包装") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String poPartMultiple; @Column(name = "RANGE_QTY_RATE") @ApiParam(value = "数量容差") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer rangeQtyRate; @Column(name = "RANGE_INVENTORY") @ApiParam(value = "盘点容差") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer rangeInventory; @Column(name = "PROD_LINE") @ApiParam(value = "产品类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String prodLine; @Column(name = "SUPPLY_TYPE") @ApiParam(value = "供货类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_SUPPLY_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_SUPPLY_TYPE") private Integer supplyType; @Column(name = "RECEIVING_MODE") @ApiParam(value = "收货方式") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_RECEIVING_METHOD") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_RECEIVING_METHOD") private Integer receivingMethod; @Column(name = "PRE_RECEIVING_DAY") @ApiParam(value = "预收货天数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer preReceivingDay; @Column(name = "IS_WAY_CALCULATION") @ApiParam(value = "是否计算在途库存") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isWayCalculation; @Column(name = "IS_AUTO_PURCHASE") @ApiParam(value = "是否自动采购") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isAutoPurchase; @Column(name = "AUTO_PURCHASE_QTY") @ApiParam(value = "自动采购数量") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer autoPurchaseQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java index 9641130..5265509 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,9 +33,11 @@ public class WmsPartGroup extends BaseBean{ private static final long serialVersionUID = 9214639813072864436L; @Column(name="PART_GROUP_NO") @ApiParam("物料组编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partGroupNo; @Column(name="PART_GROUP_NAME") @ApiParam("物料组名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partGroupName; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index 8498c36..78f8058 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,46 +32,46 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "WORK_CENTER_CODE") @ApiParam("产线代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String workCenterCode; @Column(name = "PART_NO") @ApiParam("物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partNo; @Column(name = "CHECK_TYPE") @ApiParam("检测大类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") private Integer checkType; @Column(name = "CHECK_ITEM_CODE") @ApiParam("子检测项代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String checkItemCode; @Column(name = "CHECK_ITEM_NAME") @ApiParam("子检测项名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String checkItemName; @Column(name = "VALUE_TYPE") @ApiParam("子检测箱值类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") private Integer valueType; @Column(name = "STANDARD") @ApiParam("标准值") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double standard; @Column(name = "MAX") @ApiParam("最大值") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double max; @Column(name = "MIN") @ApiParam("最小值") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double min; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java index e7dc3ca..2896d6e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -16,11 +14,11 @@ import javax.persistence.Table; import javax.persistence.Transient; /** - * @Description :容器类型 + * @Description :物料包装关系 * @Reference : - * @Author : 容器类型 + * @Author : * @CreateDate : 2019-11-07 16:06 - * @Modify: + * @Modify: 2020-04-27 修改头部描述-dragon **/ @Data @Entity diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java index 4539336..a90107b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,10 +33,12 @@ public class WmsProdCfgType extends BaseBean { private static final long serialVersionUID = -131043081244530896L; @Column(name="PROD_CFG_TYPE_CODE") @ApiParam("项目代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String prodCfgTypeCode; @Column(name="PROD_CFG_TYPE_NAME") @ApiParam("项目名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String prodCfgTypeName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java index 90b3a58..52d22b3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,7 +12,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -31,21 +30,21 @@ import javax.persistence.Table; public class WmsPullRule extends BaseBean { @Column(name = "PULL_WAY") @ApiParam(value = "拉动类型", example = "10") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PULL_WAY_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_WAY_STATUS") private Integer pullWay; @Column(name = "CONTAIN_UNFINISH_ORDER") @ApiParam(value = "考虑未完成的移库单", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer containUnfinishOrder; @Column(name = "CONTAIN_EXIST_PERIOD") @ApiParam(value = "考虑现有库存", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer containExistStock; @Column(name = "TAIL_QTY_MODE") @ApiParam(value = "尾数计算方式", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE") private Integer tailQtyMode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java index aa9559c..00fa875 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,42 +34,56 @@ public class WmsPullTaskMaster extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String woekorderNo; @Column(name="PDLINE_NO") @ApiParam("产线代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter", + searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode") private String pdlineNo; @Column(name="PLAN_PRODUCT_TIME") @ApiParam("生产日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String planProductTime; @Column(name="SHIFT_NO") @ApiParam("班次代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift", + searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo") private String shitNo; @Column(name="START_PRODUCT_TIME") @ApiParam("开始生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String startProductTime; @Column(name="END_PRODUCT_TIME") @ApiParam("结束生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String endProductTime; @Column(name="ORDER_STATUS") @ApiParam(value = "单据状态", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_TASK_MASTER_STATUS") private Integer orderStatus = 0; @Column(name="IS_SUSPEND") @ApiParam(value = "是否暂停", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isSuspend = 2; @Column(name="PULL_TASK_TYPE") @ApiParam(value = "拉动任务类型", example = "10") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_TASK_TYPE") private Integer pullTaskType; @Column(name="SEQ") @ApiParam(value = "排序号", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer seq; public Integer getOrderStatus() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 33ed3df..bfe28bc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -1,7 +1,9 @@ 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.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -34,6 +36,7 @@ public class WmsQCMaster extends BaseBean { private static final long serialVersionUID = 2701710669030092148L; @Column(name = "ORDER_NO") @ApiParam("单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String orderNo; /** @@ -43,6 +46,7 @@ public class WmsQCMaster extends BaseBean { @Column(name = "ORDER_TYPE") @ApiParam(value = "业务类型", example = "0") @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "QC_INFO_TYPE") public Integer orderType; /** @@ -51,48 +55,67 @@ public class WmsQCMaster extends BaseBean { @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MASTER_ORDER_STATUS") public Integer orderStatus; @Column(name = "REMARK") @ApiParam("备注") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String remark; @Column(name = "CUST_NO") @ApiParam("客户编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") public String custNo; @Column(name = "VENDOR_NO") @ApiParam("供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") public String vendorNo; @Column(name = "VERSION") @ApiParam(value = "版本", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Integer version; @Column(name = "REF_TYPE") @ApiParam("关联单号类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LINK_ORDER_TYPE") public String refType; @Column(name = "REF_SRC") @ApiParam("关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; - @Transient + @Column(name = "CUST_NAME") @ApiParam(value = "客户简称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custName", listColumnName = "custNo,custName", explicitColumnName = "custNo") private String custName; - @Transient - @ApiParam(value = "供应商简称") + @Column(name = "VENDOR_DESC") + @ApiParam(value = "供应商全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,VendorDesc", listColumnName = "vendorNo,VendorDesc", explicitColumnName = "vendorNo") private String VendorDesc; @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "IS_GENERAL_TASK") public Integer isTask; @Column(name = "IS_PART") @ApiParam(value = "是否散件", example = "2") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") public Integer isPart; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java index 1ac54c6..67c0edd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,26 +35,32 @@ public class WmsRouting extends BaseBean { private static final long serialVersionUID = 7759454799191378612L; @Column(name = "ROUTING_CODE") @ApiParam(value = "线路代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String routingCode; @Column(name = "ROUTING_NAME") @ApiParam(value = "线路名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String routingName; @Column(name = "ROUTING_DESC") @ApiParam(value = "线路描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String routingDesc; @Column(name = "FOR_PROUCT_CLASS") @ApiParam(value = "适用产品分类") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer forProductClass; @Column(name = "FOR_WAREHOUSE") @ApiParam(value = "适用仓库", example ="1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer forWareHouse; @Column(name = "FOR_PRODUCT") @ApiParam(value = "适用产品") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer forProduct; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java index b894c55..40f637d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,17 +34,21 @@ public class WmsShift extends BaseBean{ @Column(name="SHIFT_NO") @ApiParam("班次编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shiftNo; @Column(name="SHIFT_NAME") @ApiParam("班次名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shiftName; @Column(name="START_TIME") @ApiParam("开始时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String startTime; @Column(name="END_TIME") @ApiParam("结束时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String endTime; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java index a64dc8f..2ce24ae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,45 +34,60 @@ public class WmsShippingFlag extends BaseBean { @Column(name = "CUST_NO") @ApiParam(value = "客户编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custName", listColumnName = "custNo,custName", explicitColumnName = "custNo") private String custNo; @Column(name = "FLAG_NO") @ApiParam(value = "客户发往地编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String flagNo; @Column(name = "FLAG_NAME") @ApiParam(value = "客户发往地名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String flagName; @Column(name = "SHIPP_QTY") @ApiParam(value = "发运数量控制") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer shippQty; @Column(name = "FLAG_DESC") @ApiParam(value = "全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagDesc; @Column(name = "FLAG_ADDR") @ApiParam(value = "客户发往地址") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagAddr; @Column(name = "FLAG_OWNER") @ApiParam(value = "联系人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagOwner; @Column(name = "FLAG_EMAIL") @ApiParam(value = "邮箱") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagEmail; @Column(name = "FLAG_TEL") @ApiParam(value = "联系人电话") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagTel; @Column(name = "FLAG_FAX") @ApiParam(value = "传真") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagFax; @Column(name="TEMPLATE_NO") @ApiParam("模板编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/wms/label/sys-label-template/cloud-query", + searchColumnName = "templateCode,templateName",listColumnName = "templateCode,templateName", explicitColumnName = "templateCode") private String templateNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 127238a..63e33e3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -3,6 +3,7 @@ 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.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -34,7 +35,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "SN") @ApiParam(value = "条码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String sn; @Column(name = "LINE_CODE") @@ -77,12 +78,12 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam(value = "操作类型") @AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "SN_OPERATE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "SN_OPERATE_TYPE") private Integer operateType; @Column(name = "ref_sn") @ApiParam(value = "关联二维码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refSN; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 314f299..70f8c54 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -1,7 +1,9 @@ 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.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -12,11 +14,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.Date; import java.util.List; @@ -52,75 +50,107 @@ public class WmsStockSn extends BaseBean { private static final long serialVersionUID = 4869307400585363697L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "LOCATE_NO") @ApiParam(value = "库位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name = "PART_NO") @ApiParam(value = "物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "PART_NAME_RDD") @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name = "LOT_NO", nullable = false) @ApiParam("收货批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String lotNo = ""; @Column(name = "DATE_CODE", nullable = false) @ApiParam(value = "供应商批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String dateCode = ""; @Column(name = "FIX_LOT_NO", nullable = false) @ApiParam(value = "特殊批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String fixLotNo = ""; @Column(name = "QUALITY_DATE") @ApiParam("保质期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String qualityDate; @Column(name = "LEFT_CODE", nullable = false) @ApiParam(value = "生产批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String leftCode = ""; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") public String vendorNo; @Column(name = "CUST_NO") @ApiParam(value = "客户编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") private String custNo; @Column(name = "SHIPPING_FLAG") @ApiParam(value = "发往地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shippingFlag; @Column(name = "SN") @ApiParam(value = "条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String sn; @Column(name = "SN_2D") @ApiParam(value = "二维码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String sn2d; @Column(name = "PACKAGE_NO") @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String packageNo; @Column(name = "UNIT") @ApiParam(value = "单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unit; @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty = 0d; /** @@ -128,49 +158,58 @@ public class WmsStockSn extends BaseBean { */ @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "STOCK_SN_QC_STATUS") private Integer qcStatus; /** * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 */ @Column(name = "SN_STATUS") @ApiParam(value = "条码状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "STOCK_SN_STATUS") private Integer snStatus; /** * 1:已打印；2：未打印；3：退料生成条码 */ @Column(name = "PRINTED") @ApiParam(value = "是否打印", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "PRINT_STATUS") private Integer printed; @Column(name = "PDATE") @ApiParam(value = "打印时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private Date pdate; /** * 1=ASN,10=PO,20=SO */ @Column(name = "REF_TYPE") @ApiParam(value = "关联单据类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refType; @Column(name = "REF_SRC") @ApiParam(value = "关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refSrc; @Column(name = "CUST_SN") @ApiParam(value = "客户条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String custSn; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String workCenterCode; @Column(name = "SN_TYPE") @ApiParam(value = "条码类型", example = "10") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_STOCK_TYPE") private Integer snType = 10; @ApiParam(value = "仓库名称") @@ -395,8 +434,8 @@ public class WmsStockSn extends BaseBean { } - public WmsStockSn(Integer snStatus,String whNo,String locateNo,String partNo,String partNameRdd,String lotNo,Double qty){ - this.snStatus=snStatus; + public WmsStockSn(Integer snStatus, String whNo, String locateNo, String partNo, String partNameRdd, String lotNo, Double qty) { + this.snStatus = snStatus; this.whNo = whNo; this.locateNo = locateNo; this.partNo = partNo; @@ -405,7 +444,7 @@ public class WmsStockSn extends BaseBean { this.qty = qty; } - public WmsStockSn(Long id,String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + public WmsStockSn(Long id, String sn, String partNo, String partNameRdd, String unit, Integer snStatus, Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo, String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd, String qualityDate, String custNo, String lotCheckRule, String sn2d, @@ -439,17 +478,17 @@ public class WmsStockSn extends BaseBean { this.modifyUser = modifyUser; } - public WmsStockSn (String partNo, String packageNo,String locateNo, String createDatetime, String modifyDatetime) { + public WmsStockSn(String partNo, String packageNo, String locateNo, String createDatetime, String modifyDatetime) { this.partNo = partNo; - this.packageNo =packageNo; + this.packageNo = packageNo; this.locateNo = locateNo; - this.createDatetime=createDatetime; + this.createDatetime = createDatetime; this.modifyDatetime = modifyDatetime; } - public WmsStockSn(Long id,String organizeCode,String sn, String partNo, String partNameRdd, String unit, Integer snStatus, - String areaNo,String partSpec,Integer qcStatus, Double qty, Long boxQtys, - String locateNo, String zoneNo, String whNo, String lotNo,String refSrc, + public WmsStockSn(Long id, String organizeCode, String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + String areaNo, String partSpec, Integer qcStatus, Double qty, Long boxQtys, + String locateNo, String zoneNo, String whNo, String lotNo, String refSrc, String dateCode, String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser) { this.id = id; @@ -477,9 +516,9 @@ public class WmsStockSn extends BaseBean { this.modifyUser = modifyUser; } - public WmsStockSn(Long id,String organizeCode,String sn, String partNo, String partNameRdd, String unit, Integer snStatus, - String areaNo,Integer qcStatus, Double qty, - String locateNo, String zoneNo, String whNo, String lotNo,String refSrc, + public WmsStockSn(Long id, String organizeCode, String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + String areaNo, Integer qcStatus, Double qty, + String locateNo, String zoneNo, String whNo, String lotNo, String refSrc, String dateCode, String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser) { this.id = id; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java index 9120e8d..1bab8d2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,21 +35,21 @@ public class WmsSubPart extends BaseBean { @Column(name = "PART_NO") @ApiParam(value = "物料编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "SUB_PART_NO") @ApiParam(value = "替代物料编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String subPartNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "SUB_PART_NAME") @ApiParam(value = "替代物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String subPartName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java index 3531e8f..6d7bec2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.UniqueConstraint; /** * @Description : 工位表 @@ -32,13 +33,18 @@ public class WmsTerminal extends BaseBean{ private static final long serialVersionUID = 9214639813072592713L; @Column(name="TERMINAL_NO") @ApiParam("工位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String terminalNo; @Column(name="TERMINAL_NAME") @ApiParam("工位名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String terminalName; @Column(name="PDLINE_NO") @ApiParam("产线代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter", + searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode") private String pdlineNo; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java index 0ecea20..9e6d386 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,33 +33,41 @@ public class WmsTmsDriver extends BaseBean { @Column(name="DRIVER_NO") @ApiParam(value ="驾驶员编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String driverNo; @Column(name="DRIVER_NAME") @ApiParam(value ="驾驶员姓名") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String driverName; @Column(name="SEX") @ApiParam(value ="驾驶员性别") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer sex; @Column(name="AGE") @ApiParam(value ="驾驶员年龄") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String age; @Column(name="ID_NO") @ApiParam(value ="驾驶员身份证号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String idNo; @Column(name="ADRESS") @ApiParam(value ="驾驶员籍贯") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String adress; @Column(name="PHONE") @ApiParam(value ="车牌号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String phone; @Column(name="LOGIN_NO") @ApiParam(value =" 登录账号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String loginNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index b163bbb..14fbf1f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -36,30 +38,47 @@ public class WmsTransQuan extends BaseBean { private static final long serialVersionUID = -7379945456037422449L; @Column(name = "TRANS_NO") @ApiParam(value = "事务编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String transNo; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "LOCATE_NO") @ApiParam(value = "库位编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name = "PART_NO") @ApiParam(value = "物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "PART_NAME_RDD") @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name = "UNIT") @ApiParam(value = "单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unit; @Column(name = "TRANS_STATUS") @@ -76,75 +95,95 @@ public class WmsTransQuan extends BaseBean { @Column(name = "REF_SRC") @ApiParam(value = "关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refSrc; @Column(name = "TRANS_CODE") @ApiParam(value = "交易代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String transCode; @Column(name = "MOVE_NO") @ApiParam(value = "库存移动单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String moveNo; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorNo; @Column(name = "CUST_NO") @ApiParam(value = "客户编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") private String custNo; @Column(name = "ERROR_MESSAGE") @ApiParam(value = "错误信息") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String errorMessage; @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double qty; @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double failQty; @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double holdQty; @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double qcQty; @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double rinQty; @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double freezeQty; @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double consignQty; @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double lockQty; @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double scrapQty; @Column(name="TRANS_TYPE_NAME") @ApiParam(value ="交易名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String transTypeName; /*@Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java index 8d9a807..744f71c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -3,6 +3,7 @@ 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.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -10,7 +11,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; @@ -39,46 +44,46 @@ public class WmsTransportRule extends BaseBean { @Column(name = "BUSI_TYPE") @ApiParam("业务类型") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_MOVEMENT_BUSI_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "OUT_MOVEMENT_BUSI_TYPE") public Integer busiType; @Column(name = "BUSI_SCENE_TYPE") @ApiParam("业务场景") @AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BUSI_SCENE_TYPE") public Integer busiSceneType; @Column(name = "SRC_AREA_NO") @ApiParam("发货库存地") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String srcAreaNo; @Column(name = "DEST_AREA_NO") @ApiParam("目标库存地") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String destAreaNo; @Column(name = "OUT_VENDOR_NO") @ApiParam("委外供应商编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String outVendorNo; @Column(name = "PART_NO") @ApiParam("物料编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String partNo; @Column(name = "CUST_NO") @ApiParam("客户代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String custNo; @Column(name = "IS_TRANSPORT") @ApiParam("是否安排运输") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") public Integer isTransport; @Column(name = "REMARK",length = 255) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 290f7c0..84ce516 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,14 +33,17 @@ public class WmsUnit extends BaseBean { private static final long serialVersionUID = 7332606009041273554L; @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unitCode; @Column(name = "UNIT_NAME") @ApiParam(value = "单位名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unitName; @Column(name = "UNIT_PRECISION") @ApiParam(value = "单位精度") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer unitPrecision; public Integer getUnitPrecisionValue(){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java index 03e877d..5fbc76e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,14 +33,17 @@ public class WmsUnitConvert extends BaseBean { private static final long serialVersionUID = -466720560879335877L; @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unitCode; @Column(name = "DEST_UNIT_CODE") @ApiParam(value = "目标单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String destUnitCode; @Column(name = "UNIT_COEFFICIENT", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double unitCoefficient; public Double getUnitCoefficientVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java index 042c111..bcd0499 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 供应商零件关系 @@ -22,20 +23,26 @@ import javax.persistence.Transient; **/ @Data @Entity -@Table(name="WMS_VENDOR_PART") +@Table(name = "WMS_VENDOR_PART") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="供应商零件关系",description = "供应商零件关系") +@Api(value = "供应商零件关系", description = "供应商零件关系") public class WmsVendorPart extends BaseBean { private static final long serialVersionUID = 7339520734918140529L; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorNo; @Column(name = "PART_NO") @ApiParam(value = "物料号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "VENDOR_PART_NO") @@ -44,14 +51,20 @@ public class WmsVendorPart extends BaseBean { @Column(name = "MAX_AMOUNT") @ApiParam(value = "供应商月提供最大数量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double maxAmount; - @Transient + @Column(name = "PART_NO_NAME") @ApiParam("物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partName; - - @Transient + @Column(name = "VENDOR_NAME") @ApiParam("供应商名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName") private String vendorName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java index 6da587b..241599c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,30 +33,43 @@ public class WmsWorkCenter extends BaseBean { private static final long serialVersionUID = 415180808859365167L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String workCenterCode; @Column(name = "WORK_CENTER_NAME") @ApiParam(value = "工作中心名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String workCenterName; @Column(name = "ERP_WORK_CENTER") @ApiParam(value = "ERP_工作中心") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String erpWorkCenter; @Column(name = "WORK_VER") @ApiParam(value = "生产版本") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String workVer; @Column(name = "SRC_ZONE_NO") @ApiParam(value = "原料扣减库区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String srcZoneNo; @Column(name = "DESC_ZONE_NO") @ApiParam(value = "成品库区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String descZoneNo; @Column(name = "DESC_LOCATION_CODE") @ApiParam(value = "成品库位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String descLocationCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java index 9175316..1a792c6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 工作中心线边库区关系 @@ -28,21 +29,33 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Api(value="工作中心线边库区关系",description = "工作中心线边库区关系") public class WmsWorkCenterZone extends BaseBean { - private static final long serialVersionUID = 950689993212839817L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter", + searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode") private String workCenterCode; @Column(name = "ZONE_NO") @ApiParam(value = "线边库区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; - @Transient + @Column(name = "WORK_CENTER_NAME") @ApiParam("工作中心名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter", + searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterName") private String workCenterName; - @Transient + @Column(name = "ZONE_NAME") @ApiParam("线边库区名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneName") private String zoneName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java index 11d9020..78913f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,42 +34,57 @@ public class WmsZonePart extends BaseBean{ private static final long serialVersionUID = 9214639813072592546L; @Column(name="ZONE_NO") @ApiParam("存储区编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name="PART_NO") @ApiParam("物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name="PART_NAME_RDD") @ApiParam("物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name="PULL_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "拉动数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double pullQty; @Column(name="MAX", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "最大值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double max; @Column(name="MIN", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "最小值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double min; @Column(name = "IS_GENERATE_PICKLIST") @ApiParam(value = "是否生成领料单", example = "2") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isGeneratePickList; @Column(name="MOQ", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "起订量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double moq; @Column(name="SAFETY_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "安全量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double safetyQty; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index f916604..5d1e4b0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,82 +35,82 @@ public class WmsZones extends BaseBean { private static final long serialVersionUID = 7759454799191378612L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String whNo; @Column(name = "AREA_NO") @ApiParam(value = "库存地代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String zoneNo; @Column(name = "ZONE_NAME") @ApiParam(value = "存储区名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String zoneName; @Column(name = "PARENT_ZONE_NO") @ApiParam(value = "父级存储区", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String parentZoneNo; @Column(name = "IS_SON_NODE") @ApiParam(value = "是否子节点") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "TRUE_OR_FALSE") private Integer isSonNode; @Column(name = "IS_PM") @ApiParam(value = "零件级管控", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isPm; @Column(name = "IS_LM") @ApiParam(value = "批次级管控", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isLm; @Column(name = "IS_SN") @ApiParam(value = "条码级管控", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isSn; @Column(name = "IS_MIX") @ApiParam(value = "允许混淆", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isMix; @Column(name = "IS_SC") @ApiParam(value = "库容检查", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isSc; @Column(name = "STRATEGY") @ApiParam(value = "堆放策略") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String strategy; @Column(name = "IS_NEGATIVE") @ApiParam(value = "允许负库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isNegative; @Column(name = "CHECK_FIFO") @ApiParam(value = "校验先进先出", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer checkFifo; @Column(name = "ZONE_LENGTH") @ApiParam(value = "长") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer zoneLength; @Column(name = "ZONE_WIDTH") @ApiParam(value = "宽") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer zoneWidth; @Column(name = "POSITION") @@ -119,17 +119,17 @@ public class WmsZones extends BaseBean { @Column(name = "ZONE_PULL_WAY") @ApiParam(value = "补货方式", example = "10") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "ZONE_PULL_WAY") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "ZONE_PULL_WAY") private Integer zonePullWay; @Column(name = "PULL_CYCLE") @ApiParam(value = "固定拉动周期", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer pullCycle; @Column(name = "LAST_PULL_TIME") @ApiParam(value = "上次拉动时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String lastPullTime; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java index 01b511f..d7c87ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java @@ -7,10 +7,8 @@ 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.Index; -import javax.persistence.Table; + +import javax.persistence.*; /** * @Description : WMS字段信息表 @@ -21,14 +19,18 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_FIELDINFO", indexes = { +@Table(name = "WMS_FIELDINFO", + indexes = { @Index(columnList = "FIELD_NAME"), - @Index(columnList = "ENTITY_NAME") -}) + @Index(columnList = "ENTITY_NAME")}, + uniqueConstraints = { + @UniqueConstraint(columnNames = { + "FIELD_NAME", "ENTITY_NAME"})} +) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="WMS字段信息表",description = "WMS字段信息表") +@Api(value = "WMS字段信息表", description = "WMS字段信息表") public class WmsFieldInfo extends BaseBean { private static final long serialVersionUID = 3903166651913139064L; @@ -109,7 +111,15 @@ public class WmsFieldInfo extends BaseBean { @ApiParam(value = "回显列名") private String explicitColumnName; - @Column(name = "DYNAMIC_FIELD_SELECT_RULE") + @Column(name = "IS_MULTIPLE") + @ApiParam(value = "是否多选") + private Integer isMultiple; + + @Column(name = "DATA_SRC") + @ApiParam(value = "数据来源") + private String dataSrc; + + @Column(name = "GET_VAL_WAY") @ApiParam(value = "下拉框规则") - private Integer selectRule; + private Integer getValWay; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java index 63c7ee5..5ebf953 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java @@ -89,9 +89,9 @@ public class WmsListElement extends BaseBean { @ApiParam(value = "字段类型") private Integer fieldType; - @Column(name = "DYNAMIC_FIELD_SELECT_RULE") + @Column(name = "DYNAMIC_FIELD_GET_WAY") @ApiParam(value = "下拉框规则") - private Integer selectRule; + private Integer getValWay; @Column(name = "ENTITY_NAME") @ApiParam(value = "实体名称") 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..e18d545 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 @@ -2921,7 +2921,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result); - DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "dataSrc", result); getStringBuilderPack(wmsFieldInfo, result); return result; } From 5fb7eecee078f3602c237e39f82393e1b29e2ddf Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 8 May 2020 20:36:34 +0800 Subject: [PATCH 51/52] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1752=20oee?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java | 4 ++++ 2 files changed, 6 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 ddb7f2e..156b353 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 @@ -5077,7 +5077,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum BOARD_TYPE { BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"), - BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"); + BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"), + BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"); private String code; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index d1dd2da..a115e99 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail; import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus; import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity; +import cn.estsh.i3plus.pojo.mes.bean.MesOee; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -48,4 +49,7 @@ public class BoardModel { @ApiParam("看板设备明细") private List boardEquDetailList; + + @ApiParam("oee") + private List oeeList; } From bbbdfae633f9c8b9446221c9b423655aa867431b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sat, 9 May 2020 11:15:46 +0800 Subject: [PATCH 52/52] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=88=86=E7=B1=BB=E5=AE=9E=E4=BD=93=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java index fe7f66d..63e108f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java @@ -20,6 +20,9 @@ public class BasBeanInfoModel implements Serializable { private static final long serialVersionUID = -6376845639646448495L; + @ApiParam(value = "系统名称") + public String systemName; + @ApiParam(value = "实体名称") public String entityName;