From a04d735ab3f2e9c52ebf52c35dfa1506d86d416d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 24 七月 2025 17:01:57 +0800
Subject: [PATCH] 修改流程卡打印获取第一个工序不正确问题,在制品汇总报表添加批次

---
 north-glass-erp/src/main/resources/mapper/pp/Report.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 9cf3e49..e0d1dcc 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -2684,7 +2684,7 @@
         e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num as quantity,
         (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)*f.area as glassArea
                        from (SELECT a.order_id,
-                                    a.project,
+                                   if(a.batch!="",CONCAT(a.project,'(',a.batch,')'),a.project) as project,
                                     C.product_id,
                                     b.order_number,
                                     b.process_id,

--
Gitblit v1.8.0