From 9567d62195c250a0507ab64676b4cff66bdc1551 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sun, 21 Jun 2020 17:39:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=87=AA=E5=8A=A8=E5=8C=96=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 46 ++++++++++++++++++++++ .../pojo/wms/bean/WmsAutoStrategyMaster.java | 2 +- 2 files changed, 47 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 98df4b4..c22fa26 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 @@ -8197,4 +8197,50 @@ public class WmsEnumUtil { return null; } } + + /** + * 自动化策略 数量控制 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AUTO_STRATEGY_QTY_CONTROL { + LESS_SEND(10, "少发"), + MANY_SEND(20, "多发"), + CONSISTENT(30, "一致"); + + private int value; + private String description; + + AUTO_STRATEGY_QTY_CONTROL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static AUTO_STRATEGY_QTY_CONTROL codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java index ca598b0..9a4437d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java @@ -72,7 +72,7 @@ public class WmsAutoStrategyMaster extends BaseBean { @Column(name = "STRATEGY_QTY_CONTROL") @ApiParam(value = "数量控制") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "SHIPP_QTY_CONTROL") - @AnnoOutputColumn(refClass = WmsEnumUtil.SHIPP_QTY_CONTROL.class, refForeignKey = "value", value = "description", hidden = true) + @AnnoOutputColumn(refClass = WmsEnumUtil.AUTO_STRATEGY_QTY_CONTROL.class, refForeignKey = "value", value = "description", hidden = true) private Integer strategyQtyControl; @Column(name = "START_EFFECT_DATE")