From 8ef0e787b9bbc044db468f3aa69329ef3e0fce5a Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 26 Mar 2019 09:10:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=8F=8D=E5=90=91?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 67cc0ee..2c9d494 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 @@ -93,5 +93,5 @@ public class WmsLocate extends BaseBean { @Column(name="PART_QTY") @ApiParam(value ="零件数", example = "-1") - private Integer partQty; + private Double partQty; } From a8f330723735d93bc335f6f1618d27b18ba4fb60 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 26 Mar 2019 11:12:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E8=AE=B0=E5=BD=95=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 149 --------------------- 1 file changed, 149 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 2d479ab..e913099 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 @@ -180,57 +180,6 @@ public class WmsEnumUtil { } /** - * 主表信息 单据来源 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORDER_SRC { - MNU(10, "MNU", "手工"), - ERP(20, "ERP", "ERP接口"); - - private int value; - private String code; - private String description; - - ORDER_SRC(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public String getCode() { - return code; - } - - 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; - } - } - - /** * 主表信息 单据类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -425,69 +374,6 @@ public class WmsEnumUtil { } } - /** - * 消息队列，队列名称 - * 1: success_queue - * 2: fail_queue - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum QUEUE_NAME { - - SUCCESS_QUEUE(1, "wms_success_queue", "成功消息队列"), - PENDING_QUEUE(2, "wms_pending_queue", "待处理消息队列"); - - private int value; - private String name; - private String description; - - QUEUE_NAME(int value, String name, String description) { - this.value = value; - this.name = name; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getName() { - return name; - } - - public String getDescription() { - return description; - } - - public static String valueOfCode(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].name; - } - } - return tmp; - } - - public static String valueOfDescription(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 String codeOfDescription(String code) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].name.equals(code)) { - tmp = values()[i].description; - } - } - return tmp; - } - } /** * 产品入库的产品状态 @@ -1293,41 +1179,6 @@ public class WmsEnumUtil { } } - /** - * 库存移动单明细状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MOVE_DETAIL_STATUS { - CREATE(10, "创建"), - BE_HANDLE(20, "待处理"), - FINISH(30, "已处理"); - - private int value; - private String description; - - MOVE_DETAIL_STATUS(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; - } - } /** * 质检业务类型 From 871fae62ec9f3b066d83d724dc26da45e987dc92 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 26 Mar 2019 18:48:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=8D=E5=86=99=E5=BA=93=E4=BD=8Dget?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 67cc0ee..f847e67 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 @@ -94,4 +94,20 @@ public class WmsLocate extends BaseBean { @Column(name="PART_QTY") @ApiParam(value ="零件数", example = "-1") private Integer partQty; + + public Integer getMaxPackageQty() { + return this.maxPackageQty == null ? 0 : this.maxPackageQty; + } + + public Integer getMaxPartQty() { + return this.maxPartQty == null ? 0 : this.maxPartQty; + } + + public Integer getBoxQty() { + return this.boxQty == null ? 0 : this.boxQty; + } + + public Integer getPartQty() { + return this.partQty == null ? 0 : this.partQty; + } }