From b0ceabbc1d5188179006ff95c733daa0e80d5e7a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 16 八月 2024 17:46:37 +0800
Subject: [PATCH] 次破相关报表添加字段，流程卡删除改为按流程卡删除并可以重新分架
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 8f23708..f212323 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -217,7 +217,7 @@
sd.order_glass_detail as ogd left join flow_card as fc
on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number
set ogd.splitting_status=0
- where ogd.order_id = #{orderId}
+ where fc.process_id = #{processId}
</update>
@@ -225,7 +225,7 @@
<update id="deleteFlowCardMp">
delete
from flow_card as fc
- where fc.order_id = left(#{processId}, 10)
+ where fc.process_id = #{processId}
</update>
<!-- 鍒嗘灦鏂板鏄庣粏鏌ヨ-->
@@ -442,7 +442,7 @@
<delete id="deleteReportingWork">
delete
from sd.order_process_detail
- where order_id = left(#{processId}, 10)
+ where process_id = #{processId}
</delete>
<select id="selectPrintFlowCardMp">
@@ -807,8 +807,8 @@
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 position(fc.technology_number in #{technologyNumber})
-
- order by IF(fc.sort != NULL or fc.sort != '', fc.sort, fc.order_number)
+ GROUP BY fc.process_id,fc.order_number,fc.technology_number
+ order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
</select>
<update id="printSortMp">
@@ -2051,4 +2051,16 @@
WHERE fc.process_id=#{processId}
GROUP BY fc.order_number
</select>
+
+ <select id="selectMaxFlowCard">
+ select ifnull((select fc.process_id
+ from sd.order_detail as od
+ left join sd.order_glass_detail as ogd
+ on od.order_id = ogd.order_id and od.order_number = ogd.order_number
+ left join flow_card as fc on fc.order_id=od.order_id and fc.order_number=od.order_number and fc.technology_number=ogd.technology_number
+ where od.order_id = #{orderId}
+ and ogd.production_id = #{productionId}
+ GROUP BY od.order_number
+ order by fc.process_id desc LIMIT 1),'') as process_id
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0