From 6d1c0bb46da9bb532249df591e333f949ac225ef Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 23 May 2020 13:02:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BH=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= 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 | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) 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 dc5f9e6..cb8f16f 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 @@ -156,6 +156,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @ApiParam(value = "三维位置") private String position; + @Column(name = "BH_LOCATE_TYPE") + @ApiParam(value = "BH库位类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_LOCATE_TYPE") + private Integer bhLocateType; + // 导入用 @ApiParam(value = "工厂") @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index aefb531..235fd54 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -278,12 +278,6 @@ public class WmsPart extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) public Integer isRecycle; - @Column(name = "BH_LOCATE_TYPE") - @ApiParam(value = "BH库位类型") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_LOCATE_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.BH_LOCATE_TYPE.class, refForeignKey = "value", value = "description", hidden = true) - private Integer bhLocateType; - public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue();