工艺匹配增加同步零件信息-sjx

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

@@ -92,6 +92,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	private final IPlateGoodsRecordService plateGoodsRecordService;
 	private final IWorkCenterService workCenterService;
 
+	private final IDsTaskingService dsTaskingService;
+
 	@Value("${business.oldMes.url}")
 	private String oldMesUrl;
 	@Value("${business.oldMes.syncOrderList}")
@@ -1277,12 +1279,18 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	 */
 	private Integer judgeRank(YieldOrder yieldOrder) {
 		DsPartEntity part = dsPartService.selectDsPartByPatCodeAndVersion(yieldOrder.getPartCode(), yieldOrder.getPartVersion());
+		//如果零件信息为null，调用
 		if(part == null){
-			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCode());
-			yieldOrder.setValidationTime(DateUtil.now());
-			yieldOrder.setValidationMomo("未查询到零件信息！");
-			this.updateById(yieldOrder);
-			return null;
+			log.info("零件信息为null，从老mes同步零件信息");
+			boolean result = dsTaskingService.syncPart(null,null,yieldOrder.getPartCode());
+			if(!result){
+				yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCode());
+				yieldOrder.setValidationTime(DateUtil.now());
+				yieldOrder.setValidationMomo("未查询到零件信息！");
+				this.updateById(yieldOrder);
+				return null;
+			}
+			part = dsPartService.selectDsPartByPatCodeAndVersion(yieldOrder.getPartCode(), yieldOrder.getPartVersion());
 		}
 		// 工作订单备注中包含大小写的HTBY时，执行二级工艺
 		if (yieldOrder.getYpMemo() != null && yieldOrder.getYpMemo().toLowerCase(Locale.ROOT).contains("htby")) {