From a3115601a7f127fb19d3bfa857f59860c51fb418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:55:06 +0800 Subject: [PATCH 01/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9caeb95..5345a36 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 modules/i3plus-pojo-model From d62aec1c626aa8fd781e7f729c54ed1756b3b4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:55:20 +0800 Subject: [PATCH 02/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-andon/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From e43d593db6524804151d59037e46f060d8f1d648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:55:38 +0800 Subject: [PATCH 03/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-aps/pom.xml'?= 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 c052a9d..b0a3f82 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 From 5d57bc44d86eca1679ef5594546cc41850e46471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:55:51 +0800 Subject: [PATCH 04/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-base/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f8356637aee112688d761d1d44679bd3589c6992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:56:07 +0800 Subject: [PATCH 05/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-form/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-form/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From fda76e06c830f4bd867ab58adcf88bb4826a28f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:56:21 +0800 Subject: [PATCH 06/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-hardswitch/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 071c218a2e51b7851ae8323f10928d8b86dad290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:56:42 +0800 Subject: [PATCH 07/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-jobflow/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-jobflow/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From e09345984da27c450c20029d117a2d69a08a8e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:56:56 +0800 Subject: [PATCH 08/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-lac/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-lac/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From b703c9394cca809a5598277f6013edd6d4d03f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:57:09 +0800 Subject: [PATCH 09/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-mes/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mes/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 5b672e7d68e7086761ce9cab73f4fd703bf4675e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:57:31 +0800 Subject: [PATCH 10/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-mes-pcn/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 4911d184e0c9b0e58320a698d9afd1da6ce90a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:58:36 +0800 Subject: [PATCH 11/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-model/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39d9423..b7b2dfc 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 From 711116d04126347c28c891478eea68025700cef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:58:50 +0800 Subject: [PATCH 12/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-platform/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-platform/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From b2210e74258c8e974883694ff197c2a9deb97256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:03 +0800 Subject: [PATCH 13/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-report/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-report/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From be04366551bbc8dda0e99af3ba20898850b66038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:14 +0800 Subject: [PATCH 14/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-softswitch/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-softswitch/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From ea8f5273099bf11955adc4bb850ecc07b9959925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:26 +0800 Subject: [PATCH 15/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-sweb/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-sweb/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From a2548413854cd58f2dcd74b764a814b289c618d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:38 +0800 Subject: [PATCH 16/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-wms/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-wms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 3df5888a699a8ea705230448b84d2fb0445f82d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:48 +0800 Subject: [PATCH 17/29] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-workflow/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-workflow/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 04533633363ff41135698b3f8f3e341d3fe6ade5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 18 Dec 2019 21:59:55 +0800 Subject: [PATCH 18/29] =?UTF-8?q?=E3=80=90=E5=8F=91=E8=BF=90=E9=85=8D?= =?UTF-8?q?=E6=96=99=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=B0=86=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=95=B0=E9=87=8F=E6=94=B9=E4=B8=BA=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E9=85=8D=E6=96=99=E6=95=B0=E9=87=8F=E3=80=82=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=E3=80=91bug7063?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 36 +++++++++++++++++++++- 1 file changed, 35 insertions(+), 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 87050ca..390532b 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 @@ -110,6 +110,7 @@ public class WmsEnumUtil { /** * 移库单主表：优先级 */ + @Deprecated @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRIORITY { NORMAL(1, "正常"), URGENT(2, "紧急"); @@ -142,6 +143,38 @@ public class WmsEnumUtil { /** + * 移库单主表：优先级 (PRIORITY_NEW) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRIORITY_NEW { + URGENT(1, "紧急"), NORMAL(2, "正常"); + private int value; + private String description; + + PRIORITY_NEW(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + /** * 主表信息 单据类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -205,7 +238,8 @@ public class WmsEnumUtil { RECEIPT(20, "RECEIPT", "处理中"), RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), CLOSED(40, "CLOSED", "已关闭"), - CANCELLED(50, "CANCELLED", "已取消"); + CANCELLED(50, "CANCELLED", "已取消"), + FINISH_PRODUCT_SHIPING_PICKED(60, "FINISH_PRODUCT_SHIPING_PICKED", "配料完成"); private int value; private String code; From 339f1a86c275ef7725ddff3ede03f6c2147303f1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 19 Dec 2019 09:16:15 +0800 Subject: [PATCH 19/29] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=E9=97=B4=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 13 +++++++++---- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 8 -------- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 5 ----- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index b05d85c..a18d99a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -730,6 +730,10 @@ public class AndonEnumUtil { /** * 按灯标识 * 1-呼叫，2-签到，3-解决 + * + * 20190917将“提交”更改为“解决待审” + * 20190917将“审批”更改为“审批完成” + * 20190917增加"撤销已确认"枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ANDON_ACTION_TAG { @@ -737,10 +741,10 @@ public class AndonEnumUtil { SIGN(2,"20","响应"), RESOLVE(3,"30","解决"), CANCEL(4,"40", "撤销"), - COMMIT(5,"50","解决待审"),// 20190917将“提交”更改为“解决待审” - PASS(6,"60","审批完成"), // 20190917将“审批”更改为“审批完成” + COMMIT(5,"50","解决待审"), + PASS(6,"60","审批完成"), REJECT(7,"70","驳回"), - CONFIRMED_CANCEL(8,"80","撤销已确认"); // 20190917增加这个枚举 + CONFIRMED_CANCEL(8,"80","撤销已确认"); private int value; private String code; @@ -944,10 +948,11 @@ public class AndonEnumUtil { /** * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 + * + * 下面的顺序不要更改，packBrokenTimeTypeRatioList方法有用到此枚举的顺序 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_TYPE { - //下面的顺序不要更改，packBrokenTimeTypeRatioList方法有用到此枚举的顺序 EQUIP("EQUMENT_ALARM", 110060106, "设备", "#D06D6A"), QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"), PART("PART_ALARM", 110060104, "物料", "#24BDBA"), 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 0d04f5e..a22ef11 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 @@ -495,7 +495,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static ORGANIZATION_INIT_DATA getByValue(String value) { for (ORGANIZATION_INIT_DATA organizationInitData : values()) { if (organizationInitData.getValue().equals(value)) { @@ -1488,7 +1487,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_INSERT_EXCEL getByValue(int value) { for (MES_INSERT_EXCEL mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1647,7 +1645,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_STATION_BOM_IS_REPEAT getByValue(int value) { for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1846,7 +1843,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_WORK_CELL_TYPE getByValue(int value) { for (MES_WORK_CELL_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1904,7 +1900,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_ACTION_TYPE getByValue(int value) { for (MES_ACTION_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1952,7 +1947,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_IS_BIND_KEY getByValue(int value) { for (MES_IS_BIND_KEY mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -2000,7 +1994,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_REPAIR_STATUS getByValue(int value) { for (MES_REPAIR_STATUS mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -2051,7 +2044,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_OPERATE_TYPE getByValue(int value) { for (MES_OPERATE_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { 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 988baf8..ecda007 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 @@ -75,7 +75,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_STATION_BOM_IS_REPEAT getByValue(int value) { for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -193,7 +192,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_ACTION_TYPE getByValue(int value) { for (MES_ACTION_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -281,7 +279,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_IS_BIND_KEY getByValue(int value) { for (MES_IS_BIND_KEY mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -405,7 +402,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_OPERATE_TYPE getByValue(int value) { for (MES_OPERATE_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -466,7 +462,6 @@ public class MesPcnEnumUtil { return tmp; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_MATCH_TYPE getByValue(int value) { for (MES_MATCH_TYPE mesMatchType : values()) { if (mesMatchType.getValue() == value) { From b674087ffc69b0d8e3eb375e3198fcecae8b204e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 19 Dec 2019 13:53:13 +0800 Subject: [PATCH 20/29] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 46172c2..f55c898 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 @@ -146,11 +146,12 @@ public class CommonEnumUtil { } return null; } - public static int descriptionOfValue(String desc) { + public synchronized static int descriptionOfValue(String desc) { int tmp = IMPP.value; for (int i = 0; i < values().length; i++) { - if (values()[i].name().equals(desc)) { + if (values()[i].description.equals(desc)) { tmp = values()[i].value; + break; } } return tmp; From 5c28c8344c733644dda55886376ac1a3bcc15960 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 19 Dec 2019 15:09:19 +0800 Subject: [PATCH 21/29] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=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 | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- 2 files changed, 3 insertions(+), 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 390532b..617148e 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 @@ -1349,7 +1349,8 @@ public class WmsEnumUtil { INVENTORY(20, "已盘"), FROZEN(30, "已冻结"), THAWING(40, "已解冻"), - RETURN_GOODS(50, "取消冻结"); + RETURN_GOODS(50, "取消冻结"), + Unsettled_(60, "取消冻结"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 3b6b4bc..21af5a3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -99,7 +99,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer destSnStatus; /** - * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 + * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60-未盘解冻 */ @Column(name = "TRANS_STATUS") @ApiParam(value = "处理状态", example = "1") From 0d7e64b160627a79be6d96e57818a6a9459f3966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 19 Dec 2019 16:22:21 +0800 Subject: [PATCH 22/29] =?UTF-8?q?=E5=9C=A8=E8=B0=83=E7=94=A8=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E6=8A=8A=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E4=B8=80=E5=B9=B6=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E5=88=B0MOVEMASTER=E5=AF=B9=E8=B1=A1=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E7=9C=81=E5=8E=BB=E6=AF=8F=E4=B8=AA=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E5=86=8D=E5=8E=BB=E5=BE=AA=E7=8E=AF=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 45 +++++++++------------- .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 6 ++- 3 files changed, 24 insertions(+), 29 deletions(-) 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 e4a35f8..be7ffe3 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 @@ -204,7 +204,7 @@ public class WmsPart extends BaseBean { @ApiParam(value = "循环补货数量", example = "0") private Double cycleRquestQty = 0d; - public int getIqcValue(){ + public int getIqcVal(){ return this.iqc == null ? 0 : this.iqc.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 7ae45fb..811158c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -79,49 +79,40 @@ public class WmsStockQuan extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "可用数量", example = "0") + @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "可用数量") public Double qty; - @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "不合格数量", example = "0") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "不合格数量") private Double failQty; - @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "隔离数量", example = "0") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "隔离数量") private Double holdQty; - @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "质检中数量", example = "0") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "质检中数量") private Double qcQty; - @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "待入库数量", example = "0") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "待入库数量") private Double rinQty; - @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "冻结数量", example = "0") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "冻结数量") private Double freezeQty; - @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "寄售数量", example = "0") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "寄售数量") private Double consignQty; - @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "锁定数量", example = "0") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "锁定数量") private Double lockQty; - @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "报废数量", example = "0") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "报废数量") private Double scrapQty; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index aef6850..c6caa7a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -58,7 +58,7 @@ public class WmsTransType extends BaseBean { private String transTypeDesc; @Column(name = "TM_ID") - @ApiParam(value = "交易处理组件", example = "-1") + @ApiParam(value = "交易处理组件") @JsonSerialize(using = ToStringSerializer.class) private Long tmId; @@ -73,4 +73,8 @@ public class WmsTransType extends BaseBean { public String getMenuUrl() { return "/handle?transTypeCode=" + this.transTypeCode; } + + public long getTmIdVal() { + return this.tmId == null ? 0 : this.tmId; + } } From 7ef04dd8243b706e6533d14d822c018af740ed30 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 19 Dec 2019 17:35:24 +0800 Subject: [PATCH 23/29] =?UTF-8?q?=E3=80=901320=20KT=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF--=E9=9C=80=E8=A6=81=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9A=84=E7=B1=BB=E5=9E=8B=EF=BC=9A=E5=99=A8?= =?UTF-8?q?=E5=85=B7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 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 617148e..db31037 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 @@ -501,7 +501,8 @@ public class WmsEnumUtil { LINE_LOCATE(50, "L", "线边库"), NC_LOCATE(60, "N", "NC库"), SPILLAGE_LOCATE(70, "Y", "溢料库"), - TRANSIT_LOCATE(80, "T", "在途库"); + TRANSIT_LOCATE(80, "T", "在途库"), + UTENSIL_LOCATE(90, "U", "器具库"); private int value; private String code; @@ -2987,7 +2988,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_PART_TYPE { - RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"); + RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"), + UTENSIL(50, "器具"); private int value; private String description; From 69e20029e857bf80b9c2e64804f0d05a7498e64d Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 19 Dec 2019 17:37:45 +0800 Subject: [PATCH 24/29] =?UTF-8?q?=E3=80=901320=20KT=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF--=E9=9C=80=E8=A6=81=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9A=84=E7=B1=BB=E5=9E=8B=EF=BC=9A=E5=99=A8?= =?UTF-8?q?=E5=85=B7=E3=80=91=E5=A2=9E=E5=8A=A0=E6=8F=8F=E8=BF=B0=EF=BC=9A?= =?UTF-8?q?90=3D=E5=99=A8=E5=85=B7=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 590f11c..d5344c2 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 @@ -39,7 +39,7 @@ public class WmsLocate extends BaseBean { private String locateName; /** - * 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位 + * 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位,90=器具库 */ @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") From a2ac02aa47e916fc9a18dbfc5623c5c382a00ba6 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 19 Dec 2019 19:27:24 +0800 Subject: [PATCH 25/29] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=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 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- 3 files changed, 6 insertions(+), 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 db31037..5097556 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 @@ -1351,7 +1351,7 @@ public class WmsEnumUtil { FROZEN(30, "已冻结"), THAWING(40, "已解冻"), RETURN_GOODS(50, "取消冻结"), - Unsettled_(60, "取消冻结"); + UNSETTLED_NCUNFREEZE(60, "未盘解冻"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 878db14..8590f92 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -136,6 +136,10 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("存储区编号组") public String[] zoneNos; + @Transient + @ApiParam("行号") + private String item; + public WmsCSFactTrans(){} public Integer getIsScopeVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 21af5a3..947cb55 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -99,7 +99,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer destSnStatus; /** - * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60-未盘解冻 + * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60=未盘解冻 */ @Column(name = "TRANS_STATUS") @ApiParam(value = "处理状态", example = "1") From 4c8a94bdfaf1919ec3ab30e226ef1dc7d6742770 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 19 Dec 2019 23:17:30 +0800 Subject: [PATCH 26/29] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=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 | 1 + 1 file changed, 1 insertion(+) 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 1f4fc92..6c68ff3 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 @@ -1359,6 +1359,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result); + DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result); DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result); From 1d7cf4165335a4f0a3c715df3b695bf9284829d3 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 20 Dec 2019 02:54:50 +0800 Subject: [PATCH 27/29] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=E3=80=91=E5=90=8E=E6=9C=9F=E5=BE=85=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 11 +++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 7 +++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java | 2 ++ 3 files changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 8590f92..14c0486 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -88,22 +88,27 @@ public class WmsCSFactTrans extends BaseBean { public String remark; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "剩余数量", example = "1") public Double surplusQty; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("源库位编号") public String srcLocateNo; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("源存储区编号") public String srcZoneNo; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("源仓库编号") public String srcWhNo; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("是否范围内") public Integer isScope; @@ -112,10 +117,12 @@ public class WmsCSFactTrans extends BaseBean { public String vendorNo; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "实盘箱数", example = "1") public Long countBoxQty; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "物料数量", example = "1") public Double sumPartQty; @@ -125,18 +132,22 @@ public class WmsCSFactTrans extends BaseBean { * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 */ @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "条码状态", example = "1") public Integer snStatus; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "条码状态(冻结时)", example = "1") public Integer destSnStatus; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam("存储区编号组") public String[] zoneNos; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam("行号") private String item; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 947cb55..c4550f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -42,6 +42,7 @@ public class WmsCSOrderDetails extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") + @AnnoOutputColumn(hidden = true) public String item; @Column(name = "QTY", columnDefinition = "decimal(18,8)") @@ -112,26 +113,32 @@ public class WmsCSOrderDetails extends BaseBean { @Transient @ApiParam(value = "实盘数量", example = "1") + @AnnoOutputColumn(hidden = true) public Double factQty; @Transient @ApiParam(value = "剩余数量", example = "1") + @AnnoOutputColumn(hidden = true) public Double surplusQty; @Transient @ApiParam("目标库位编号") + @AnnoOutputColumn(hidden = true) public String destLocateNo; @Transient @ApiParam("前端表格编辑使用") + @AnnoOutputColumn(hidden = true) public Boolean isSet = false; @Transient @ApiParam("源单位") + @AnnoOutputColumn(hidden = true) public String srcUnit; @Transient @ApiParam("存储区编号") + @AnnoOutputColumn(hidden = true) public String[] zoneNos; /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java index 1873977..a85ae4a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java @@ -1,5 +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 io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -42,6 +43,7 @@ public class WmsCSPart extends BaseBean { public String partNameRdd; @Column(name="IS_ADJUST") + @AnnoOutputColumn(hidden = true) @ApiParam(value = "调整标识", example = "1") public Integer isAdjust; } From c87b00756f406decf4ffd4635dfdb9bb72fad4d8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 20 Dec 2019 10:29:25 +0800 Subject: [PATCH 28/29] =?UTF-8?q?dev=E5=88=86=E6=94=AF=E4=BF=AE=E6=94=B9po?= =?UTF-8?q?m?= 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 f8fa98e..ebd53c3 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 b0a3f82..c052a9d 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 d790ef1..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 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 23e5bee..0ba3645 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-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 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 856da5f..ffcac19 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 09f2c4a..e388a1d 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b7b2dfc..39d9423 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 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-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 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 4c96781..81fb02b 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 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 18c811c..bc41914 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 1171f4e..93f9732 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 5345a36..9caeb95 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 modules/i3plus-pojo-model From 335ab2ce510a062d127026228652b7c7ad95bf37 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 20 Dec 2019 11:03:37 +0800 Subject: [PATCH 29/29] =?UTF-8?q?=E6=96=B0=E5=A2=9EKPI=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index e9471e8..7eb002d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -53,11 +53,6 @@ public class ProductOrder extends BaseOrder { @ApiParam(value ="指定工艺路线") private String specifyRouting; - @Column(name="RESYNCHRONIZE") - @ApiParam(value ="是否同步") - @FieldAnnotation(defaultValue = "true") - private Boolean resynchronize; - @Column(name="RECALC_COUNT") @ApiParam(value ="是否重新计算数量") @FieldAnnotation(defaultValue = "true")