From ac0bc1d3df54c8f18a10b135daf28faebb25d20a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 07 八月 2025 16:43:24 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 8 +++++++-
1 files changed, 7 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 26ddc56..44696eb 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -484,7 +484,8 @@
fc.founder,
date(fc.splitFrame_time) as splitFrame_time,
ogd.process,
- c.concatNumber
+ c.concatNumber,
+ ifnull(fc.termination_quantity,0) as termination_quantity
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
@@ -3549,4 +3550,9 @@
update pp.flow_card fc set fc.termination_quantity=#{value}
where fc.process_id = #{processId} and fc.order_number=#{orderNumber}
</update>
+
+ <select id="selectCompletedMp">
+ SELECT max(reporting_work_num) FROM sd.`order_process_detail`
+ where process_id=#{processId} and order_number=#{orderNumber} and process=#{interceptProcess}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0