订单接收-sjx

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrderCraft.java

@@ -120,4 +120,10 @@ public class YieldOrderCraft extends BaseEntity {
 	 */
 	@TableField(value = "IS_OUTSOURCE")
 	private Boolean isOutsource;
+
+	/**
+	 * 加工中心
+	 */
+	@TableField(exist = false)
+	private String workCenterName;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -21,7 +21,9 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 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.WorkCenter;
 import org.springblade.desk.basic.service.IQualityGradeService;
+import org.springblade.desk.basic.service.IWorkCenterService;
 import org.springblade.desk.dashboard.constant.DsCraftConstant;
 import org.springblade.desk.dashboard.constant.DsPartConstant;
 import org.springblade.desk.dashboard.pojo.entity.*;
@@ -88,6 +90,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	private final IDsPartVersionService partVersionService;
 	private final MoldDemandMapper moldDemandMapper;
 	private final IPlateGoodsRecordService plateGoodsRecordService;
+	private final IWorkCenterService workCenterService;
 
 	@Value("${business.oldMes.url}")
 	private String oldMesUrl;
@@ -1047,6 +1050,12 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			boolean result = this.verifyYieldOrderResource(yieldOrder);
 			if(result){
 				List<YieldOrderCraft> list = yieldOrderCraftService.list(Wrappers.<YieldOrderCraft>lambdaQuery().eq(YieldOrderCraft::getYoId,yieldOrder.getId()));
+				list.stream().forEach(craft -> {
+					if(craft.getWorkCenterId() != null){
+						WorkCenter workCenter = workCenterService.getById(craft.getWorkCenterId());
+						craft.setWorkCenterName(workCenter.getWcName());
+					}
+				});
 				return list;
 			}
 		}