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 19cfb3a..233564a 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 @@ -444,8 +444,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_MOVE_TYPE { IN_STORE(1, "IN", "入库"), - OUT_STORE(2, "OUT", "出库"), - MOVE_STORE(3, "MOVE", "移库"); + OUT_STORE(10, "OUT", "出库"), + MOVE_STORE(20, "MOVE", "移库"); private int value; private String code; @@ -496,17 +496,17 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_BUSI_TYPE { RECEIVE_GOODS(1, "RC", "收货"), - QUALITY_TESTING(2, "QC", "质检"), - IN_STORE(3, "IN", "入库"), - MIX_RECEIVE(4, "ZI", "杂收"), - MIX_SEND(5, "ZO", "杂发"), - SUPPLIER_RETURN_GOODS(6, "VJ", "供应商退货"), - CUSTOMER_RETURN_GOODS(7, "CJ", "客户退货"), - ORDER_PICKING_PART(8, "WP", "工单领料"), - ORDER_RETURN_PART(9, "WJ", "工单退料"), - MOVE_IN(10, "MI", "移库入库"), - MOVE_OUT(11, "MO", "移库出库"), - SEND(12, "SO", "发运"); + QUALITY_TESTING(10, "QC", "质检"), + IN_STORE(20, "IN", "入库"), + MIX_RECEIVE(30, "ZI", "杂收"), + MIX_SEND(40, "ZO", "杂发"), + SUPPLIER_RETURN_GOODS(50, "VJ", "供应商退货"), + CUSTOMER_RETURN_GOODS(60, "CJ", "客户退货"), + ORDER_PICKING_PART(70, "WP", "工单领料"), + ORDER_RETURN_PART(80, "WJ", "工单退料"), + MOVE_IN(90, "MI", "移库入库"), + MOVE_OUT(100, "MO", "移库出库"), + SEND(110, "SO", "发运"); private int value; private String code; @@ -751,4 +751,92 @@ public class WmsEnumUtil { return tmp; } } + /** + * 外部单据：移库单单据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_MASTER_ORDER_TYPE { + ORDER_PULL_PART(1, "工单配料"); + + private int value; + private String description; + + OUT_MOVEMENT_MASTER_ORDER_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; + } + + 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; + } + } + /** + * 外部单据：移库单关联单据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE { + ASN(1, "ASN"), + PO(10, "PO"), + SO(20, "SO"); + + private int value; + private String description; + + OUT_MOVEMENT_MASTER_LINK_ORDER_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; + } + + 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 1a3bc2a..3c168e6 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 @@ -35,7 +35,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "MOVE_TYPE") @ApiParam("移动类型") - public String moveType; + public Integer moveType; /** * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, @@ -66,11 +66,11 @@ public class WmsDocMovementMaster extends BaseBean { private Integer version; /** - * 单据类型::1=工单配料 + * 关联单据类型:1=ASN,10=PO,20=SO */ @Column(name = "REF_TYPE") @ApiParam(value = "关联单据类型") - private String refType; + private Integer refType; @Column(name = "REF_NO") @ApiParam(value = "关联单据") @@ -85,7 +85,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "ORDER_TYPE") @ApiParam(value = "单据类型") - private String orderType; + private Integer orderType; @Column(name = "PART_NO") @ApiParam(value = "物料编码") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 3b6b83d..0004a3f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -36,7 +36,7 @@ public class WmsLocatePart extends BaseBean{ @ApiParam(value ="物料编码") private String partNo; - @Column(name="PART_NAME") + @Column(name="PART_NAME_RDD") @ApiParam(value ="物料名称") - private String partName; + private String partNameRdd; } 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 ee20e6d..67388a3 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 @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; @@ -71,7 +70,6 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); @@ -128,12 +126,10 @@ public class WmsHqlPack { */ public static String packHqlWmsRoutingChildren(String routingCode) { StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(routingCode, "routingCode", result); - HqlPack.getStringEqualPack(routingCode, "routingCode", result); - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - return result.toString(); } @@ -211,7 +207,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsLocatePart.getPartName(), "partName", result); + HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); HqlPack.getNumEqualPack(wmsLocatePart.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(),"organizeCode",result); @@ -549,6 +545,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); //客户编码 HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result); + //物料编码 + HqlPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result); //条码 HqlPack.getStringLikerPack(wmsShopping.getSn(), "sn", result); //发运状态