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 4466eca..5c4d7c6 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 @@ -793,20 +793,21 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE { - ASN(10, "ASN"), - PO(20, "PO"), - SO(30, "SO"), - MOVE(40, "MOVE"), - IN_STOCK(50, "IN_STOCK"), - SHIPPING(60, "SHIPPING"), - QC(70, "QC"), - CS(80, "CS"); - + ASN(10, "ASN", "ASN"), + PO(20, "PO", "PO"), + SO(30, "SO", "SO"), + MOVE(40, "MOVE", "MOVE"), + IN_STOCK(50, "IN_STOCK", "IN_STOCK"), + SHIPPING(60, "SHIPPING", "SHIPPING"), + QC(70, "QC", "QC"), + CS(80, "CS", "CS"); private int value; + private String code; private String description; - OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE(int value, String description) { + OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -818,6 +819,10 @@ public class WmsEnumUtil { return description; } + public String getCode() { + return code; + } + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -827,6 +832,16 @@ public class WmsEnumUtil { } return tmp; } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** 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 ea6d716..9973ec6 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 @@ -45,7 +45,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "BUSI_TYPE") @ApiParam("业务类型") - public String busiType; + public Integer busiType; /** * 状态:0=新建,10=处理中 @@ -72,7 +72,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "REF_TYPE") @ApiParam(value = "关联单据类型") - private Integer refType; + private String refType; @Column(name = "REF_NO") @ApiParam(value = "关联单据") @@ -82,13 +82,6 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "ERP单号") private String erpSrcNo; - /** - * 单据类型::1=工单配料 - */ - @Column(name = "ORDER_TYPE") - @ApiParam(value = "单据类型") - private Integer orderType; - @Column(name = "PART_NO") @ApiParam(value = "物料编码") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 7e3ca01..9d6017f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -101,7 +101,7 @@ public class WmsMoveDetails extends BaseBean { */ @Column(name="REF_TYPE") @ApiParam("关联单据类型") - public Integer refType; + public String refType; @Column(name="REF_SRC") @ApiParam("关联单号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index efb19cd..34304db 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -125,8 +125,8 @@ public class WmsStockSn extends BaseBean { * 1=ASN,10=PO,20=SO */ @Column(name = "REF_TYPE") - @ApiParam(value = "关联单据类型", example = "0") - private Integer refType; + @ApiParam(value = "关联单据类型") + private String refType; @Column(name = "REF_SRC") @ApiParam(value = "关联单号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index e65c004..d71b02d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -103,8 +103,8 @@ public class WmsTaskDetails extends BaseBean { private String destWhNo; @Column(name = "REF_TYPE") - @ApiParam(value = "关联单据类型", example = "1") - private Integer refType; + @ApiParam(value = "关联单据类型") + private String refType; @Column(name = "REF_SRC") @ApiParam(value = "关联单据编号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java index f29d8e1..523b240 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -38,7 +38,7 @@ public class WmsTaskSrc extends BaseBean { @Column(name = "BUSI_TYPE") @ApiParam("业务类型") - public String busiType; + public Integer busiType; @Column(name = "PRIORITY") @ApiParam("优先级") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java index 6aff20c..4e75005 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java @@ -35,7 +35,7 @@ public class WmsTempOrderLock extends BaseBean { */ @Column(name="BIZ_TYPE") @ApiParam("业务类型") - public String bizType; + public Integer bizType; @Column(name="ORDER_NO") @ApiParam("单号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 9d85d12..f931e6e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -75,8 +75,8 @@ public class WmsTransQuan extends BaseBean { * ASN,PO,SO */ @Column(name = "REF_TYPE") - @ApiParam(value = "关联单据类型", example = "1") - public Integer refType; + @ApiParam(value = "关联单据类型") + public String refType; @Column(name = "REF_SRC") @ApiParam(value = "关联单号") 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 5be8731..9be52e1 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 @@ -756,7 +756,7 @@ public class WmsHqlPack { // 订单号 HqlPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); // 业务类型 - HqlPack.getStringEqualPack(wmsTempOrderLock.getBizType(), "bizType", result); + HqlPack.getNumEqualPack(wmsTempOrderLock.getBizType(), "bizType", result); // 物料代码 HqlPack.getStringEqualPack(wmsTempOrderLock.getPartNo(), "partNo", result);