From fc9b8629ab54471f551f60056411576e234050ca Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 20 Dec 2019 18:07:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?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/base/enumutil/WmsEnumUtil.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 617148e..9d8a428 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 @@ -1076,7 +1076,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CARRIAGE_STATUS { CREATE(10, "创建"), - PUBLISH(20, "发布"), + PUBLISH(20, "已发布"), RECEIVE(30, "承运商接收"), ARRIVE(40, "车辆到达"), INSTALL(50, "装车完成"), 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..0f5c29e 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("默认规则") + private String defaultRule; }