Merge remote-tracking branch 'origin/dev-temp-xw-202502170000-45112' into test

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.getPlanArriveEndTimeStart()) && !StringUtils.isEmpty(model.getPlanArriveEndTimeEnd())) {
+            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());
+        }
     }
 }