From 54edbc2458f55026b05e4f8481778456ea89a7ba Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 09 八月 2024 17:18:10 +0800
Subject: [PATCH] 流程卡排序添加右键功能，修改流程卡打印查询
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 efc9339..9c2d341 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -502,13 +502,15 @@
ogds.order_number,
GROUP_CONCAT(ogds.technology_number SEPARATOR '') AS technology_number,
ogds.glass_child AS concatenated_glass_child,
- process AS processed_part
+ process AS processed_part,
+ ogds.child_width,
+ ogds.child_height
from sd.order_glass_detail as ogds
where ogds.order_id = #{orderId}
- GROUP BY order_id, order_number, ogds.glass_child,process) as ogdss
+ GROUP BY order_id, order_number, ogds.glass_child,process,ogds.child_width,ogds.child_height) as ogdss
on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
where fc.order_id = #{orderId}
- GROUP BY fc.process_id, ogdss.concatenated_glass_child,ogdss.processed_part
+ GROUP BY fc.process_id, ogdss.concatenated_glass_child,ogdss.processed_part,ogdss.child_width,ogdss.child_height
order by fc.process_id, ogdss.technology_number)
UNION
@@ -639,7 +641,7 @@
<select id="getDetailList">
select fc.order_number,
concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
- od.quantity,
+ fc.quantity,
round(ogd.total_area, 2) as total_area,
od.perimeter,
od.bend_radius,
@@ -660,7 +662,7 @@
and fcs.process=#{process}
where fc.process_id = #{processId}
and position(fc.technology_number in #{technologyNumber})
- group by fc.process_id, fc.order_number
+ group by fc.process_id, fc.order_number,fc.technology_number
order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
</select>
@@ -1104,7 +1106,7 @@
<select id="getDetailListLike">
select fc.order_number,
concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
- od.quantity,
+ fc.quantity,
round(ogd.total_area, 2) as total_area,
od.perimeter,
od.bend_radius,
--
Gitblit v1.8.0