From 21384020929ee8ffb46d543734f9779e4a19adfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Mon, 8 Jun 2026 15:43:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=9B=B6=E4=BB=B6=E5=8F=B7?=
 =?UTF-8?q?=E3=80=81=E6=89=B9=E6=AC=A1=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=8E=9F?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=B7=A5=E5=BA=8F=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/service/IPdaSaveService.java       |  5 +++++
 .../produce/service/impl/PdaSaveServiceImpl.java    | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java
index 5688fe7a6..4ff8ed1a1 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java
@@ -75,4 +75,9 @@ public interface IPdaSaveService extends BaseService<WorkPlan> {
     void saveEpDosingRec(BsDosingRecEntity epDosingRec);
 
     void saveSubOrder(SaveSubOrderVo subOrder);
+
+    /**
+     * 根据零件号、批次号查询原订单的工序
+     */
+    List<WorkPlan> getOriginalOrderProcess(String partCode, String batchNo);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java
index e7b18bec4..7e228f6be 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java
@@ -1130,6 +1130,9 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         wp.setFactEndTime(nowDate);
         wp.setStatus(WorkPlan.STATUS_COMPLETE);
         this.updateById(wp);
+        // 修改批次号
+        yo.setBatchNo(subOrder.getBatchNo());
+        yieldOrderService.updateById(yo);
         //更改车间订单状态
         workOrderService.updateStatus(Collections.singletonList(wo.getId()), WorkOrder.RUN_STATUS_COMPLETED, AuthUtil.getUserId(), null);
         //查询父级订单下的所有子件订单是否已全部完成
@@ -1179,4 +1182,14 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
 //            stClassRequestService.addOrEdit(list, null, curUserInfo);
 //        }
     }
+
+    @Override
+    public List<WorkPlan> getOriginalOrderProcess(String partCode, String batchNo) {
+        // 根据零件号和批次号查询原车间订单
+        WorkOrder wo = workOrderService.getWorkOrderUniqueRec(partCode, batchNo, null);
+        if (wo == null) {
+            return null;
+        }
+        return this.list(Wrappers.<WorkPlan>lambdaQuery().eq(WorkPlan::getWoId, wo.getId()).orderByAsc(WorkPlan::getOrders));
+    }
 }