From 8bcd0cc77b0c7aa2c00ffd926ee87f1f09a3a3b5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 11 八月 2025 10:07:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 1 +
1 files changed, 1 insertions(+), 0 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 3b36b31..edd636b 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -883,6 +883,7 @@
select kkk.*,rw.teams_groups_name as teams_groups_name2 from(select o.order_id,
o.customer_name,
o.project,
+ o.batch,
fol.remarks,
SUM(fol.quantity) as quantity,
ROUND( sum(od.width * od.height * fol.quantity) / 1000000, 2 ) as area,
--
Gitblit v1.8.0