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 768dc10..a7949c1 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 @@ -2187,4 +2187,104 @@ public class WmsEnumUtil { return null; } } + + /** + * 系统参数类型 + * 1.SYSTEM:系统参数 + * 2.BUSI:业务参数 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMS_CONFIG_TYPE{ + + SYSTEM(10,"系统参数","系统参数"), + BUSI(20, "业务参数", "业务参数"); + + private int value; + private String name; + private String description; + + WMS_CONFIG_TYPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].name; + } + } + return tmp; + } + + public static String valueOfDescription(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 codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 系统配置值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMS_CONFIG_VALUE_TYPE { + CHECKLIST(10, "可选列表"), + NUMBER(20, "数字"), + STRING(30, "字符串"); + + private int value; + private String description; + + WMS_CONFIG_VALUE_TYPE(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; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java index cee5f2c..68f5355 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java @@ -30,7 +30,7 @@ public class WmsBusiType extends BaseBean { @Column(name = "BUSI_TYPE_CODE") @ApiParam(value = "类型编号") - private String busiTypeCode; + private Integer busiTypeCode; @Column(name = "BUSI_TYPE_NAME") @ApiParam(value = "类型名称") 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 bff377e..ffb6744 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 @@ -126,6 +126,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "打印时间") private String printDate; + @Transient + @ApiParam("类型名称") + public String busiTypeName; + // public Integer getIsSn() { //// return isSn == null ? 0 : this.getIsSn(); //// } 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 51ac278..f53fe7d 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 @@ -1722,7 +1722,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsBusiType.getBusiTypeCode(), "busiTypeCode", result); + DdlPreparedPack.getNumEqualPack(wmsBusiType.getBusiTypeCode(), "busiTypeCode", result); DdlPreparedPack.getStringEqualPack(wmsBusiType.getBusiTypeName(), "busiTypeName", result); DdlPreparedPack.getNumEqualPack(wmsBusiType.getMoveType(), "moveType", result);