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 f75521d..904d9b3 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 @@ -726,7 +726,8 @@ public class WmsEnumUtil { TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), LOADING_ORDER(530, "LOADING_ORDER", "装车单"), - SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"); + SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"), + FORK_INSTORE(550, "FORK_INSTORE", "采购入库"); private int value; private String code; private String description; @@ -4133,7 +4134,8 @@ public class WmsEnumUtil { MENU_OPT(30, "MENU_OPT", "手工操作"), AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"), CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单"), - UPDATE_TASK(60, "UPDATE_TASK", "复用任务"); + UPDATE_TASK(60, "UPDATE_TASK", "复用任务"), + AUTO_INSTORE_DOCMOVE(70, "AUTO_INSTORE", "自动入库移库单"); private int value; private String code; 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 e75def7..640dca1 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 @@ -109,6 +109,7 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @Column(name = "STATUS") @ApiParam(value = "库位状态", example = "-1") + @AnnoOutputColumn(refClass = WmsEnumUtil.LOCATE_STATUS.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "LOCATE_STATUS") private Integer status;