From 5dc142ba3459a35872606257db53460f4b12929a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 7 Sep 2020 09:56:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=902719=2006=201.1.10=09=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=96=87=E6=A1=A3=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E7=94=9F=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=96=B0=E5=A2=9E=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 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 b89b62b..c7e88b6 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 @@ -6382,7 +6382,7 @@ public class WmsEnumUtil { BIGDECIMAL_FORMAT(9, "Bigdecimal", "BigDecimal格式"), BLOB_FORMAT(10, "Blob", "BLOB格式"), CLOB_FORMAT(11, "Clob", "CLOB格式"), - TIMESTAMP_FORMAT(12, "Timestamp", "时间戳格式") + TIMESTAMP_FORMAT(12, "Timestamp", "时间戳格式"); private int value; private String code; From 193cff013f0e38a62199bb6eb539d1b87e60b83b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 8 Sep 2020 10:26:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=902737=2009=201.2.1.9.1=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E6=96=B0=E5=A2=9E=E5=BA=93=E4=BD=8D=E5=88=AB=E5=90=8D?= =?UTF-8?q?=E3=80=91?= 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 +++++ 1 file changed, 5 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 2779b7f..3a2c1e7 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 @@ -190,6 +190,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description") private Integer upY; + @Column(name = "LOCATE_ALIAS") + @ApiParam(value = "库位别名") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String locateAlias; + // 导入用 @ApiParam(value = "工厂") @Transient