From cb05a90ebb7d71099a66fb03382cc93a4fa0a8ee Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 05 九月 2024 23:45:26 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 fd7a0ee..6dab8b2 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -195,15 +195,17 @@
ogd.production_id,
od.product_id,
od.product_name,
- SUM(od.quantity) as quantity,
+ ROUND(SUM(od.quantity)-IFNULL(sum(fc.quantity)/count(fc.technology_number),0)) as quantity,
SUM(od.compute_gross_area) as compute_gross_area,
round(sum(od.perimeter), 2) as perimeter
from sd.order_detail as od
left join
- (select order_id, order_number, production_id, splitting_status
+ (select order_id, order_number,technology_number, production_id, splitting_status
from sd.order_glass_detail
GROUP BY order_id, order_number) as ogd
on od.order_id = ogd.order_id and od.order_number = ogd.order_number
+ left join flow_card as fc on fc.order_id = od.order_id and fc.order_number = od.order_number
+ and fc.technology_number=ogd.technology_number
where od.order_id = #{orderId}
and ogd.splitting_status = 0
@@ -241,12 +243,13 @@
od.quantity,
od.compute_gross_area,
p.total_thickness,
- od.quantity as baiscQuantity,
+ ROUND(od.quantity-IFNULL(sum(fc.quantity)/count(fc.technology_number),0)) as baiscQuantity,
od.compute_gross_area as 'computeGrossArea',
p.total_thickness AS 'totalThickness',
p.thickness,
od.weight,
od.remarks,
+ od.bend_radius,
ods.S01,
ods.S02,
ods.S03,
@@ -266,6 +269,8 @@
FROM sd.order_detail
WHERE order_id = #{orderId}) as ods
on ods.order_id = od.order_id and ods.order_number = od.order_number
+ left join flow_card as fc on fc.order_id = od.order_id and fc.order_number = od.order_number
+ and fc.technology_number=ogd.technology_number
where od.order_id = #{orderId}
and ogd.production_id = #{productionId}
and ogd.splitting_status = 0
@@ -505,12 +510,10 @@
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, ogds.child_width,
- ogds.child_height) as ogdss
+ GROUP BY order_id, order_number, ogds.glass_child, process) 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, ogdss.child_width,
- ogdss.child_height
+ GROUP BY fc.process_id, ogdss.concatenated_glass_child, ogdss.processed_part
order by fc.process_id, ogdss.technology_number)
UNION
@@ -1985,7 +1988,7 @@
od.processing_note as processingNote,
width,
height,
- od.quantity,
+ fc.quantity,
od.order_number as orderNumber,
fc.technology_number as technologyNumber,
od.building_number as buildingNumber,
@@ -2023,7 +2026,7 @@
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
+ group by od.order_number, width, height
order by fc.process_id
</select>
@@ -2099,4 +2102,8 @@
where fc.process_id = #{processId}
</update>
+ <delete id="deleteflowCardSort">
+ delete from flow_card_sort where process_id = #{processId}
+ </delete>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0