From cf507fdb48b533568468c85142637a852b78efef Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 26 May 2020 18:08:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90BATCH=E5=BD=95=E5=85=A5=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=80=BC-=E9=9C=80=E8=A6=81=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 3ba3899..148e7a8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -594,6 +594,7 @@ public class WmsStockSn extends BaseBean { public WmsStockSn(WmsStockSn stockSn, String batchCode) { + this.id = stockSn.getId(); this.organizeCode = stockSn.getOrganizeCode(); this.refSrc = stockSn.getRefSrc(); this.partNo = stockSn.getPartNo(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java index eff8e6c..7873a6a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java @@ -74,6 +74,10 @@ public class WmsTestResultDetails extends BaseBean { @ApiParam("已检测数") private Long checkSize; + @Transient + @ApiParam("移动单单号") + private String moveNo; + public WmsTestResultDetails() { } From 5d32b43e51a3a1c8d44590fcd0e3a590224e9c68 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 26 May 2020 21:18:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BH-CODE=20=E5=87=BA=E5=BA=93=EF=BC=8C?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= 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 | 5 +++-- 1 file 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 7b4d582..0cf37f0 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 @@ -6505,8 +6505,9 @@ public class WmsEnumUtil { public enum REWORK_STATUS { INIT(10, "INIT", "初始化"), BE_HANDLE(20, "BE_HANDLE", "待处理"), - FINISH(30, "FINISH", "已处理"), - NONE(40, "NONE", "不处理"); + HANDLING(30, "HANDLING", "处理中"), + FINISH(40, "FINISH", "已处理"), + NONE(50, "NONE", "不处理"); private int value; private String code;