From 88af19f8e9b4e5df3a9108e97790097291c5d6c3 Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Tue, 29 Oct 2019 11:11:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8F=91?=
=?UTF-8?q?=E7=8E=AF=E5=A2=83pom=E6=96=87=E4=BB=B6test=E4=B8=BAdev?=
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 4426ba9..b6adafd 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 6c22c39..7f12b9c 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 f220aa1..f355cca 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 b8842edbb110ef267b26d636310e7530a617bb84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?=
Date: Tue, 29 Oct 2019 11:33:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0=E6=9D=A1=E7=A0=81=E6=89=93?=
=?UTF-8?q?=E5=8D=B0=EF=BC=9A=E6=96=B0=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
=?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
index 76aad42..0a90db5 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
@@ -185,6 +185,10 @@ public class WmsMoveDetails extends BaseBean {
@Transient
private Integer isSnapshot;
+ @Transient
+ @ApiParam(value = "车号")
+ private String carNo;
+
public Integer getIsSnapshot() {
return isSnapshot == null ? 0 : isSnapshot.intValue();
}
@@ -225,12 +229,14 @@ public class WmsMoveDetails extends BaseBean {
public Long getFinishedCounts() {
return finishedCounts == null ? 0L : this.finishedCounts;
}
+
public WmsMoveDetails(String partNo, String partNameRdd, String unit, Double transQty) {
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.unit = unit;
this.transQty = transQty;
}
+
public WmsMoveDetails(String organizeCode, String partNo, String partNameRdd, String workCenterCode, String fPartNo, String fPartName, String unit, Double qty,
String createDateTime, String sn, String srcZoneNo) {
this.organizeCode = organizeCode;