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 | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 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 ecacbed..e0d1dcc 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -128,6 +128,7 @@
<result column="examine_time" property="examineTime"/>
<result column="workProcessName" property="workProcessName"/>
<result column="device_name" property="deviceName"/>
+ <result column="order_type" property="orderType"/>
</resultMap>
<resultMap id="scheduleProductionScheduleMap" type="com.example.erp.dto.pp.ScheduleProductionScheduleDTO">
@@ -172,17 +173,28 @@
c.technology_number,
b.child_width,
b.child_height,
- c.quantity,
+ if(c.technology_number=1,c.quantity,0) as quantity,
+# c.quantity,
+ c.quantity as thisQuantity,/*鐢ㄤ簬鍒ゆ柇鏄惁鏀瑰彉棰滆壊*/
e.reportWorkQuantity,
e.reportWorkQuantityCount,
e.reportWorkTime,
e.broken_num,
- c.quantity*a.area as gross_area,
- ifnull(f.inventory, 0) as inventory,
- round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
- ifnull(dd.quantity, 0) as shippedQuantity,
+ c.quantity as glassQuantity,
+
+# c.quantity*a.area as gross_area,
+# ifnull(f.inventory, 0) as inventory,
+# round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
+# ifnull(dd.quantity, 0) as shippedQuantity,
+
+ if(c.technology_number=1,c.quantity*a.area,0) as gross_area,
+ if(c.technology_number=1,ifnull(f.inventory, 0) ,0) as inventory,
+ if(c.technology_number=1,round(ifnull(f.inventory, 0) * a.area, 2),0) as inventoryArea,
+ if(c.technology_number=1,ifnull(dd.quantity, 0) ,0) as shippedQuantity,
+
+
ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber
- from flow_card as c
+ from pp.flow_card as c
left join
sd.order_detail as a
on c.order_id = a.order_id
@@ -201,7 +213,7 @@
technology_number,
sum(a.broken_num) as broken_num,
concat('{',
- GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
+ GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' || bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),
'}'
) as reportWorkQuantity,
concat('{',
@@ -213,8 +225,13 @@
'}'
) as reportWorkTime
FROM sd.order_process_detail as a
+ left join (SELECT DISTINCT basic_name,nickname from sd.basic_data as bd where bd.basic_category = 'process') as bd
+ on a.process = bd.basic_name
where a.order_id = #{orderId}
- GROUP BY process_id, a.order_number, a.technology_number) as e
+ GROUP BY process_id, a.order_number, a.technology_number
+
+
+ ) as e
on e.process_id = c.process_id
and e.technology_number = c.technology_number
and e.order_number = c.order_number
@@ -1353,6 +1370,7 @@
rw.reviewed,
rw.examine_time,
rw.device_name,
+ o.order_type,
-- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
CASE
WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
@@ -2666,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