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 | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 626010c..d3cbf5c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -445,7 +445,7 @@
o.processing_note,
fc.process_id,
SUM( od.quantity) as quantity,
- SUM(od.gross_area) as gross_area,
+ SUM(ogd.total_area) as gross_area,
SUM(od.weight) as weight,
#{technologyNumber} as technologyNumber,
concat(fc.process_id,'/',#{technologyNumber}) as processIdNumber
@@ -464,7 +464,7 @@
select fc.order_number,
concat(ogd.child_width, "*", ogd.child_height) as child_width,
od.quantity,
- ogd.total_area,
+ round(ogd.total_area,2) as total_area,
od.perimeter,
od.bend_radius,
od.remarks
@@ -491,4 +491,11 @@
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