From 7794019fa2eb19367816c4a83c5afa2abef24170 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Wed, 20 May 2026 17:34:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=A0=B8=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/pojo/entity/DsTaskingEntity.java   |  6 ++++++
 .../service/impl/DsCraftServiceImpl.java         |  2 ++
 .../service/impl/DsTaskingServiceImpl.java       | 16 ++++++----------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java
index e16acc418..ca1206068 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java
@@ -191,5 +191,11 @@ public class DsTaskingEntity extends BaseEntity {
 	@Schema(description = "返工原因")
 	private String reworkReason;
 
+	/**
+	 * 审理意见
+	 */
+	@Schema(description = "审理意见")
+	private String dispose;
+
 
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java
index 2c6b019f4..ca834c455 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java
@@ -45,6 +45,7 @@ import org.springblade.desk.dashboard.service.*;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.service.IYieldOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -78,6 +79,7 @@ public class DsCraftServiceImpl extends BaseServiceImpl<DsCraftMapper, DsCraftEn
 	DsCraftMapper craftMapper;
 
 	@Autowired
+	@Lazy
 	IYieldOrderService yieldOrderService;
 
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
index 33e852dd9..d8e0394ca 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
@@ -1284,9 +1284,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 
 		dsTasking.setVersion(partVersion);
 		// 查审理单 获取返修原因
-		String reworkMemo = getReworkMemo(reworkOrder);
-		if (!StringUtils.isEmpty(reworkMemo)) {
-			dsTasking.setReworkReason(reworkMemo);
+		PpmReportDetailDTO reworkMemo = getReworkMemo(reworkOrder);
+		if (null != reworkMemo) {
+			dsTasking.setReworkReason(reworkMemo.getMemo());
+			dsTasking.setDispose(reworkMemo.getDispose());
 		}
 
 		// 2. 保存任务信息
@@ -2602,7 +2603,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 	 * @param reworkOrder 返修单号
 	 * @return 返修原因，查询失败时返回 null
 	 */
-	private String getReworkMemo(String reworkOrder) {
+	private PpmReportDetailDTO getReworkMemo(String reworkOrder) {
 		if (StringUtils.isEmpty(reworkOrder)) {
 			log.warn("返修单号为空");
 			return null;
@@ -2635,12 +2636,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 				return null;
 			}
 
-			String memo = detail.getMemo();
-			if (StringUtils.isEmpty(memo)) {
-				log.warn("返修单 {} 的返修原因为空", reworkOrder);
-			}
-
-			return memo;
+			return detail;
 
 		} catch (Exception e) {
 			log.error("查询返修单 {} 的审理单信息异常", reworkOrder, e);