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 | 13 +++++++++++--
1 files changed, 11 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 39234a9..3647616 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -326,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,
@@ -731,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,
@@ -2786,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