From 0f6fc11ebc2ab16e90c3f392983f221a3e26b0f7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 17 二月 2025 10:05:28 +0800
Subject: [PATCH] 修改切换客户执行方法
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 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 857d95e..3647616 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -227,18 +227,31 @@
<!-- 鏇存柊鍒嗘灦鐘舵��-->
<update id="updateDeleteState">
update
- sd.order_glass_detail as ogd left join flow_card as fc
+ sd.order_glass_detail as ogd left join pp.flow_card as fc
on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number
set ogd.splitting_status=0
- where fc.process_id = #{processId}
+ where
+ <if test="processId=='all'">
+ ogd.order_id = #{orderId}
+ </if>
+ <if test="processId!='all'">
+ fc.process_id = #{processId}
+ </if>
+
</update>
<!-- 鍒犻櫎娴佺▼鍗�-->
<update id="deleteFlowCardMp">
delete
- from flow_card as fc
- where fc.process_id = #{processId}
+ from pp.flow_card as fc
+ where
+ <if test="processId=='all'">
+ fc.order_id = #{orderId}
+ </if>
+ <if test="processId!='all'">
+ fc.process_id = #{processId}
+ </if>
</update>
<!-- 鍒嗘灦鏂板鏄庣粏鏌ヨ-->
@@ -313,6 +326,13 @@
from reporting_work as rw
where rw.process_id = #{processId} and reviewed_state>=0
</select>
+ <!-- 鏌ヨ鎶ュ伐琛ㄥ唴鏄惁鏈夊搴旀祦绋嬪崱-->
+ <select id="reportingWorkCountByOrderId">
+ select COUNT(rw.process_id)
+ from pp.reporting_work as rw
+ where rw.order_id = #{orderId} and reviewed_state>=0
+ </select>
+
<!-- 鎻掑叆Flow_card琛�-->
<insert id="addFlowCardMp">
insert into flow_card (order_id,
@@ -468,6 +488,14 @@
from sd.order_process_detail
where process_id = #{processId}
</delete>
+
+ <delete id="deleteReportingWorkByOrderId">
+ delete
+ from sd.order_process_detail
+ where order_id = #{orderId}
+ </delete>
+
+
<select id="selectPrintFlowCardMp">
select order_id,
@@ -710,7 +738,7 @@
fc.quantity,
round(ogd.total_area, 2) as total_area,
od.perimeter,
- if(od.bend_radius!=null,od.bend_radius,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04'))) as bend_radius,
+ if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),'')) as bend_radius,
concat(IFNULL(od.processing_note, ''), IFNULL(od.remarks, '')) as remarks,
od.other_columns,
round(ogd.child_width) as width,
@@ -2501,6 +2529,15 @@
delete from flow_card_sort where process_id = #{processId}
</delete>
+ <delete id="deleteflowCardSortByOrderId">
+ delete from pp.flow_card_sort
+ where process_id =(
+ select process_id from pp.flow_card
+ where order_id=#{orderId}
+ group by process_id
+ )
+ </delete>
+
<select id="getPrintProjectDetailsMp">
SELECT opd.project_no,opd.stock_id,opl.glass_count FROM optimize_detail as opd left join optimize_layout as opl on opl.project_no=opd.project_no and opl.stock_id=opd.stock_id
where opd.project_no=#{projectNo}
@@ -2756,5 +2793,7 @@
select processPrintNum from optimize_project where project_no=#{projectNo}
</select>
-
+ <select id="flowCardToOptimizeCount">
+ select count(*) from pp.flow_card where order_id = #{orderId} and engineering_occupancy=1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0