From bb49d87d5a38ca259d2cf89c2e4eee088d12367d Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Mon, 17 Feb 2025 20:44:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?45112=20MES=EF=BC=9A=E5=8F=91=E8=BF=90?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=E9=9C=80=E8=A6=81=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E5=AE=A2=E6=88=B7=E8=A6=81=E6=B1=82=E5=88=B0=E8=B4=A7?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E5=8F=91=E8=BF=90=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java
index b3dfb0d..9a22241 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java
@@ -142,6 +142,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getPublishTimeStart()) && !StringUtils.isEmpty(model.getPublishTimeEnd())) {
             commonQueryHql.append("AND ms.publishTime between :publishTimeStart and :publishTimeEnd ");
         }
+        if (!StringUtils.isEmpty(model.getPlanArriveEndTime()) && !StringUtils.isEmpty(model.getPlanArriveEndTime())) {
+            commonQueryHql.append("AND ms.planArriveEndTime between :planArriveEndTimeStart and :planArriveEndTimeEnd ");
+        }
 
         //按照结束扫描时间倒叙
         orderByHql.append(" ORDER BY endScanTime DESC ");
@@ -207,5 +210,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
             dataQuery.setParameter("publishTimeStart",model.getPublishTimeStart());
             dataQuery.setParameter("publishTimeEnd", model.getPublishTimeEnd());
         }
+        if (!StringUtils.isEmpty(model.getPlanArriveEndTimeStart()) && !StringUtils.isEmpty(model.getPlanArriveEndTimeEnd())) {
+            dataQuery.setParameter("planArriveEndTimeStart",model.getPlanArriveEndTimeStart());
+            dataQuery.setParameter("planArriveEndTimeEnd", model.getPlanArriveEndTimeEnd());
+        }
     }
 }

From 053e9c77b9578a24824d92b019fa3dd1c4add8f1 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Tue, 18 Feb 2025 17:11:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?45112=20=20MES=EF=BC=9A=E5=8F=91=E8=BF=90?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=E9=9C=80=E8=A6=81=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E5=AE=A2=E6=88=B7=E8=A6=81=E6=B1=82=E5=88=B0=E8=B4=A7?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E5=8F=91=E8=BF=90=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java
index 9a22241..92a1e8b 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java
@@ -142,7 +142,7 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getPublishTimeStart()) && !StringUtils.isEmpty(model.getPublishTimeEnd())) {
             commonQueryHql.append("AND ms.publishTime between :publishTimeStart and :publishTimeEnd ");
         }
-        if (!StringUtils.isEmpty(model.getPlanArriveEndTime()) && !StringUtils.isEmpty(model.getPlanArriveEndTime())) {
+        if (!StringUtils.isEmpty(model.getPlanArriveEndTimeStart()) && !StringUtils.isEmpty(model.getPlanArriveEndTimeEnd())) {
             commonQueryHql.append("AND ms.planArriveEndTime between :planArriveEndTimeStart and :planArriveEndTimeEnd ");
         }