From 14edb64ad9d91998e6090d9e8f0ac2b1c6edaf19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Sat, 6 Jun 2026 14:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8E=A5=E6=94=B6=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=96=E5=8D=8F=E5=95=86=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/YieldOrderServiceImpl.java     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
index b3a6b4f74..e3472668f 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
@@ -24,12 +24,10 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
 import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart;
+import org.springblade.desk.basic.pojo.entity.Oem;
 import org.springblade.desk.basic.pojo.entity.UrgentPart;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
-import org.springblade.desk.basic.service.ILocallyPlatedPartService;
-import org.springblade.desk.basic.service.IQualityGradeService;
-import org.springblade.desk.basic.service.IUrgentPartService;
-import org.springblade.desk.basic.service.IWorkCenterService;
+import org.springblade.desk.basic.service.*;
 import org.springblade.desk.common.constant.BizTypeConstant;
 import org.springblade.desk.common.feign.IMesNotifyMessageClient;
 import org.springblade.desk.common.pojo.entity.MesNotifyMessageEntity;
@@ -138,6 +136,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
     @Autowired
     private IWorkCenterService workCenterService;
 
+    @Autowired
+    private IOemService oemService;
 
     @Autowired
     @Lazy
@@ -1560,6 +1560,9 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
                 if (craft.getWorkCenterId() != null) {
                     WorkCenter workCenter = workCenterService.getById(craft.getWorkCenterId());
                     craft.setWorkCenterName(workCenter.getWcName());
+                } else if (craft.getOcId() != null) {
+                    Oem oem = oemService.getById(craft.getOcId());
+                    craft.setWorkCenterName(oem != null ? oem.getOcName() : "");
                 }
             });
             return list;