From 0b186e1317c89dbc479a4484b9a03b9710f5251a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 30 May 2019 17:55:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=89=A9=E6=B5=81=E8=B7=AF=E7=BA=BF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) 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 74de1b5..f416723 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 @@ -170,10 +170,25 @@ public class WmsHqlPack { /** * 物流路线子表查询条件封装 + * @param wmsRoutingDetail + * @return + */ + public static DdlPackBean packHqlWmsRoutingDetail(WmsRoutingDetail wmsRoutingDetail) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsRoutingDetail.getRoutingCode(), "routingCode", result); + + getStringBuilderPack(wmsRoutingDetail, result); + return result; + } + + /** + * 物流路线子表查询条件封装 * * @param routingCode * @return */ + @Deprecated public static DdlPackBean packHqlWmsRoutingChildren(String routingCode) { DdlPackBean result = new DdlPackBean(); @@ -184,6 +199,19 @@ public class WmsHqlPack { return result; } + /** + * 物流路线子表查询条件封装 + * @param wmsRoutingAssign + * @return + */ + public static DdlPackBean packHqlWmsRoutingAssign(WmsRoutingAssign wmsRoutingAssign) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsRoutingAssign.getRoutingCode(), "routingCode", result); + + getStringBuilderPack(wmsRoutingAssign, result); + return result; + } /** * 物流路线主表查询条件封装 From 9d9f5a2cc25c95c4e9223254e0ff28fb680ce7e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 30 May 2019 18:03:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8A=BD=E7=82=B9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0?= 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 | 4 ++++ 1 file changed, 4 insertions(+) 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 02f9b9f..3fb1a51 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 @@ -540,6 +540,10 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); //供应商编号 DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); + //关联单号 + DdlPreparedPack.getStringLikerPack(wmsCheckFactRecord.getRefSrc(), "refSrc", result); + //关联单单据类型 + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getRefType(), "refType", result); getStringBuilderPack(wmsCheckFactRecord, result); From 8e7b3d61e7bf0276b9293ec1d5d7251c92adc038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 30 May 2019 18:04:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= 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 912baec..0a3be6b 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 @@ -1464,7 +1464,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum COMPONENT_TYPE { - PROCESS_HANDLING(10, "流程处理组件,"), + PROCESS_HANDLING(10, "流程处理组件"), PROCESS_INITIALIZATION(20, "流程初始化组件"), PROCESS_COMMIT(30, "流程提交组件"), DETAIL_PROCESS(40, "明细处理组件"), From d2fd8b428cab1fcbf0eaa97a51f51fd2ce533ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 30 May 2019 18:10:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=A4=8D=E6=9D=82=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=8C=BA=E9=97=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java index 09b1731..f4c744c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java @@ -32,6 +32,17 @@ public class WmsBsonPack { bson = BsonPackTool.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", bson); bson = BsonPackTool.getNumEqualPack(actionLog.getIsValid(), "isValid", bson); bson = BsonPackTool.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", bson); + + if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="") + || (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){ + bson = BsonPackTool.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", bson, true); + } + + if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "") + || (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){ + bson = BsonPackTool.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", bson, true); + } + return bson; }