From 592cd15add20850b77c9086d831a130505676ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 27 Aug 2019 20:33:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=9E=9A=E4=B8=BE=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E3=80=81=E5=BA=93=E4=BD=8D=E5=AF=BC=E5=85=A5=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 +-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 6 ++++++ 2 files changed, 7 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 203bbce..f324149 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 @@ -1139,8 +1139,7 @@ public class WmsEnumUtil { CREATE(10, "创建"), BE_HANDLE(20, "待处理"), FINISH(30, "已处理"), - HANDLE_ERROR(40, "处理出错"), - TEST(50, "调试"); + HANDLE_ERROR(40, "处理出错"); private int value; private String description; 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 4c288f4..4bc52e7 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库位表 @@ -96,6 +97,11 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "零件数", example = "-1") private Double partQty; + // 导入用 + @ApiParam(value = "工厂") + @Transient + private String factory; + public Integer getMaxPackageQty() { return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue(); }