From b2847955e23fd858c7645b717a11bd1d470e1c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Wed, 25 Mar 2026 17:11:14 +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/pojo/vo/WorkPlanRunVO.java          | 12 ++++++------
 .../produce/service/impl/WorkOrderServiceImpl.java   |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkPlanRunVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkPlanRunVO.java
index 97701183..81ad5bdc 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkPlanRunVO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkPlanRunVO.java
@@ -26,8 +26,8 @@ public class WorkPlanRunVO extends WorkPlanRun {
     @Schema(description = "工艺能力")
     private ProcessAbility processAbility;
 
-//    @Schema(description = "工序号")
-//    private String orders;
+    @Schema(description = "工序号")
+    private String orders;
 //
 //    @Schema(description = "工序代码")
 //    private String ppsCode;
@@ -38,10 +38,10 @@ public class WorkPlanRunVO extends WorkPlanRun {
 //    @Schema(description = "工艺能力")
 //    private String caName;
 //
-//    @Schema(description = "工序描述")
-//    private String makeMemo;
+    @Schema(description = "工序描述")
+    private String makeMemo;
 //
-//    @Schema(description = "不可转外协原因")
-//    private String reason;
+    @Schema(description = "不可转外协原因")
+    private String reason;
 
 }
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 b7e2877c..b0e9d2f8 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
@@ -408,6 +408,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             wpr.setWpId(wp.getId());
             wpr.setWorkPlan(wpVO);
             wpr.setWorkOrderRun(CollectionUtils.isNotEmpty(workOrderRuns) ? workOrderRuns.get(0) : null);
+            wpr.setOrders(wp.getOrders());
+            wpr.setMakeMemo(wp.getMakeMemo());
             wprList.add(wpr);
         }