From 9b52218c49caaf38fa986516eae04c0e2acda7b4 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 19 九月 2024 16:35:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index 71f2ea7..d8eaa8f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -135,8 +135,8 @@
ogd.child_width,
ogd.child_height,
if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
- fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(patch.patch_num,0) as quantity,
- fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(patch.patch_num,0) as completedQuantity,
+ fc.quantity + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num as quantity,
+ fc.quantity + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num as completedQuantity,
odpd.reporting_work_num as completed,
odpd.broken_num as onceBroken,
if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
@@ -380,7 +380,7 @@
</select>
<select id="selectFlowCardNum" resultType="java.lang.Integer">
select
- a.quantity-b.reporting_work_num-b.broken_num+ifnull(c.patchNumSum,0)
+ a.quantity +ifnull(c.patchNumSum,0)-b.reporting_work_num-b.broken_num
from flow_card as a
left join sd.order_process_detail as b
on
@@ -858,4 +858,27 @@
ogd.technology_number
order by fc.order_number
</select>
+
+ <update id="updateReplenishWorkProcess">
+ update sd.order_process_detail
+ set
+ broken_num=broken_num - #{patchNum}
+ where process_id = #{processId}
+ and order_number = #{orderSort}
+ and technology_number = #{technologyNumber}
+ and process = #{patchProcesses}
+ </update>
+
+ <update id="updateRWPatchNum">
+ update reporting_work
+ set this_worn_quantity=this_worn_quantity-#{patchNum}
+ where reporting_work_id=#{reportingWorkId}
+ </update>
+
+ <update id="updateRWDPatchNum">
+ update reporting_work_detail
+ set breakage_quantity=breakage_quantity-#{patchNum}
+ where reporting_work_id=#{reportingWorkId} and order_number = #{orderSort}
+ and technology_number = #{technologyNumber}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0