From f6774002734f6b8178aa8fa78502f5ff61ea543b Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 14 Nov 2018 09:16:04 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 db2f24e..30f9b61 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 @@ -291,7 +291,7 @@ public class WmsEnumUtil { public enum QUEUE_NAME{ SUCCESS_QUEUE(1,"success_queue","成功消息队列"), - FAIL_QUEUE(1,"fail_queue","成功消息队列"); + FAIL_QUEUE(2,"fail_queue","成功消息队列"); private int value; private String name; From db8e8696742492106005dab238d2a4a000a3553a Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 14 Nov 2018 10:44:36 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 112 ++++++++++++--------- 1 file changed, 62 insertions(+), 50 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 e151350..f7e9fbd 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.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; @@ -47,6 +48,7 @@ public class WmsHqlPack { return result.toString(); } + /** * 库存移动单查询封装 * @@ -58,7 +60,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsDocMovementMaster.getMoveType(), "moveType", result); + HqlPack.getStringEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result); HqlPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", result); HqlPack.getNumEqualPack(wmsDocMovementMaster.getPartNo(), "partNo", result); HqlPack.timeBuilder(wmsDocMovementMaster.getCreateDateTimeStart(), wmsDocMovementMaster.getCreateDateTimeEnd(), "createDatetime", result, true); @@ -66,6 +68,7 @@ public class WmsHqlPack { return result.toString(); } + /** * PO订单主表信息 分页查询 * @@ -151,6 +154,7 @@ public class WmsHqlPack { */ public static String packHqlWmsPart(WmsPart wmsPart) { StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDatetime", result, true); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); @@ -159,6 +163,10 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsPart.getIqc(), "iqc", result); HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result); HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result); + + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + "isDeleted", result); + return result.toString(); } @@ -327,7 +335,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); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } @@ -351,7 +359,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); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } @@ -365,13 +373,13 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); - if(wmsOpType.getSeq()!= null){ + if (wmsOpType.getSeq() != null) { HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(), "seq", result); } 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); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } @@ -386,7 +394,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); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } @@ -404,7 +412,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); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } @@ -412,7 +420,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); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } @@ -475,22 +483,23 @@ public class WmsHqlPack { /** * ASN订单分页查询条件 + * * @param wmsASNMaster * @return */ - public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster){ + public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(),"orderNo",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.getStringLikerPack(wmsASNMaster.getOrderNo(), "orderNo", 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.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -541,17 +550,18 @@ public class WmsHqlPack { /** * 明细表唯一性查询 + * * @return */ - public static String packHqlwmsASNMasterDetailsUnique(WmsASNMasterDetails wmsASNMasterDetails){ + 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); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } - public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails){ + public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); HqlPack.getStringLikerPack(wmsASNMasterDetails.getItem(), "item", result); @@ -574,52 +584,54 @@ public class WmsHqlPack { //有效性 HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } /** * 产品入库信息 条件封装 + * * @param wmsFGInStock * @return */ - public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock){ - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsFGInStock.getOrderNo(),"orderNo",result); - HqlPack.getStringLikerPack(wmsFGInStock.getWoNo(),"woNo",result); - HqlPack.getStringLikerPack(wmsFGInStock.getPartNo(),"partNo",result); - HqlPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(),"partNameRdd",result); - HqlPack.getNumEqualPackDouble(wmsFGInStock.getQty(),"qty",result); - HqlPack.getStringLikerPack(wmsFGInStock.getUnit(),"unit",result); - HqlPack.getStringLikerPack(wmsFGInStock.getSn(),"sn",result); - HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(),"orderStatus",result); - HqlPack.getStringLikerPack(wmsFGInStock.getReMark(),"reMark",result); - HqlPack.getStringLikerPack(wmsFGInStock.getSrc(),"src",result); - HqlPack.getStringLikerPack(wmsFGInStock.getErpWhNo(),"erpWhno",result); - HqlPack.getStringLikerPack(wmsFGInStock.getLineNo(),"lineNo",result); - HqlPack.getStringLikerPack(wmsFGInStock.getWhNo(),"whNo",result); - HqlPack.getStringLikerPack(wmsFGInStock.getCustNo(),"custNo",result); - HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(),"shippingFlag",result); - HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(),"mfgLogNo",result); - HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(),"isValid",result); - HqlPack.getNumEqualPack(wmsFGInStock.getIsDeleted(),"isDeleted",result); + public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsFGInStock.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsFGInStock.getWoNo(), "woNo", result); + HqlPack.getStringLikerPack(wmsFGInStock.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(), "partNameRdd", result); + HqlPack.getNumEqualPackDouble(wmsFGInStock.getQty(), "qty", result); + HqlPack.getStringLikerPack(wmsFGInStock.getUnit(), "unit", result); + HqlPack.getStringLikerPack(wmsFGInStock.getSn(), "sn", result); + HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result); + HqlPack.getStringLikerPack(wmsFGInStock.getReMark(), "reMark", result); + HqlPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result); + HqlPack.getStringLikerPack(wmsFGInStock.getErpWhNo(), "erpWhno", result); + HqlPack.getStringLikerPack(wmsFGInStock.getLineNo(), "lineNo", result); + HqlPack.getStringLikerPack(wmsFGInStock.getWhNo(), "whNo", result); + HqlPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result); + HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); + HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); + HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(wmsFGInStock.getIsDeleted(), "isDeleted", result); return result.toString(); } /** * 作业任务信息条件封装 + * * @param wmsTaskInfo * @return */ - public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo){ - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(),"moveNo",result); - HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(),"userNo",result); - HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(),"opTypeCode",result); - HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(),"reMark",result); - HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(),"taskStatus",result); - HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(),"isValid",result); - HqlPack.getNumEqualPack(wmsTaskInfo.getIsDeleted(),"isDeleted",result); + public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); + HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); + HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); + HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result); + HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); + HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(wmsTaskInfo.getIsDeleted(), "isDeleted", result); return result.toString(); } } From 014a296bcd79476063cb46193f68d6e7e1f45a55 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Wed, 14 Nov 2018 15:19:15 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=8A=BD=E7=82=B9?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 43aadf0..ca8a649 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 @@ -295,9 +295,12 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result); HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); + HqlPack.getStringLikerPack(wmsTransType.getProgCode(), "progCode", result); + HqlPack.getStringLikerPack(wmsTransType.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(wmsTransType.getIsDeleted(), "isDeleted", result); return result.toString(); } From d4fa40ed79d948527aec0abf2c565fd133c362d2 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 14 Nov 2018 16:03:52 +0800 Subject: [PATCH 4/7] =?UTF-8?q?controller&service=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 68 ++++++++-------------- 1 file changed, 25 insertions(+), 43 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 8f24368..037b57e 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 @@ -94,44 +94,22 @@ public class WmsHqlPack { } /** - * 物流路线明细查询条件封装 + * 物流路线子表查询条件封装 * - * @param wmsRoutingDetail + * @param routingCode * @return */ - public static String packHqlWmsRoutingDetail(WmsRoutingDetail wmsRoutingDetail) { + public static String packHqlWmsRoutingChildren(String routingCode) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsRoutingDetail.getRoutingCode(), "routingCode", result); - HqlPack.getStringLikerPack(wmsRoutingDetail.getOpStep(), "opStep", result); - HqlPack.getNumEqualPack(wmsRoutingDetail.getOkSeq(), "okSeq", result); - HqlPack.getNumEqualPack(wmsRoutingDetail.getNgSeq(), "ngSeq", result); - HqlPack.getNumEqualPack(wmsRoutingDetail.getSeq(), "seq", result); - HqlPack.getNumEqualPack(wmsRoutingDetail.getParentSeq(), "parentSeq", result); - HqlPack.timeBuilder(wmsRoutingDetail.getCreateDateTimeStart(), wmsRoutingDetail.getCreateDateTimeEnd(), "createDatetime", result, true); - HqlPack.getNumEqualPack(wmsRoutingDetail.getIsValid(), "isValid", result); - HqlPack.getStringEqualPack(wmsRoutingDetail.getOrganizeCode(), "organizeCode", result); - return result.toString(); - } + HqlPack.getStringLikerPack(routingCode, "routingCode", result); - /** - * 物流路线分配查询条件封装 - * - * @param wmsRoutingAssign - * @return - */ - public static String packHqlWmsRoutingAssign(WmsRoutingAssign wmsRoutingAssign) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsRoutingAssign.getWhNo(), "whNo", result); - HqlPack.getStringLikerPack(wmsRoutingAssign.getZoneNo(), "zoneNo", result); - HqlPack.getStringLikerPack(wmsRoutingAssign.getLocateNo(), "locateNo", result); - HqlPack.getStringLikerPack(wmsRoutingAssign.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsRoutingAssign.getVendorNo(), "vendorNo", result); - HqlPack.getStringLikerPack(wmsRoutingAssign.getRoutingCode(), "routingCode", result); - HqlPack.timeBuilder(wmsRoutingAssign.getCreateDateTimeStart(), wmsRoutingAssign.getCreateDateTimeEnd(), "createDatetime", result, true); - HqlPack.getStringEqualPack(wmsRoutingAssign.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + "isDeleted", result); return result.toString(); } + /** * 物流路线主表查询条件封装 * @@ -142,10 +120,11 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result); HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); - HqlPack.getNumEqualPack(wmsRoutingMaster.getSeq(), "seq", result); - HqlPack.timeBuilder(wmsRoutingMaster.getCreateDateTimeStart(), wmsRoutingMaster.getCreateDateTimeEnd(), "createDatetime", result, true); - HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result); + HqlPack.getStringEqualPack(wmsRoutingMaster.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + "isDeleted", result); return result.toString(); } @@ -159,14 +138,13 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDatetime", result, true); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); - HqlPack.getStringLikerPack(wmsPart.getAbc(), "abc", result); - HqlPack.getNumEqualPack(wmsPart.getIqc(), "iqc", result); - HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result); - HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result); + HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(wmsPart.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isDeleted", result); @@ -454,14 +432,18 @@ public class WmsHqlPack { */ public static String packHqlBasCustomer(BasCustomer basCustomer) { StringBuffer result = new StringBuffer(); - //有效性 - HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result); + //客户编号 HqlPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result); - //聯係人 - HqlPack.getStringLikerPack(basCustomer.getCustOwner(), "custOwner", result); - //電話號碼 - HqlPack.getStringLikerPack(basCustomer.getCustTel(), "custTel", result); + //客户简称 + HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); + //客户全称 + HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); + + HqlPack.getStringEqualPack(basCustomer.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + "isDeleted", result); return result.toString(); } From 7cd77129124e9c6bc773559c57f32aab316fce5d Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 14 Nov 2018 16:35:09 +0800 Subject: [PATCH 5/7] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms # Conflicts: # modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java # modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java # modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 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 42f0798..185ee6b 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 @@ -47,8 +47,10 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + "isDeleted", result); return result.toString(); } @@ -63,12 +65,14 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result); - HqlPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", result); - HqlPack.getNumEqualPack(wmsDocMovementMaster.getPartNo(), "partNo", result); - HqlPack.timeBuilder(wmsDocMovementMaster.getCreateDateTimeStart(), wmsDocMovementMaster.getCreateDateTimeEnd(), "createDatetime", result, true); - HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result); + HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustomerNo(), "customerNo", result); + HqlPack.getStringEqualPack(wmsDocMovementMaster.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + "isDeleted", result); return result.toString(); } @@ -104,7 +108,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(routingCode, "routingCode", result); HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -123,7 +127,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsRoutingMaster.getOrganizeCode(), "organizeCode", result); HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -145,7 +149,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result); HqlPack.getNumEqualPack(wmsPart.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); @@ -445,7 +449,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(basCustomer.getOrganizeCode(), "organizeCode", result); HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } From d4929181c7e123f0eb592db8e4109c9eca3f8d3a Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Wed, 14 Nov 2018 16:37:23 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 42f0798..6c85077 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 @@ -319,7 +319,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); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -343,7 +343,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); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -363,7 +363,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); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -378,7 +378,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); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -396,7 +396,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); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -404,7 +404,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); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -487,7 +487,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(), "poNo", result); //有效性 HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -545,7 +545,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //有效性 HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -572,7 +572,7 @@ public class WmsHqlPack { //有效性 HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } From c66edabb7f51f6856e471e3aa5e6504f8bb6bcbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 14 Nov 2018 17:08:40 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 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 2995c26..ff97444 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 @@ -420,6 +420,7 @@ public class WmsHqlPack { */ public static String packHqlWmsZones(WmsZones wmsZones) { StringBuffer result = new StringBuffer(); + //有效性 HqlPack.getNumEqualPack(wmsZones.getIsValid(), "isValid", result); //仓库代码 @@ -428,6 +429,9 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); //存储区代码 HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); + //删除标记 + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return result.toString(); } @@ -462,8 +466,10 @@ public class WmsHqlPack { */ public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) { StringBuffer result = new StringBuffer(); - //有效性 + + //有效性,删除标记 HqlPack.getNumEqualPack(wmsShippingFlag.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); //供应商编号 HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result); //供应商简称 @@ -588,6 +594,7 @@ public class WmsHqlPack { */ public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock) { StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsFGInStock.getOrderNo(), "orderNo", result); HqlPack.getStringLikerPack(wmsFGInStock.getWoNo(), "woNo", result); HqlPack.getStringLikerPack(wmsFGInStock.getPartNo(), "partNo", result); @@ -605,7 +612,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(wmsFGInStock.getIsDeleted(), "isDeleted", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -623,7 +630,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result); HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(wmsTaskInfo.getIsDeleted(), "isDeleted", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } }