From 6c614a2dcd4e477abfac53e506b9d0c16563e18a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Thu, 7 May 2026 19:30:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E8=B0=83=E6=95=B4=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/service/impl/PdaSaveServiceImpl.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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 8812aa68..0a74187b 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
@@ -54,6 +54,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 import org.springblade.desk.quality.service.IInspectionTaskService;
 import org.springblade.desk.quality.service.IReviewSheetService;
 import org.springblade.erpdata.feign.IErpDataProduceClient;
+import org.springblade.erpdata.pojo.vo.PpmReportDetailModelVO;
 import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.User;
 import org.springframework.beans.BeanUtils;
@@ -563,8 +564,11 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         yieldOrder.setCardNo(yieldOrderService.nextCardNo());
         yieldOrder.setYoCode(yieldOrderService.nextCode(rr.getRedono()));
         yieldOrder.setYpCode(rr.getRedono());
-        // todo责任部门从erp获取
-        yieldOrder.setResDept("");
+        // 责任部门从erp获取
+        List<PpmReportDetailModelVO> data = erpDataProduceClient.reviewFormMess(Boolean.TRUE, rr.getRedono(), null, null).getData();
+        if (CollectionUtils.isNotEmpty(data)) {
+            yieldOrder.setResDept(data.get(0).getLayer1());
+        }
         yieldOrder.setPartCode(part.getPartCode());
         yieldOrder.setProductType(part.getProductType());
         yieldOrder.setPartName(part.getPartName());
@@ -703,7 +707,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
             }
             if ("1".equals(prWorkPlan.getOem())) {
                 prWorkPlan.setOem("0");
-                prWorkPlan.setOem(null);
+                prWorkPlan.setOcId(null);
             }
             prWorkPlan.setMakeTeam(item.getMakeTeam());
             if (item.getSubsidiaryTeam() != null) {