From e48e9687cc8bee98f5567807c2529cf7c7e9a9f8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 23 五月 2024 08:47:43 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 67 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 1 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 1fb6dce..d3cbf5c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -410,7 +410,8 @@
</select>
<select id="selectPrintMp">
- select fc.order_id,
+ select fc.id,
+ fc.order_id,
fc.process_id,
o.customer_name,
o.project,
@@ -433,4 +434,68 @@
order by fc.process_id, ogd.technology_number
</select>
+
+ <select id="getPrimaryList">
+ select o.customer_name,
+ o.project,
+ ogd.process,
+ od.edging_type,
+ ogd.glass_child,
+ od.product_name,
+ o.processing_note,
+ fc.process_id,
+ SUM( od.quantity) as quantity,
+ SUM(ogd.total_area) as gross_area,
+ SUM(od.weight) as weight,
+ #{technologyNumber} as technologyNumber,
+ concat(fc.process_id,'/',#{technologyNumber}) as processIdNumber
+ 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
+ left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
+ left join sd.`order` as o on o.order_id = fc.order_id
+ where fc.process_id = #{processId}
+ and fc.technology_number = #{technologyNumber}
+ group by fc.process_id, fc.technology_number
+ </select>
+
+ <select id="getDetailList">
+ select fc.order_number,
+ concat(ogd.child_width, "*", ogd.child_height) as child_width,
+ od.quantity,
+ round(ogd.total_area,2) as total_area,
+ od.perimeter,
+ od.bend_radius,
+ od.remarks
+ 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
+ left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
+ where fc.process_id = #{processId}
+ and fc.technology_number = #{technologyNumber}
+ group by fc.process_id, fc.order_number
+ order by fc.order_number
+ </select>
+
+ <select id="getProcessList">
+ select *
+ from sd.order_process_detail
+ where process_id = #{processId}
+ and technology_number = #{technologyNumber}
+ group by process
+ </select>
+
+ <update id="updateInventory">
+ update flow_card set inventory_quantity=#{completedQuantity}
+ where process_id = #{processId} and order_number = #{orderNumber} and technology_number = #{technologyNumber}
+ </update>
+
+<!-- 澶嶉�夋淇敼鎺掔増鐘舵��-->
+ <update id="updateComposing">
+ update flow_card as fc
+ set fc.layout_status=1
+ where fc.process_id = #{processId}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0