From 18c6a72b3e3a4c5c8013a5afed49bc339a1b238e Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Mon, 15 Apr 2019 20:20:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/SwebEnumUtil.java | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 152de1f..6cc2dc7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -139,4 +139,49 @@ public class SwebEnumUtil { return description; } } + + /** + * 订单类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_TYPE { + CREATE(10, "标准包装"), + RECEIPT(20, "非标包装"); + + private int value; + private String description; + + ORDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } From 03b28b568283111659e07b78998b40dabe177de8 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 16 Apr 2019 13:53:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=9E=8B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5get=E6=96=B9=E6=B3=95=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 7fda75e..39608ba 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -126,4 +126,8 @@ public class WmsDocMovementMaster extends BaseBean { @Transient @ApiParam(value = "打印时间") private String printDate; + + public Integer getIsSn() { + return isSn == null ? 0 : this.getIsSn(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 6b60984..a650262 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -111,4 +111,7 @@ public class WmsLocate extends BaseBean { return this.partQty == null ? 0 : this.partQty.doubleValue(); } + public Integer getLocateType() { + return this.locateType== null ? 0 : this.locateType.intValue(); + } } From a745015be70d7530b9e0aa862b63cf1b9aca9273 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 16 Apr 2019 14:38:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E6=9D=A1=E7=A0=81=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) 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 5ccdb20..d2088c2 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 @@ -2031,4 +2031,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 单据是否指定条码 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_IS_SN { + IS_APPOINT_SN(1, "指定条码"), APPOINT_SN(2, "不指定条码"); + + private int value; + private String description; + + ORDER_IS_SN(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } }