修改同步逻辑

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java

@@ -446,7 +446,6 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 		DsPartEntity partEntity = dsPartMapper.selectById(partVersionEntity.getPartId());
 		DsPartSynthesisVO dsPartSynthesisVO = new DsPartSynthesisVO();
 		//查询子件信息
-		if (TaskingConstant.IS_SINTERING.equals(partEntity.getIsSintering())) {
 		List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
 		if(!CollectionUtils.isEmpty(partRelationEntityList)){
 			List<Long> idList = partRelationEntityList.stream()
@@ -473,7 +472,6 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 
 			dsPartSynthesisVO.setDsPartVOList(dsPartVOList);
 		}
-		}
 
 		dsPartSynthesisVO.setDsPartEntity(partEntity);
 

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

@@ -1851,16 +1851,9 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 			log.info("开始处理子件：{}", subCode);
 
 			try {
-				// 1. 查询子件老MES数据（null仅代表无该子件的详细数据，不代表跳过）
+				// 1. 处理子件数据进行赋值
-				DsPartEntity oldMesSubPart = getOldMesPart(subCode);
+				DsPartEntity oldMesSubPart = new DsPartEntity();
-
-				if (oldMesSubPart == null) {
-					// 子件无老MES详细数据，创建空的基础对象（保证核心逻辑能执行）
-					log.warn("子件 {} 无老MES详细数据，创建基础空对象处理", subCode);
-					oldMesSubPart = new DsPartEntity();
-					if(!StringUtils.isEmpty(subPartInfo.getSubName())){
 				oldMesSubPart.setPartName(subPartInfo.getSubName());
-					}
 				oldMesSubPart.setPartCode(subPartInfo.getSubCode());
 				oldMesSubPart.setQuota(subPartInfo.getQuota());
 				oldMesSubPart.setSubType(subPartInfo.getSubType());
@@ -1872,8 +1865,6 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 				oldMesSubPart.setPlateCode(subPartInfo.getPlateCode());
 				oldMesSubPart.setSinTerType(subPartInfo.getSinTerType());
 
-				}
-
 				// 2. 递归处理当前子件自身（生成版本号、创建零件、同步工艺等核心逻辑）
 				DsPartEntity newSubPart = processPartRecursively(oldMesSubPart);
 				if (newSubPart == null) {