From fb8ec3f6a555f8ca1d02b305b08088d07dd5e709 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 14 六月 2024 17:34:32 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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 b42f279..7829340 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -191,7 +191,7 @@
od.product_name,
SUM( od.quantity) as quantity,
SUM(od.compute_gross_area) as compute_gross_area,
- sum(od.perimeter) as perimeter
+ round(sum(od.perimeter),2) as perimeter
from sd.order_detail as od left join
(select order_id,order_number,production_id,splitting_status from sd.order_glass_detail
GROUP BY order_id,order_number
@@ -494,7 +494,7 @@
where fc.process_id = #{processId}
and fc.technology_number = #{technologyNumber}
group by fc.process_id, fc.order_number
- order by fc.order_number
+ order by IF(sort!=NULL||sort!='',sort,fc.order_number)
</select>
<select id="getProcessList">
@@ -537,11 +537,38 @@
left join flow_card as d
on d.order_id = a.order_id and d.order_number = a.order_number and
d.technology_number = a.technology_number
- left join sd.product e
- on e.id = b.product_id
+ left join sd.basic_glass_type e
+ on e.type_id = b.product_id
where d.process_id = #{processId}
and d.technology_number = #{technologyNumber}
group by a.glass_child, a.child_width, a.child_height
order by d.technology_number
</select>
+
+ <select id="printFlowCardDetailsMp">
+ SELECT fc.process_id,
+ fc.order_number,
+ fc.technology_number,
+ ogd.glass_address,
+ ogd.child_width,
+ ogd.child_height,
+ fc.quantity,
+ ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area
+ FROM flow_card AS fc
+ LEFT JOIN sd.order_glass_detail AS ogd ON fc.order_id = ogd.order_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ where fc.process_id = #{processId}
+ and fc.technology_number = #{technologyNumber}
+ </select>
+
+ <update id="printSortMp">
+ update flow_card
+ set sort = #{sort}
+ where process_id = #{processId}
+ and order_number=#{orderNumber}
+ and technology_number = #{technologyNumber}
+ </update>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0