From c26bb1aef89d6d0c3301dbcac638b1fc9e0e63d1 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期一, 12 五月 2025 17:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml
index 8b55af0..77781d3 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml
@@ -123,7 +123,7 @@
from aps_part_plan as pl
left join aps_process_route as rt on pl.document_number=rt.work_order_no
left join aps_resource_group as rs on rs.resource_group_name=rt.process_name
- where pl.work_order_no is not null
+ where pl.document_number is not null and rt.work_order_no is not null
and rt.process_plan_start_day <= rs.request_date
order by rt.work_order_no,process_plan_start_day
</select>
--
Gitblit v1.9.3