From 37008febabde05bdc57becce09d42934dea08254 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 13 Nov 2018 18:02:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 54 ++++++++++++++++++++-- 1 file changed, 49 insertions(+), 5 deletions(-) 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 98aca6c..1cd5189 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; @@ -209,7 +210,6 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsObject.getTableName(), "tableName", result); // 自定义业务拦截 HqlPack.getStringEqualPack(wmsObject.getBizIntercept(), "bizIntercept", result); - return result.toString(); } @@ -241,7 +241,6 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result); HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); - return result.toString(); } @@ -258,7 +257,6 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result); HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result); HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true); - return result.toString(); } @@ -275,6 +273,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); HqlPack.getNumEqualPack(wareHouse.getIsValid(), "isValid", result); HqlPack.getStringEqualPack(wareHouse.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -298,6 +297,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result); } HqlPack.getNumEqualPack(basVendor.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -317,6 +317,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result); HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result); HqlPack.getStringEqualPack(wmsOpType.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -331,6 +332,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wareHouse.getName(), "name", result); HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result); HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -348,6 +350,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -355,6 +358,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringEqualPack(wmsOpType.getOpTypeName(), "opTypeName", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -424,14 +428,15 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(),"orderNo",result); - HqlPack.getStringLikerPack(wmsASNMaster.getType(),"type",result); - HqlPack.getStringLikerPack(wmsASNMaster.getStatus().toString(),"status",result); + HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(),"type",result); + HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(),"status",result); HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(),"vendorNo",result); HqlPack.getStringLikerPack(wmsASNMaster.getVersion(),"version",result); HqlPack.getStringLikerPack(wmsASNMaster.getSrc(),"src",result); HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(),"poNo",result); //有效性 HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -456,4 +461,43 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsShopping.getStatus().toString(), "status", result); return result.toString(); } + + /** + * 明细表唯一性查询 + * @return + */ + public static String packHqlwmsASNMasterDetailsUnique(WmsASNMasterDetails wmsASNMasterDetails){ + StringBuffer result = new StringBuffer(); + //有效性 + HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + return result.toString(); + } + + public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails){ + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getItem(), "item", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result); + HqlPack.getNumLikerPack(wmsASNMasterDetails.getQty(), "qty", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getPoItem(), "poItem", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getUnit(), "unit", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getZDate(), "zDate", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getZTime(), "zTime", result); + HqlPack.getNumLikerPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getPackAge(), "packAge", result); + HqlPack.getNumLikerPack(wmsASNMasterDetails.getIsFree(), "isFree", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getDock(), "dock", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); + + //有效性 + HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + return result.toString(); + } } From 22d5ba1c0f3158e5b230918b31d7465987fd3a20 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 13 Nov 2018 18:02:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 120 +++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 8 +- .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 6 +- 3 files changed, 127 insertions(+), 7 deletions(-) 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 feecd2a..9226919 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 @@ -213,4 +213,124 @@ public class WmsEnumUtil { return tmp; } } + + /** + * ASN单据类型 + */ + public enum ASN_ORDER_TYPE{ + + REG("REG","原物料采购"),SUB("SUB","委外采购"),TAR("TAR","多角贸易采购"),TAP("TAP","多角代采购"); + + private String value; + private String description; + + ASN_ORDER_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * ASN明细表状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ASN_MASTER_ORDER_STATUS { + NORMAL(1, "N", "正常"), + CANCEL(2, "C", "行取消"), + RECEIPTED(3, "R", "已收货"); + + private int value; + private String code; + private String description; + + private ASN_MASTER_ORDER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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].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; + } + } + + /** + * 是否已删除 + */ + public enum IS_DELETED { + DELETED(1, "已删除"), INDELETED(2, "未删除"); + + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + IS_DELETED(int value, String description) { + this.value = value; + this.description = 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/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index f561ecf..d0f47fa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -36,17 +36,17 @@ public class WmsASNMaster extends BaseBean { * 单据类型:REG=原物料采购, * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购 */ - @Column(name="TYPE") + @Column(name="ASN_TYPE") @ApiParam("单据类型") - public String type; + public String asnType; /** * 状态:0=新建,10=收货中,20=收货完成, * 30=入库中,40=入库完成,90=已关闭,91=已取消 */ - @Column(name="STATUS") + @Column(name="ASN_STATUS") @ApiParam(value = "状态", example = "0") - public Integer status; + public Integer asnStatus; @Column(name="VENDOR_NO") @ApiParam("供应商编号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index de5cc1f..ccc7391 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -67,13 +67,13 @@ public class WmsASNMasterDetails extends BaseBean { /** * 状态:N=正常,C=行取消,R=已收货 */ - @Column(name="STATUS") + @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "1") - public Integer status; + public Integer itemStatus; @Column(name="PACKAGE") @ApiParam("包装名称") - public String pageAge; + public String packAge; /** * 是否免费:0=计费,1=免费