From 84d5f84457e78fd9946627966a4a2a4672d550c9 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 30 Sep 2020 10:47:58 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E3=80=9011629=2020021--=E5=8C=97?= =?UTF-8?q?=E7=BE=8E=E7=9C=8B=E6=9D=BF=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?--0930=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 82d05f2..f24ff0c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -344,6 +344,9 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "子位置号") private String itemSeqNo; + @ApiParam(value = "最早需求时间") + private String firstTime; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } From 944b8538625b78e26f969444f23f6f7923006cb6 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 30 Sep 2020 13:35:20 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=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/WmsCSOrderDetails.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/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index dcc76ee..68abad8 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 @@ -112,7 +112,7 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; - @Column(name = "LOT_NO", nullable = false) + @Column(name = "LOT_NO") @ColumnDefault("") @ApiParam("收货批次") public String lotNo = ""; From 61ad20717b3935449a4817eaa1f6e12afc387631 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 30 Sep 2020 17:05:51 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=90=88=E5=B9=B6sweb=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 f3e05c4..50d0007 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 @@ -348,4 +348,13 @@ public class WmsPart extends BaseBean { this.qty = cqty; this.createDatetime = createDateTime; } + + public WmsPart(String partNo, String partName, String inLocateNo, String stockUnit, Double snp, String partSpec) { + this.partNo = partNo; + this.partName = partName; + this.inLocateNo = inLocateNo; + this.stockUnit = stockUnit; + this.snp = snp; + this.partSpec = partSpec; + } } From 94568777fbda1e078d47a759d99727e30d52aeb9 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 30 Sep 2020 17:43:57 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3=E7=A0=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-mongo/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-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 d2521de..1e17935 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 b599490..37b8a51 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 9f5788e..dc13374 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 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 04b40d4..fdcf6e3 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-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/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 ac387fd..60d9861 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 bbe0ff9..54c8306 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 be533a6..190efa7 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 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 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 e755225..076f15a 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 194f0cb..1351ed3 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 60543fe..67b0bff 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 bdc4cab..15d36cd 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 cc6131f..f06d17f 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 From 1695d75ff21b8eec50fefe7764407c1edf67e7a7 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 30 Sep 2020 17:51:14 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E4=BB=A3=E7=A0=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-mongo/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-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 650ee5b..f902a7c 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 1e17935..d2521de 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 37b8a51..b599490 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 dc13374..9f5788e 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-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 123fdc9..1674a47 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 fdcf6e3..04b40d4 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-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/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 60d9861..ac387fd 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 54c8306..bbe0ff9 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 190efa7..be533a6 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 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 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 076f15a..e755225 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 1351ed3..194f0cb 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 67b0bff..60543fe 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 15d36cd..bdc4cab 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 f06d17f..cc6131f 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 diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From c202fa073b82e09ca44eba8b7eb7e006e6ee9b56 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 30 Sep 2020 17:54:46 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9sweb=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/sweb/bean/SwebVendorAlarm.java | 65 ++++++++++++++++++++++ .../sweb/repository/SwebVendorAlarmRepository.java | 9 +++ .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 43 ++++++++++---- 3 files changed, 105 insertions(+), 12 deletions(-) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java new file mode 100644 index 0000000..b8acd2d --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.sweb.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 : jason.niu + * @CreateDate : 2020-09-27 + * @Modify: + **/ +@Data +@Table(name = "SWEB_VENDOR_ALARM") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("供应商报警单") +public class SwebVendorAlarm extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料代码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "VENDOR_CODE") + @ApiParam("供应商代码") + private String vendorCode; + + @Column(name = "VENDOR_NAME") + @ApiParam("供应商名称") + private String vendorName; + + @Column(name = "ALARM_CONTENT") + @ApiParam("报警内容") + private String alarmContent; + + @Column(name = "ALARM_LEVEL") + @ApiParam("报警级别") + private Integer alarmLevel; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + private String orderNo; + + @Column(name = "PART_SPEC") + @ApiParam("物料描述") + private String partSpec; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java new file mode 100644 index 0000000..cfb7325 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorAlarm; +import org.springframework.stereotype.Repository; + +@Repository +public interface SwebVendorAlarmRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index e81e51b..e18520b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -204,9 +204,13 @@ public class SwebHqlPack { return buildHql(details, result); } - public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity) { + public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List vendorCodes) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(capcity.getVendorCode(), "vendorCode", result); + if (vendorCodes.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); + } else if (vendorCodes.size() > 1){ + DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + } DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result); if (!StringUtil.isEmpty(capcity.getDateStart())) { @@ -219,9 +223,13 @@ public class SwebHqlPack { return buildHql(capcity, result); } - public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm) { + public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List vendorCodes) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(alarm.getVendorCode(), "vendorCode", result); + if (vendorCodes.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); + } else if (vendorCodes.size() > 1){ + DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + } DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); if (!StringUtil.isEmpty(alarm.getDateStart())) { DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result); @@ -233,17 +241,28 @@ public class SwebHqlPack { return buildHql(alarm, result); } - public static DdlPackBean getSwebVendorStock(SwebVendorStock stock) { + public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List vendorCodes) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(stock.getVendorCode(), "vendorCode", result); + if (vendorCodes.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); + } else if (vendorCodes.size() > 1){ + DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + } DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result); -// if (!StringUtil.isEmpty(alarm.getDateStart())) { -// DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result); -// } -// if (!StringUtil.isEmpty(alarm.getDateEnd())) { -// DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result); -// } DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(stock, result); } + + public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List vendorCodes) { + DdlPackBean result = new DdlPackBean(); + if (vendorCodes.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); + } else if (vendorCodes.size() > 1){ + DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + } + DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(alarm, result); + } } From af4bb83f85bd78dc71bf7e6795d073f2b98a877c Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 30 Sep 2020 18:08:21 +0800 Subject: [PATCH 07/12] =?UTF-8?q?sweb=E5=90=88=E5=B9=B6test=E4=BB=A3?= =?UTF-8?q?=E7=A0=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-mongo/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-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 d2521de..1e17935 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 b599490..37b8a51 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 9f5788e..dc13374 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 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 04b40d4..fdcf6e3 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-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/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 ac387fd..60d9861 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 bbe0ff9..54c8306 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 be533a6..190efa7 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 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 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 e755225..076f15a 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 194f0cb..1351ed3 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 60543fe..67b0bff 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 bdc4cab..15d36cd 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 cc6131f..f06d17f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 5816f275bf237855f773b55634c624d5def2b332 Mon Sep 17 00:00:00 2001 From: songss Date: Wed, 30 Sep 2020 18:15:13 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 114 +++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesControlPlan.java | 31 +++-- .../i3plus/pojo/mes/bean/MesQualityStandard.java | 22 ++-- .../i3plus/pojo/mes/model/MesControlPlanModel.java | 46 +++++++ .../mes/model/MesControlPlanTemplateModel.java | 136 +++++++++++++++++++++ .../pojo/mes/model/MesQualityStandardModel.java | 83 +++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 23 ++++ 7 files changed, 433 insertions(+), 22 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 714f433..f1f1075 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 @@ -7588,4 +7588,118 @@ public class MesEnumUtil { return tmp; } } + + /** + * 过程检测检测对象数据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_VALUE_TYPE { + STRING(10, "字符串"), + INTEGER(20, "数值"); + + private int value; + private String description; + + QC_CHECK_VALUE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 过程检测数据源类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_DATA_SOURCE { + MANUAL_INPUT(10, "10", "人工输入"), + DB(30, "30", "数据库"), + PLC(20, "20", "PLC"); + + private int value; + private String description; + private String code; + + QC_CHECK_DATA_SOURCE(int value, String code, String description) { + this.value = value; + this.description = description; + this.code = code; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 控制计划审核状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONTROL_PLAN_AUDIT_TYPE { + WAIT_AUDIT(10, "待审核"), + AUDIT_PASS(20, "审核通过"), + AUDIT_NON_PASS(30, "审核驳回"); + + private int value; + private String description; + + CONTROL_PLAN_AUDIT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java index 4a3b70e..b016661 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java @@ -26,30 +26,39 @@ import java.io.Serializable; @Table(name = "MES_CONTROL_PLAN") @Api("中航控制计划主表") public class MesControlPlan extends BaseBean implements Serializable { - //1. 主表字段：“产线”、“产品”、“客户”、“版本号”、“是否生效”、“状态（编辑中、待审核、已审核）”组成。（主表命名“控制计划”） + private static final long serialVersionUID = 1454433409471781390L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; -// @Column(name = "WORK_CELL_CODE") -// @ApiParam("工作单元代码") -// private String workCellCode; + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; - @Column(name = "product_name") - @ApiParam("产品名称") - private String productName; + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; + @Column(name = "CUST_NAME") + @ApiParam("客户名称") + private String custName; + @Column(name = "VERSION") @ApiParam("版本号") - private String version; + private Integer version; + + @Column(name = "AUDIT_TYPE") + @ApiParam("审核状态") + private Integer auditType; + + @Column(name = "IS_ENABLE") + @ApiParam("是否启用") + private Integer isEnable; - @Column(name = "EDIT_TYPE") - @ApiParam("编辑状态") - private Integer editType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java index d8fbcef..1df34df 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java @@ -34,18 +34,18 @@ public class MesQualityStandard extends BaseBean implements Serializable { @ApiParam("控制计划表主键ID") private Long controlPlanId; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + @Column(name = "VERSION") @ApiParam("版本") - private String version; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - private String partNo; + private Integer version; //检测类型：10=首检，20=巡检，30=终检，40=发运检 @Column(name = "CHECK_TYPE") @ApiParam("检测类型") - private Integer CHECK_TYPE; + private Integer checkType; @Column(name = "CHECK_ITEM_TYPE") @ApiParam("检测项类型") @@ -87,17 +87,17 @@ public class MesQualityStandard extends BaseBean implements Serializable { //任务单类型,动态枚举 @Column(name = "CHECK_ORDER_TYPE") @ApiParam("任务单类型") - private String CHECK_ORDER_TYPE; + private String checkOrderType; //数据来源：10=手工录入，20=PLC，30=DB @Column(name = "DATA_SOURCE") @ApiParam("数据来源") - private String DATA_SOURCE; + private String dataSource; //检验值类型：10=字符串，20=数值 @Column(name = "CHECK_VALUE_TYPE") @ApiParam("检验值类型") - private String CHECK_VALUE_TYPE; + private String checkValueType; @Column(name = "DIFFERENCE_MAX_LIMIT") @ApiParam("公差上限") @@ -109,10 +109,10 @@ public class MesQualityStandard extends BaseBean implements Serializable { @Column(name = "IS_KEY_CHECK_ITEM") @ApiParam("是否关键检测项") - private Integer IS_KEY_CHECK_ITEM; + private Integer isKeyCheckItem; @Column(name = "CHECK_CFG_NO") @ApiParam("检测值配置编号") - private String CHECK_CFG_NO; + private String checkCfgNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java new file mode 100644 index 0000000..4dab68a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @CreateDate: 2020/9/29 + * @Author: simon.song + */ +@Data +public class MesControlPlanModel { + + @ApiParam("控制计划主键ID") + private Long id; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("客户名称") + private String custName; + + @ApiParam("版本号") + private Integer version; + + @ApiParam("审核状态") + private Integer auditType; + + @ApiParam("是否启用") + private Integer isEnable; + + @ApiParam("质量标准数组") + private List standardList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java new file mode 100644 index 0000000..df5b532 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java @@ -0,0 +1,136 @@ +package cn.estsh.i3plus.pojo.mes.model; + +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; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @Description: 控制计划导入模板 + * @CreateDate: 2020/9/29 + * @Author: simon.song + */ +@Data +@Api(value="控制计划导入模板",description = "控制计划导入模板") +public class MesControlPlanTemplateModel extends BaseBean { + + private static final long serialVersionUID = 6846982556729401884L; + + @ApiParam("工作中心代码") + @AnnoOutputColumn + private String workCenterCode; + + @ApiParam("物料编码") + @AnnoOutputColumn + private String partNo; + + @ApiParam("物料名称") + @AnnoOutputColumn + private String partName; + + @ApiParam("客户代码") + @AnnoOutputColumn + private String custCode; + + @ApiParam("客户名称") + @AnnoOutputColumn + private String custName; + + @ApiParam("控制计划版本号") + @AnnoOutputColumn + private Integer controlPlanVersion; + + @ApiParam("是否启用") + @AnnoOutputColumn + private Integer isEnable; + +// @Column(name = "IS_ENABLE") +// @ApiParam("是否启用") +// private Integer isEnable; + + @ApiParam("工作单元代码") + @AnnoOutputColumn + private String workCellCode; + + @ApiParam("质量标准版本") + @AnnoOutputColumn + private Integer qualityStandardVersion; + + //检测类型：10=首检，20=巡检，30=终检，40=发运检 + @ApiParam("检测类型") + @AnnoOutputColumn + private Integer checkType; + + @ApiParam("检测项类型") + @AnnoOutputColumn + private String checkItemType; + + @ApiParam("检测项") + @AnnoOutputColumn + private String checkItem; + + @ApiParam("检测标准") + @AnnoOutputColumn + private String checkStandard; + + @ApiParam("检测指导") + @AnnoOutputColumn + private String checkGuide; + + @ApiParam("频率") + @AnnoOutputColumn + private String checkFrequency; + + @ApiParam("是否允许让步") + @AnnoOutputColumn + private String isConcession; + + @ApiParam("间隔时间") + @AnnoOutputColumn + private String checkInterval; + + //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 + @ApiParam("个数标识") + @AnnoOutputColumn + private String numberFlag; + + @ApiParam("检测数量") + @AnnoOutputColumn + private Integer qty; + + //任务单类型,动态枚举 + @ApiParam("任务单类型") + @AnnoOutputColumn + private String checkOrderType; + + //数据来源：10=手工录入，20=PLC，30=DB + @ApiParam("数据来源") + @AnnoOutputColumn + private String dataSource; + + //检验值类型：10=字符串，20=数值 + @ApiParam("检验值类型") + @AnnoOutputColumn + private String checkValueType; + + @ApiParam("公差上限") + @AnnoOutputColumn + private BigDecimal differenceMaxLimit; + + @ApiParam("公差下限") + @AnnoOutputColumn + private BigDecimal differenceMinLimit; + + @ApiParam("是否关键检测项") + @AnnoOutputColumn + private Integer isKeyCheckItem; + + @ApiParam("检测值配置编号") + @AnnoOutputColumn + private String checkCfgNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java new file mode 100644 index 0000000..dce1aa2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Description: + * @CreateDate: 2020/9/29 + * @Author: simon.song + */ +@Data +public class MesQualityStandardModel { + + @ApiParam("质量标准主键ID") + private Long id; + + @ApiParam("控制计划表主键ID") + private Long controlPlanId; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("版本") + private Integer version; + + //检测类型：10=首检，20=巡检，30=终检，40=发运检 + @ApiParam("检测类型") + private Integer checkType; + + @ApiParam("检测项类型") + private String checkItemType; + + @ApiParam("检测项") + private String checkItem; + + @ApiParam("检测标准") + private String checkStandard; + + @ApiParam("检测指导") + private String checkGuide; + + @ApiParam("频率") + private String checkFrequency; + + @ApiParam("是否允许让步") + private String isConcession; + + @ApiParam("间隔时间") + private String checkInterval; + + //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 + @ApiParam("个数标识") + private String numberFlag; + + @ApiParam("检测数量") + private Integer qty; + + //任务单类型,动态枚举 + @ApiParam("任务单类型") + private String checkOrderType; + + //数据来源：10=手工录入，20=PLC，30=DB + @ApiParam("数据来源") + private String dataSource; + + //检验值类型：10=字符串，20=数值 + @ApiParam("检验值类型") + private String checkValueType; + + @ApiParam("公差上限") + private BigDecimal differenceMaxLimit; + + @ApiParam("公差下限") + private BigDecimal differenceMinLimit; + + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @ApiParam("检测值配置编号") + private String checkCfgNo; +} 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 46ee53a..da89988 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 @@ -3389,4 +3389,27 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesSubPart.getIsValid(), "isValid", packBean); return packBean; } + + public static DdlPackBean getControlPlan(MesControlPlan controlPlan) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(controlPlan.getOrganizeCode(), controlPlan.getIsValid()); + if (!StringUtils.isEmpty(controlPlan.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(controlPlan.getWorkCenterCode(), "workCenterCode", packBean); + } +// if (!StringUtils.isEmpty(controlPlan.getWorkCellCode())) { +// DdlPreparedPack.getStringEqualPack(controlPlan.getWorkCellCode(), "workCellCode", packBean); +// } + if (!StringUtils.isEmpty(controlPlan.getPartNo())) { + DdlPreparedPack.getStringEqualPack(controlPlan.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getCustCode())) { + DdlPreparedPack.getStringEqualPack(controlPlan.getCustCode(), "custCode", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getVersion())) { + DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getVersion(), "version", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getAuditType())) { + DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getAuditType(), "auditType", packBean); + } + return packBean; + } } From a5b81cb6767410c204954a62cb1617748d2beba5 Mon Sep 17 00:00:00 2001 From: songss Date: Wed, 30 Sep 2020 18:18:47 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 77 ---------------------- 1 file changed, 77 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 6c69d58..7b07732 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 @@ -7667,83 +7667,6 @@ public class MesEnumUtil { } /** - * 过程检测检测对象数据类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum QC_CHECK_VALUE_TYPE { - STRING(10, "字符串"), - INTEGER(20, "数值"); - - private int value; - private String description; - - QC_CHECK_VALUE_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * 过程检测数据源类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum QC_CHECK_DATA_SOURCE { - MANUAL_INPUT(10, "10", "人工输入"), - DB(30, "30", "数据库"), - PLC(20, "20", "PLC"); - - private int value; - private String description; - private String code; - - QC_CHECK_DATA_SOURCE(int value, String code, String description) { - this.value = value; - this.description = description; - this.code = code; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** * 控制计划审核状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 5a0178f5dff338c4cccd51edaea2cc525f44c719 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 30 Sep 2020 18:26:38 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E4=BB=A3=E7=A0=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-mongo/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-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 650ee5b..f902a7c 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 1e17935..d2521de 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 37b8a51..b599490 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 dc13374..9f5788e 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-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 123fdc9..1674a47 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 fdcf6e3..04b40d4 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-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/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 60d9861..ac387fd 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 54c8306..bbe0ff9 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 190efa7..be533a6 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 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 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 076f15a..e755225 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 1351ed3..194f0cb 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 67b0bff..60543fe 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 15d36cd..bdc4cab 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 f06d17f..cc6131f 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 diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 90d94f35c8a6b12995a0a3ac5caacf102e27ee19 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 5 Oct 2020 22:07:28 +0800 Subject: [PATCH 11/12] =?UTF-8?q?Fix=20bug#11683=20=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E5=8D=95-=E5=B7=B2=E6=94=B6=E8=B4=A7=E6=95=B0=E9=87=8F-?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=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/WmsQCMaster.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index e26eba3..8fe824f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -126,6 +126,10 @@ public class WmsQCMaster extends BaseBean { @ApiParam(value = "零件名称") public String partNameRdd; + @Transient + @ApiParam(value = "收货数量") + public Double qty; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } @@ -152,4 +156,16 @@ public class WmsQCMaster extends BaseBean { this.partNameRdd = partNameRdd; this.createDatetime = createDatetime; } + + public WmsQCMaster(String orderNo, Double qty, String vendorNo, String VendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { + this.orderNo = orderNo; + this.qty = qty; + this.vendorNo = vendorNo; + this.VendorDesc = VendorDesc; + this.refType = refType; + this.refSrc = refSrc; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.createDatetime = createDatetime; + } } From 3d5729e28b4500fe12d85842734bbea5d2471c28 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 6 Oct 2020 20:41:17 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E9=98=9F=E5=88=97=E5=A2=9E=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java index 9aac6f4..69724ce 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java @@ -52,4 +52,8 @@ public class WmsPrintingQueue extends BaseBean{ @Column(name="PRINT_STATUS") @ApiParam("打印状态") private Integer printStatus; + + @Column(name="VENDOR_NO") + @ApiParam("供应商编码") + private String vendorNo; } \ No newline at end of file