任务接收返回外协商名称

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.*;
-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.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;