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 e789365..c8c1bab 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 @@ -4945,4 +4945,42 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 领料看板执行状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PICKING_EXECUTE_STATUS { + IN_PROGRESS(1, "执行中"), EXPIRED(2, "已超期"), NORMAL(3, "正常"); + + private int value; + private String description; + + PICKING_EXECUTE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 379fd9d..4493f44 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -218,6 +218,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "汇总拣货数量", example = "0") public Double sumPickQty; + @Transient + @ApiParam("执行状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description") + private Integer executeStatus; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; }