Merge remote-tracking branch 'origin/dev' into dev

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;

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