From 996526ac7cd17e41fe71e20e0d5856f58aece9e6 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 20 Dec 2019 15:11:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90bug7088=20=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=E5=AF=BC=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 14 ++++++++++++-- 1 file changed, 12 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 5097556..2e16847 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 @@ -3030,8 +3030,8 @@ public class WmsEnumUtil { public enum WMS_PART_TYPE_STR { - 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 String value; private String description; @@ -3057,6 +3057,16 @@ public class WmsEnumUtil { } return tmp; } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(val)) { + tmp = values()[i].value; + } + } + return tmp; + } } From 393d3f12b84845f2cc4ca7d9a77bd66ba9adc446 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 20 Dec 2019 16:44:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=907055=20=E6=96=B0=E5=A2=9E=E6=B3=A2?= =?UTF-8?q?=E6=AC=A1=E6=8B=A3=E8=B4=A7=E6=B5=81=E7=A8=8B=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index 48e8954..1f3d722 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -33,4 +33,7 @@ public class WmsStockFifoModel { @ApiParam(value = "物料对应的存储区集合") Map> partToZonesMap; + + @ApiParam(value = "波次配料物料清单") + boolean collectPicking = false; } 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 312209b..3ac14cc 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 @@ -272,4 +272,13 @@ public class WmsDocMovementDetails extends BaseBean { this.destLocateNo = destLocateNo; } + public WmsDocMovementDetails (String partNo) { + this.partNo = partNo; + } + + public WmsDocMovementDetails (String partNo,String orderNo) { + this.partNo = partNo; + this.orderNo = orderNo; + } + }