From f20680d12351174d17e1c68e07a2d6b574fd6373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Sat, 23 May 2026 18:08:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=B7=A5=E8=AE=A2=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8E=9F=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/desk/order/pojo/entity/YieldOrder.java    | 3 +++
 .../scheduling/pojo/entity/YieldOrderEntity.java          | 2 ++
 .../desk/produce/service/impl/PdaSaveServiceImpl.java     | 8 ++++++++
 3 files changed, 13 insertions(+)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java
index aaa753981..0f92fef5b 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java
@@ -510,6 +510,9 @@ public class YieldOrder extends BaseEntity {
 	@Schema(description = "责任部门")
 	private String resDept;
 
+	@Schema(description = "原生产订单ID")
+	private Long oldYoId;
+
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double plateThickness1;
 
diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java
index 9dd0812d9..f070cf162 100644
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java
@@ -377,5 +377,7 @@ public class YieldOrderEntity extends TenantEntity {
 	private String tjtNum;
 	@Schema(description = "责任部门")
 	private String resDept;
+	@Schema(description = "原生产订单ID")
+	private Long oldYoId;
 
 }
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 19cf8fd6d..f0683855a 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
@@ -665,6 +665,14 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         if (newPartVersion == null) {
             throw new ServiceException("零件【" + rr.getPrtno() + "】的版本不存在!");
         }
+        // 查询原订单
+        WorkOrder wo = workOrderService.getWorkOrderUniqueRec(rr.getPrtno(), rr.getSplcode(), rr.getSono());
+        if (wo == null) {
+            wo = workOrderService.getWorkOrderUniqueRec(rr.getPrtno(), rr.getSplcode(), null);
+        }
+        if (wo != null) {
+            yieldOrder.setOldYoId(wo.getYoId());
+        }
         yieldOrder.setPartVersion(newPartVersion.getPartVersion());
         yieldOrder.setRank("2");
         yieldOrder.setBatchNo(batchNo);