From 717af12755e3fdcb56fcbcc16659b05d465c88e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Tue, 19 May 2026 21:08:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/desk/produce/mapper/WorkOrderMapper.java    | 2 +-
 .../org/springblade/desk/produce/mapper/WorkOrderMapper.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.java
index 6a0d4ac5e..825973f77 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.java
@@ -57,7 +57,7 @@ public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
 
 	WorkOrder getMaxByMesCard(String code);
 
-	List<WorkOrder> listByYoId(Long fatherYoId);
+	List<WorkOrder> listByYoId(Long yoId);
 
     List<WorkInProcessVO> getWorkInProcessByPartCode(Set<String> partCodes);
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml
index 27189e0e2..9b1f47875 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml
@@ -337,7 +337,7 @@
         SELECT * FROM (SELECT * FROM MES_WORK_ORDER WHERE mes_card_no = #{code} ORDER BY mes_card_no DESC) WHERE ROWNUM = 1
     </select>
     <select id="listByYoId" resultType="org.springblade.desk.produce.pojo.entity.WorkOrder">
-        SELECT a.* FROM MES_WORK_ORDER a INNER JOIN MES_YIELD_ORDER b ON a.YO_ID = b.ID where b.father_yo_id = #{fatherYoId}
+        SELECT a.* FROM MES_WORK_ORDER a where a.yo_id = #{yoId} and a.is_deleted = 0
     </select>
     <select id="getWorkInProcessByPartCode" resultType="org.springblade.desk.produce.pojo.vo.WorkInProcessVO">
         SELECT