From a40c2062a211fc2f1123248f49e26b676b7d8c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Tue, 24 Mar 2026 20:15:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/mapper/MacToolUseMapper.xml  | 22 +++++++++++++++++++
 .../service/impl/WorkOrderServiceImpl.java    |  1 +
 2 files changed, 23 insertions(+)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml
index d6532e94..96c5ca4b 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml
@@ -107,6 +107,28 @@
         </where>
         ORDER BY MTN_CODE DESC) WHERE ROWNUM = 1
     </select>
+    <select id="getTcDataByWoId" resultType="org.springblade.desk.produce.pojo.entity.MacToolUse">
+        SELECT * FROM (SELECT a.*
+        FROM MES_MAC_TOOL_USE a
+                 INNER JOIN mes_work_plan wp ON a.wp_id = wp.id
+                 INNER JOIN mes_work_order wo ON wp.wo_id = wo.id
+                 INNER JOIN BS_PROCESS_SET ps ON wp.pps_id = ps.id
+                 LEFT JOIN BS_CRAFT_ABILITY ca ON wp.ca_id = ca.id
+        WHERE
+            wo.id = #{woId}
+          AND (
+            (ps.name = '清洗' AND ca.ca_name = '喷漆')
+                OR
+            (ps.name = '局部防护' AND ca.ca_name = '喷漆')
+                OR
+            ps.name = '玻璃封接电镀上挂'
+                OR
+            ps.name = '光亮腐蚀'
+                OR
+            (ps.name = '上挂' AND ca.ca_name != '喷漆')
+            )
+        ORDER BY a.create_time DESC) WHERE ROWNUM = 1
+    </select>
 
 
 </mapper>
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
index 6b0b5f21..b505f747 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
@@ -232,6 +232,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         oldWo.setMakeQty(oldWo.getMakeQty() - newWo.getMakeQty());
 
         this.addWorkOrder(newWo);
+        this.updateById(oldWo);
         return newWo;
     }