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

---
 .../java/org/springblade/desk/order/pojo/entity/YieldOrder.java | 2 +-
 .../desk/produce/service/impl/WorkOrderServiceImpl.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 af6fe1e7b..9b9dbaefe 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
@@ -364,7 +364,7 @@ public class YieldOrder extends BaseEntity {
 	/**
 	 * 子件齐套时间
 	 */
-//	@TableField(value = "PRODUCE_BOOL_DATE")
+	@TableField(value = "PRODUCE_BOOL_DATE")
 	private Date produceBoolDate;
 
 	/**
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 81b30e976..f71286499 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
@@ -1852,7 +1852,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     wo.setPlanner(bsTeamSet.getPlanner());
                     wo.setDispatcher(bsTeamSet.getDispatcher());
                 }
-                wo.setTsId(null);
+                wo.setOcId(null);
             } else if (wo.getOcId() != null) {
                 OemCraftAbilityEntity oa = oemCraftAbilityService.findBsOemAbility(wo.getOcId(), caId);
                 if (oa == null) {