From 174cc2a8aa52f00334e0e9a3a0ea91b2e3e7acd3 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 十月 2025 16:20:41 +0800
Subject: [PATCH] 修改次破报表翻页汇总不正确问题
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 8541123..019a91b 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -563,7 +563,8 @@
</select>
<select id="selectPrintFlowCard">
- select op.project_no,glass_total,glass_total_area,labelPrintNum,processPrintNum,glass_type,glass_thickness
+ select op.project_no,glass_total,glass_total_area,labelPrintNum,processPrintNum,glass_type,glass_thickness,
+ GROUP_CONCAT(DISTINCT o.order_id SEPARATOR '~') as order_id
from pp.optimize_project as op
left join pp.flow_card as fc on op.project_no=fc.project_no
left join sd.`order` as o on o.order_id=fc.order_id
@@ -2822,6 +2823,7 @@
left join sd.order_glass_detail as ogd
on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
ogd.technology_number = fc.technology_number
+
where fc.process_id = #{processId}
and fc.order_number = #{orderNumber}
group by fc.process_id,od.order_number, width, height
@@ -3009,25 +3011,25 @@
contacts,
delivery_address as deliveryAddress,
od.processing_note as processingNote,
- od.width,
- od.height,
+ opt.width,
+ opt.height,
opl.glass_count as flowQuantity,
CONCAT(
- TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.width AS CHAR))),
+ opt.width,
' X ',
- TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.height AS CHAR))),
+ opt.height,
' = ',opl.glass_count ) as size,
CONCAT(
od.order_number,') ',
- TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.width AS CHAR))),
+ opt.width,
' X ',
- TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.height AS CHAR))),
+ opt.height,
' = ',opl.glass_count ) as numberSize,
CONCAT(
od.order_number,')',' ',
- TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.width AS CHAR))),
+ opt.width,
' X ',
- TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.height AS CHAR)))) as numberSizeQuantity,
+ opt.height) as numberSizeQuantity,
od.order_number as orderNumber,
fc.technology_number as technologyNumber,
od.building_number as buildingNumber,
@@ -3056,7 +3058,8 @@
'鏂囨湰' as custom3,
'鏂囨湰' as custom4,
'鏂囨湰' as custom5,
- od.quantity
+ od.quantity,
+ CONCAT(opt.stock_id,"/",opt.polys_id) as stockPolysId
from optimize_detail as opt
left join optimize_layout as opl on opl.project_no=opt.project_no and opl.stock_id=opt.stock_id
left join flow_card as fc on opt.project_no=fc.project_no and opt.process_id=fc.process_id and opt.layer=fc.technology_number and opt.order_sort=fc.order_number
--
Gitblit v1.8.0