From 62cee148cd7e520b2edba63f4552dc32eb9583cc Mon Sep 17 00:00:00 2001 From: joke lin Date: Fri, 20 Mar 2020 15:04:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[bug:=207875=20=E5=AE=A2=E6=88=B7JIT?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 8590fbb..5db7e04 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -113,7 +113,7 @@ public class MesProductData extends BaseBean implements Serializable { @Lob @Column(name = "LINE_DATA") @ApiParam("生产数据") - private List lineData; + private String lineData; @Lob @Transient From 79788daf8b12c531a967bdc744d42869af5b511c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 20 Mar 2020 17:20:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?pom=20=E4=BF=AE=E6=94=B9?= 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 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 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 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 810ab4a..f8fa98e 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 282975a..1414885 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 8217526..d790ef1 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 1b30904..c6141da 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9791e02..23e5bee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 4310990..c1e2cb9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 9dbc071..856da5f 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 3bba14d..09f2c4a 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 2ac5b34..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 6c6aeec..6a49f5e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -127,5 +127,5 @@ public class MesPlc extends BaseBean implements Serializable { @Transient @ApiParam("OPC值") - private List opcValue; + private String opcValue; } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index d05424f..b7b2dfc 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 0e49db7..ec9e100 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index faa2bdd..0db7b7d 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 3c56db1..bd09726 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4a5f068..4c96781 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 9830d2e..2c24e41 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 6c9b589..18c811c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index b8240c8..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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index b2d5808..bca9cbb 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 10b5885ede4dcbfba12199a36582d5bfbf3ccd4a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 20 Mar 2020 18:13:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=907874=20=E7=9B=98=E7=82=B9=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E8=BF=99=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=94=B1=E4=BA=8E=E5=90=8E=E5=8F=B0=E5=8F=96=E5=80=BC=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=95=8C=E9=9D=A2=E4=B8=8A?= =?UTF-8?q?=E6=97=A0=E6=98=BE=E7=A4=BA=EF=BC=8C=E9=9C=80=E8=A6=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E7=9B=AE=E5=89=8D=E7=9A=84=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E7=9C=8B=E7=AC=AC=E4=BA=8C=E4=B8=AA=E5=AD=97=E6=AE=B5=E4=B8=AD?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E4=B8=BA=E5=BA=93=E5=8C=BA=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=8F=96=E5=BA=93=E5=8C=BA=E6=89=80=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E5=BA=93=E5=AD=98=E5=9C=B0=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/WmsCSOrderMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 6d70ddc..8d41562 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -104,6 +104,10 @@ public class WmsCSOrderMaster extends BaseBean { public String wmsCSZonesStr; @Transient + @ApiParam(value = "盘点库存地清单") + public String wmsAreaNosStr; + + @Transient @ApiParam(value = "盘点库位清单") public String[] wmsCSLocates; From 99ecde38d2c77dc008b106e78996cf223386a508 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 20 Mar 2020 18:14:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=907874=20=E7=9B=98=E7=82=B9=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E8=BF=99=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=94=B1=E4=BA=8E=E5=90=8E=E5=8F=B0=E5=8F=96=E5=80=BC=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=95=8C=E9=9D=A2=E4=B8=8A?= =?UTF-8?q?=E6=97=A0=E6=98=BE=E7=A4=BA=EF=BC=8C=E9=9C=80=E8=A6=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E7=9B=AE=E5=89=8D=E7=9A=84=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E7=9C=8B=E7=AC=AC=E4=BA=8C=E4=B8=AA=E5=AD=97=E6=AE=B5=E4=B8=AD?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E4=B8=BA=E5=BA=93=E5=8C=BA=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=8F=96=E5=BA=93=E5=8C=BA=E6=89=80=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E5=BA=93=E5=AD=98=E5=9C=B0=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/WmsCSOrderMaster.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 8d41562..c632d9f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -121,4 +121,5 @@ public class WmsCSOrderMaster extends BaseBean { public Integer getIsInventoryVal() { return this.isInventory == null ? 0 :this.isInventory.intValue(); } + }