Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

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

@@ -367,7 +367,9 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 		updateById(dsPart);
 		if (!TaskingConstant.IS_SINTERING.equals(dsPart.getIsSintering())) {
 			if ((org.apache.commons.lang3.StringUtils.isNotBlank(dsPart.getCraftWay()) && dsPart.getCraftWay().contains("4"))) {
-				getErpDataPartClient().sendingPartGiveErp(dsPart);
+
+
+				//	todo			getErpDataPartClient().sendingPartGiveErp(dsPart);
 			}
 		}
 		if (!CollectionUtils.isEmpty(zPartList)) {

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

@@ -1801,15 +1801,13 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 						item.setId(null);
 						item.setProcessId(dsProcessEntity.getId());
 					});
-					if(CollectionUtils.isEmpty(processProjectList)){
-						log.info("零件 {} 没有检验项目数据", newPart.getPartCode());
-						return true;
-					}
-					boolean processProjectSaveBatch = processProjectService.saveBatch(processProjectList);
-					if (!processProjectSaveBatch) {
-						log.error("项目同步失败，oldMesProcessId:{}", oldMesProcessId);
-						// 继续处理下一个工艺，不中断
-						continue;
+					if(!CollectionUtils.isEmpty(processProjectList)){
+						boolean processProjectSaveBatch = processProjectService.saveBatch(processProjectList);
+						if (!processProjectSaveBatch) {
+							log.error("项目同步失败，oldMesProcessId:{}", oldMesProcessId);
+							// 继续处理下一个工艺，不中断
+							continue;
+						}
 					}
 
 					//尺寸量具
@@ -1818,33 +1816,30 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 						item.setId(null);
 						item.setProcessId(dsProcessEntity.getId());
 					});
-					if(CollectionUtils.isEmpty(processMeasuringToolList)){
-						log.info("零件 {} 没有尺寸量具数据", newPart.getPartCode());
-						return true;
-					}
-					boolean measuringToolSaveBatch = processMeasuringToolService.saveBatch(processMeasuringToolList);
-					if (!measuringToolSaveBatch) {
-						log.error("尺寸量具同步失败，oldMesProcessId:{}", oldMesProcessId);
-						// 继续处理下一个工艺，不中断
-						continue;
+					if(!CollectionUtils.isEmpty(processMeasuringToolList)){
+						boolean measuringToolSaveBatch = processMeasuringToolService.saveBatch(processMeasuringToolList);
+						if (!measuringToolSaveBatch) {
+							log.error("尺寸量具同步失败，oldMesProcessId:{}", oldMesProcessId);
+							// 继续处理下一个工艺，不中断
+							continue;
+						}
 					}
 
 					//工装
 					List<DsProcessMoldToolEntity> 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;
+						}
 					}
+
 				}
 			}