diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java index 53be765a..f06ea0a9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java @@ -367,7 +367,9 @@ public class DsPartServiceImpl extends BaseServiceImpl processMoldToolEntityList = processMoldToolService.selectOldMesByPid(oldMesProcessId); - processMoldToolEntityList.forEach(item -> { + processMoldToolEntityList.forEach(item -> { item.setId(null); item.setProcessId(dsProcessEntity.getId()); }); - if(CollectionUtils.isEmpty(processMoldToolEntityList)){ - log.info("零件 {} 没有工装数据", newPart.getPartCode()); - return true; - } - boolean processMoldToolSaveBatch = processMoldToolService.saveBatch(processMoldToolEntityList); - if(!processMoldToolSaveBatch){ - log.error("工装同步失败,oldMesProcessId:{}", oldMesProcessId); - // 继续处理下一个工艺,不中断 - continue; + if(!CollectionUtils.isEmpty(processMoldToolEntityList)){ + boolean processMoldToolSaveBatch = processMoldToolService.saveBatch(processMoldToolEntityList); + if(!processMoldToolSaveBatch){ + log.error("工装同步失败,oldMesProcessId:{}", oldMesProcessId); + // 继续处理下一个工艺,不中断 + continue; + } } + } }