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 0240ccf..80aec01 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 @@ -2022,18 +2022,17 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_STATUS { - ENABLE(1, "启用"), - DISABLE(2, "禁用"), - LOCKING(3, "全部"); + ENABLE(1, "启用", "fa fa-success cell-fa fa-check"), + DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle"), + LOCKING(3, "全部", "fa cell-fa fa-lock"); private int value; + private String code; private String description; - DATA_STATUS() { - } - - DATA_STATUS(int value, String description) { + DATA_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -2045,11 +2044,15 @@ public class WmsEnumUtil { return description; } - public static int descOf(String desc) { - int tmp = 1; + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; + if (values()[i].value == val) { + tmp = values()[i].getCode(); } } return tmp; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 4f5de49..eb5b996 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -56,6 +56,11 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "结束组件编号", example = "0") private Long endAmId; + // 1=true, 2 = false + @Column(name="AUTO_INIT") + @ApiParam(value = "任务自动初始化", example = "0") + private Integer autoInit; + public Long getInitAmId() { if (initAmId != null) { return initAmId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index ec2dbfd..b895877 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -89,4 +89,12 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "PRIORITY") @ApiParam(value = "优先级", example = "1") public Integer priority; + + @Column(name = "CAR_NO") + @ApiParam(value = "车牌号") + private String carNo; + + @Column(name = "CUST_ORDER_NO") + @ApiParam(value = "客户单号") + private String custOrderNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 2bfbed9..ef9999f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1423,4 +1423,16 @@ public class WmsHqlPack { getStringBuilderPack(wmsDataAuth, result); return result.toString(); } + + /** + * 根据条件查询任务明细信息 + * @param taskDetails + * @return + */ + public static String packHqlWmsTaskDetails(WmsTaskDetails taskDetails) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(taskDetails.getOrderNo(), "orderNo", result); + getStringBuilderPack(taskDetails, result); + return result.toString(); + } }