From 174a6b7bc81a21f8cf950760d3e17fd5f4b7c4dd Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 21 八月 2025 11:15:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index a848a73..9fba596 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -885,6 +885,7 @@
select kkk.*,rw.teams_groups_name as teams_groups_name2 from(select o.order_id,
o.customer_name,
+ o.customer_id,
o.project,
o.batch,
fol.remarks,
@@ -905,13 +906,13 @@
where
- o.customer_name=#{customerName} and fol.remarks=#{remarks} and o.project=#{project}
+ o.customer_id=#{customerId} and fol.remarks=#{remarks} and o.project=#{project}
and (fol.remarks is not null and fol.remarks !="") and (fol.process_id !="" and fol.process_id is not null)
group by fol.remarks,o.customer_name,o.project
) as kkk
left join pp.reporting_work rw on rw.process_id=kkk.process_id and rw.this_process=kkk.previous_process
- group by kkk.remarks,kkk.customer_name,kkk.project
+ group by kkk.remarks,kkk.customer_id,kkk.project
</select>
--
Gitblit v1.8.0