From 6e731e9aeb3a2db04b37050adf4b9d7cee2f8e01 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 14 十月 2025 15:09:01 +0800
Subject: [PATCH] 上海玻璃公司配置文件

---
 north-glass-erp/src/main/resources/mapper/pp/Report.xml |   19 +++----------------
 1 files changed, 3 insertions(+), 16 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 93643d6..c346033 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -3268,7 +3268,7 @@
         SUM(completeArea) as completeArea,
         SUM(incompleteNum) as incompleteNum,
         SUM(incompleteArea) as incompleteArea,
-        hz.product_name
+        hz.glass_child
         from (
         select DATE(o.create_time)                                                  as create_time,
         DATE(o.delivery_date)                                                as delivery_date,
@@ -3317,23 +3317,10 @@
           and position(#{inputProject} in o.project)
         and GREATEST(fc.quantity - odpd.reporting_work_num, 0)>0
         and fc.quantity-ifnull(fc.termination_quantity,0)>0
-        <choose>
-            <when test="laminating != null and laminating == 'stepC'">
-                GROUP BY fc.process_id, fc.order_number, ogd.`group`
-            </when>
-            <when test="laminating != null and laminating == 'stepD'">
-                GROUP BY fc.process_id, fc.order_number
-            </when>
-            <when test="laminating != null and laminating == 'stepB'">
-                GROUP BY fc.process_id, fc.order_number
-            </when>
-            <otherwise>
-                GROUP BY fc.process_id, fc.order_number, fc.technology_number
-            </otherwise>
-        </choose>
+        GROUP BY fc.process_id, fc.order_number, fc.technology_number
         order by fc.process_id, fc.order_number, fc.technology_number
         ) as hz
-        GROUP BY hz.project,hz.batch,product_name
+        GROUP BY hz.project,hz.batch,glass_child
     </select>
 
 

--
Gitblit v1.8.0