From edf5ba4d539988676c2cdd9c694a95dc8bff98a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Fri, 15 May 2026 10:16:54 +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

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

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 6abd67676..ed00963ea 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
@@ -209,7 +209,7 @@
     <update id="updatePrintType">
         UPDATE MES_WORK_PLAN a SET a.PRINT_TYPE = 1
         WHERE a.ID IN (
-            SELECT DISTINCT c.ID FROM MES_MAC_TOOL_USE c
+            SELECT DISTINCT c.WP_ID FROM MES_MAC_TOOL_USE c
             LEFT JOIN MES_EQUIPMENT b ON c.EQUIPMENT_CARD = b.ID
             WHERE b.DEVICE_CODE = #{deviceCode}
               AND c.MTN_CODE = #{mtnCode}
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 aaaf8cb4b..c8722f2b5 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
@@ -1629,6 +1629,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             newMtu.setEquipmentCard(mtu.getEquipmentCard());
                             newMtu.setCreateMan(mtu.getCreateMan());
                             newMtu.setCreateTime(mtu.getCreateTime());
+                            newMtu.setBindTime(mtu.getBindTime());
                             newMtu.setFinished(mtu.getFinished());
                             macToolUseService.save(newMtu);
                             //更改绑定记录为结束