From 6ebc22e6ccd59341c09f9c94c8e15deceb589a2e Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 9 May 2019 17:42:48 +0800 Subject: [PATCH 01/11] =?UTF-8?q?master=E5=88=86=E6=94=AF=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i3plus-pojo.iml | 66 --------------- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-base/i3plus-pojo-base.iml | 89 -------------------- 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/i3plus-pojo-mes.iml | 90 --------------------- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/i3plus-pojo-model.iml | 94 ---------------------- modules/i3plus-pojo-model/pom.xml | 2 +- .../i3plus-pojo-platform/i3plus-pojo-platform.iml | 90 --------------------- modules/i3plus-pojo-platform/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/i3plus-pojo-wms.iml | 90 --------------------- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 22 files changed, 16 insertions(+), 535 deletions(-) delete mode 100644 i3plus-pojo.iml delete mode 100644 modules/i3plus-pojo-base/i3plus-pojo-base.iml delete mode 100644 modules/i3plus-pojo-mes/i3plus-pojo-mes.iml delete mode 100644 modules/i3plus-pojo-model/i3plus-pojo-model.iml delete mode 100644 modules/i3plus-pojo-platform/i3plus-pojo-platform.iml delete mode 100644 modules/i3plus-pojo-wms/i3plus-pojo-wms.iml diff --git a/i3plus-pojo.iml b/i3plus-pojo.iml deleted file mode 100644 index ec94526..0000000 --- a/i3plus-pojo.iml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 4390b84..de35473 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-base/i3plus-pojo-base.iml b/modules/i3plus-pojo-base/i3plus-pojo-base.iml deleted file mode 100644 index 5dd064c..0000000 --- a/modules/i3plus-pojo-base/i3plus-pojo-base.iml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 85a76cc..905bab0 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 c6141da..1b30904 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 23e5bee..9791e02 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 c1e2cb9..4310990 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 86d7736..5d974ea 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 09f2c4a..3bba14d 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/i3plus-pojo-mes.iml b/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..2ac5b34 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/i3plus-pojo-model.iml b/modules/i3plus-pojo-model/i3plus-pojo-model.iml deleted file mode 100644 index 97faa2e..0000000 --- a/modules/i3plus-pojo-model/i3plus-pojo-model.iml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 3185eca..199048f 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/i3plus-pojo-platform.iml b/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..0e49db7 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-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..3c56db1 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 4c96781..4a5f068 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 2c24e41..9830d2e 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/i3plus-pojo-wms.iml b/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..6c9b589 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 1171f4e..b8240c8 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 33e3f06..d728e0c 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 738276a1fa60c16c73f58e7940472b1f542daa4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 6 Jul 2019 18:01:06 +0800 Subject: [PATCH 02/11] 1 revert pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8975679..8c0c8cb 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base From fa4f58ec6c9195989259bc1c1230e32d6e816bf7 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 21 Oct 2019 21:20:46 +0800 Subject: [PATCH 03/11] =?UTF-8?q?pom=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-aps/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4426ba9..8a9ed9f 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 From c79786a67759916011a1cc7f74cd5e35c4f224fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 29 Oct 2019 15:04:25 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=88=86=E6=94=AF=E7=9A=84=E4=BB=A3=E7=A0=81POM=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=A2=AB=E6=94=B9=E6=88=90DEV=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=9B=9ETEST?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-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 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index b6adafd..4426ba9 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..d790ef1 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..c6141da 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..23e5bee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ffcac19..856da5f 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 7f12b9c..6c22c39 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..4c96781 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..2c24e41 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..18c811c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..1171f4e 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f355cca..f220aa1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From ac5432bebb3e7f652825beab8ab0f647b38b0edc Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 20 Nov 2019 16:10:44 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-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 | 3 ++- pom.xml | 2 +- 17 files changed, 18 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 810ab4a..f8fa98e 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 8a9ed9f..4426ba9 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 8217526..d790ef1 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 1b30904..c6141da 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 9791e02..23e5bee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 4310990..c1e2cb9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 9dbc071..856da5f 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 3bba14d..09f2c4a 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 2ac5b34..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index d05424f..b7b2dfc 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 0e49db7..ec9e100 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 3c56db1..bd09726 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 4a5f068..4c96781 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 9830d2e..2c24e41 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 6c9b589..18c811c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 0afae4e..1171f4e 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,8 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT ../../pom.xml + 1.0-TEST-SNAPSHOT + ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 5e89c84..dd9890a 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 modules/i3plus-pojo-model From 7004ad09719ddaf666827e81aab918945bd3f697 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 29 Nov 2019 14:31:51 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1211?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E8=B4=A8=E9=87=8F=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/IfRawPartDataModel.java | 2 +- .../i3plus/pojo/mes/model/QcCheckDataModel.java | 116 +++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 24 +++++ 3 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java index 65b038b..a55a07f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java @@ -57,7 +57,7 @@ public class IfRawPartDataModel extends BaseBean { private String supplierCode; @ApiParam("工厂代码") - private String organizationCode; + private String organizeCode; @ApiParam("同步状态") private Integer syncStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java new file mode 100644 index 0000000..d958a07 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java @@ -0,0 +1,116 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\29 11:34 + * @Modify: + **/ +@Data +public class QcCheckDataModel { + + private Long id; + public String organizeCode; + public String createUser; + public String createDatetime; + + @ApiParam("检测id") + private String checkId; + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("检测类型") + private Integer checkType; + + @ApiParam("检测项") + private String checkItem; + + @ApiParam("检测标准") + private String checkStandard; + + @ApiParam("检测指导") + private String checkGuide; + + @ApiParam("频率") + private String checkFrequency; + + @ApiParam("检测值") + private String checkValue; + + @ApiParam("判定结果") + private String checkResult; + + @ApiParam("产品条码") + private String sn; + + @ApiParam("产品数量") + private Integer qty; + + @ApiParam("备注") + private String memo; + + @ApiParam("工单号") + private String orderNo; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("班次") + private String shiftCode; + + @ApiParam("班组") + private String shiftGroupName; + + @ApiParam("班长") + private String squadLeader; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("物料名称") + private String partNoName; + + public QcCheckDataModel() { + + } + + public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partNoName) { + this.id = id; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.checkId = checkId; + this.partNo = partNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkGuide = checkGuide; + this.checkFrequency = checkFrequency; + this.checkValue = checkValue; + this.checkResult = checkResult; + this.sn = sn; + this.qty = qty; + this.memo = memo; + this.orderNo = orderNo; + this.custCode = custCode; + this.shiftCode = shiftCode; + this.shiftGroupName = shiftGroupName; + this.squadLeader = squadLeader; + this.workCellName = workCellName; + this.partNoName = partNoName; + } +} 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 23d69d6..ae7e52e 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 @@ -2048,4 +2048,28 @@ public class MesHqlPack { "createDatetime", packBean, true); return packBean; } + + /** + * 物料对象 + * + * @param partObject + * @param organizeCode + * @return + */ + public static DdlPackBean getMesPartObject(MesPartObject partObject, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(partObject, organizeCode); + if (!StringUtils.isEmpty(partObject.getPartNo())) { + DdlPreparedPack.getStringLikerPack(partObject.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(partObject.getObjectCode())) { + DdlPreparedPack.getStringLikerPack(partObject.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(partObject.getObjectName())) { + DdlPreparedPack.getStringLikerPack(partObject.getObjectName(), "objectName", packBean); + } + if (!StringUtils.isEmpty(partObject.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(partObject.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } } From 402b09e82eb422b2fe3061a72e8fb6df3a07fb2b Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 29 Nov 2019 15:06:04 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E3=80=90EU=E7=9B=98=E7=82=B9=E3=80=91?= =?UTF-8?q?=E3=80=90=20317-EU=E7=9B=98=E7=82=B9-=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E6=9F=A5=E8=AF=A2=E3=80=91=E3=80=901148EU?= =?UTF-8?q?=E7=9B=98=E7=82=B9-=E7=9B=98=E7=82=B9=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=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/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 69259c5..dbb02ed 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 @@ -823,7 +823,7 @@ public class WmsEnumUtil { VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"), VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"), VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"), - VDA_SN_("VDA_SN_MERGE", "VDA条码合并"), + VDA_SN_MERGE("VDA_SN_MERGE", "VDA条码合并"), VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"), VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"), VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), From a35171a41d58b1360da1825e2d228a687c6c0402 Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 29 Nov 2019 15:54:54 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 ++- .../estsh/i3plus/pojo/wms/bean/WmsPickCount.java | 53 ++++++++++++++++++++++ .../wms/repository/WmsPickCountRepository.java | 17 +++++++ 3 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.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 69259c5..0a776ba 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 @@ -644,7 +644,8 @@ public class WmsEnumUtil { VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"), KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"), KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"), - FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"); + FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), + KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"); private int value; private String code; @@ -827,7 +828,8 @@ public class WmsEnumUtil { VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"), VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"), VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), - VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"); + VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"), + KT_PICK_RC("KT_PICK_RC", "坤泰拣货"); private String value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java new file mode 100644 index 0000000..69e19ef --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.wms.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :供应商物料每月数量 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-11-27 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PICK_COUNT") +@Api("供应商物料每月数量") +public class WmsPickCount extends BaseBean { + + private static final long serialVersionUID = 4849044986767609486L; + @Column(name = "YEAR") + @ApiParam(value = "年") + private String year; + + @Column(name = "MONTH") + @ApiParam(value = "月") + private String month; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + private String vendorNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料号") + private String partNo; + + @Column(name = "QTY") + @ApiParam(value = "数量") + private Double qty; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.java new file mode 100644 index 0000000..a62056a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPickCount; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(拣货数量) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-06 13:40 + * @Modify: + **/ +@Repository +public interface WmsPickCountRepository extends BaseRepository{ + +} From 831daa4964cb085b2d165914236b44da27aeae0d Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 29 Nov 2019 15:56:12 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E3=80=90#1241=20KT-=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF-=E5=A2=9E=E5=8A=A0=E9=81=93=E5=8F=A3?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 34d1a36..12dff4c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -159,6 +159,10 @@ public class WmsPOMaster extends BaseBean { @Transient private List orderNoList; + @Column(name = "DOCK") + @ApiParam("道口") + public String dock; + public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; } From fa8a88c6d05ae88a231f8fcccf0f2b060279c88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 29 Nov 2019 19:23:55 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=EF=BC=9A=E6=8F=90=E4=BA=A4=E5=90=8E=E5=A6=82=E6=9E=9C=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=AD=A5=E9=AA=A4=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=B9=E6=B3=95=E5=8C=85=E5=90=AB=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E5=80=BC=E5=88=99=E5=8F=A0=E5=8A=A0=E5=9C=A8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=8F=90=E7=A4=BA=E6=B6=88=E6=81=AF=E5=90=8E+?= =?UTF-8?q?=E7=BB=99=E5=9F=BA=E7=B1=BBBaseBean=E7=9A=84isdeleted,isvalid?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8C=E7=BB=99?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E5=AE=9E=E4=BD=93=E5=8A=A0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E8=AF=95=E8=AF=95=E6=B0=B4+WmsCsDetailsModel=E7=B1=BB?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=B8=A5=E9=87=8D=E4=B8=8D=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=8C=83=EF=BC=8C=E5=B7=B2=E7=A7=BB=E8=87=B3Pojo-Mode?= =?UTF-8?q?l=E9=A1=B9=E7=9B=AE=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 7 +-- .../pojo/model/wms}/WmsCSOrderDetailsModel.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 52 +++++++++++----------- .../pojo/wms/bean/snapshot/WmsCheckPoint.java | 2 +- 4 files changed, 30 insertions(+), 33 deletions(-) rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio => i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms}/WmsCSOrderDetailsModel.java (95%) 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 08085ad..ef05abd 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 @@ -2,10 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; @@ -65,12 +62,12 @@ public abstract class BaseBean implements Serializable { // @AnnoOutputColumn(hidden = true) public String organizeCode; - @Column(name="IS_VALID") + @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; - @Column(name="IS_DELETED") + @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否已删除",example = "2") @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java similarity index 95% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java index 9a5fb95..5940720 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean.iotio; +package cn.estsh.i3plus.pojo.model.wms; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index 9efc5aa..1cb16f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -22,96 +22,96 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="AMP_JIS_REC") +@Table(name = "AMP_JIS_REC") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="AMP_JIS收货",description = "AMP_JIS收货") -public class AmpJisRec extends BaseBean{ +@Api(value = "AMP_JIS收货", description = "AMP_JIS收货") +public class AmpJisRec extends BaseBean { private static final long serialVersionUID = 4460727160153551089L; - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("JIS单号") public String orderNo; - @Column(name="PART_NO") + @Column(name = "PART_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("物料编码") public String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; - @Column(name="UNIT") + @Column(name = "UNIT", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("单位") public String unit; - @Column(name="SN") + @Column(name = "SN", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("条码") public String sn; /** * 状态:10=新建,20=已处理,30=处理出错 */ - @Column(name="ORDER_STATUS") + @Column(name = "ORDER_STATUS", columnDefinition = "int default 0", nullable = false) @ApiParam(value = "状态", example = "10") public Integer orderStatus; - @Column(name="VENDOR_NO") + @Column(name = "VENDOR_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam(value = "供应商编码", example = "10") public String vendorNo; - @Column(name="REMARK") + @Column(name = "REMARK", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("备注") public String remark; - @Column(name="SRC") + @Column(name = "SRC", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("单据来源") public String src; - @Column(name="SHIPPING_FLAG") + @Column(name = "SHIPPING_FLAG", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("特殊发货标志") public String shippingFlag; - @Column(name="ERROR_MESSAGE") + @Column(name = "ERROR_MESSAGE", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("错误信息") public String errorMessage; - @Column(name="AREA_NO") + @Column(name = "AREA_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("ERP库存地") public String areaNo; - @Column(name="CAR_NO") + @Column(name = "CAR_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("车号") public String carNo; - @Column(name="VIN") + @Column(name = "VIN", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("VIN号") public String vin; - @Column(name="SHIPPING_TIME") + @Column(name = "SHIPPING_TIME", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("发运时间") public String shippingTime; - @Column(name="SID") + @Column(name = "SID", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("sid") public String sid; - @Column(name="IS_LOCK") - @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" ) + @Column(name = "IS_LOCK", columnDefinition = "int default 0", nullable = false) + @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定") public Integer isLock; - @Column(name="ERP_SYNC_FLAG") - @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" ) + @Column(name = "ERP_SYNC_FLAG", columnDefinition = "int default 0", nullable = false) + @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败") public Integer erpSyncFlag; - public AmpJisRec(Long id,String partNo, String partNameRdd,String vendorNo,Double qty,String unit){ - this.id= id; + public AmpJisRec(Long id, String partNo, String partNameRdd, String vendorNo, Double qty, String unit) { + this.id = id; this.partNo = partNo; this.partNameRdd = partNameRdd; this.vendorNo = vendorNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java index 738ffbc..1a5b744 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java @@ -21,7 +21,7 @@ public class WmsCheckPoint extends BaseBean { private static final long serialVersionUID = 5589497687871639189L; - @Column(name="SNAPSHOT_TIME") + @Column(name="SNAPSHOT_TIME", columnDefinition="varchar(225) default ''",nullable=false) @ApiParam("快照时间") public String snapshotTime; } From b6ae28c9579fbd98df7709d00f1a4e88a31a62ef Mon Sep 17 00:00:00 2001 From: gcj Date: Sat, 30 Nov 2019 16:17:47 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=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/dto/WmsPartQtyDto.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java index 4bd50f1..865ca6e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java @@ -26,10 +26,10 @@ public class WmsPartQtyDto { } public Double getRcQty() { - return rcQty == null? 0.0:qty; + return rcQty == null? 0.0:rcQty; } public Double getDueQty() { - return dueQty == null? 0.0:qty; + return dueQty == null? 0.0:dueQty; } }