소스 검색

热装不在维护定尺

qiangxuan 3 주 전
부모
커밋
97c84f9d82

+ 19 - 21
zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/service/impl/BilletHotsendBaseServiceImpl.java

@@ -1285,25 +1285,25 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			storageBillInfo.setHeatNo(billetBasicInfo.getHeatNo());// 炉号
 		}
 		// 装运单编辑确认目的地,同步时,维护定尺
-		List<Integer> sizeIntList = billetBasicInfoList.stream().map(BilletBasicInfo::getLength).distinct().collect(Collectors.toList());
-		List<String> sizeStrList = sizeIntList.stream().map(String::valueOf).collect(Collectors.toList());
-		if(oConvertUtils.listIsNotEmpty(sizeStrList)) {
-			String distinctSizeStr = sizeIntList.stream()
-					.distinct()
-					.map(String::valueOf)
-					.collect(Collectors.joining(","));
-			String finalSizeStr = Optional.ofNullable(storageBillInfo.getSize())
-					.filter(oConvertUtils::isNotEmpty)
-					.map(s -> s + "," + distinctSizeStr)
-					.orElse(distinctSizeStr);
-			// 对 finalSizeStr 再次去重
-			String[] sizeArray = finalSizeStr.split(",");
-			Set<String> uniqueSizes = Arrays.stream(sizeArray)
-					.filter(s -> s != null && !s.isEmpty())
-					.collect(Collectors.toCollection(HashSet::new));
-			finalSizeStr = String.join(",", uniqueSizes);
-			storageBillInfo.setSize(finalSizeStr);
-		}
+//		List<Integer> sizeIntList = billetBasicInfoList.stream().map(BilletBasicInfo::getLength).distinct().collect(Collectors.toList());
+//		List<String> sizeStrList = sizeIntList.stream().map(String::valueOf).collect(Collectors.toList());
+//		if(oConvertUtils.listIsNotEmpty(sizeStrList)) {
+//			String distinctSizeStr = sizeIntList.stream()
+//					.distinct()
+//					.map(String::valueOf)
+//					.collect(Collectors.joining(","));
+//			String finalSizeStr = Optional.ofNullable(storageBillInfo.getSize())
+//					.filter(oConvertUtils::isNotEmpty)
+//					.map(s -> s + "," + distinctSizeStr)
+//					.orElse(distinctSizeStr);
+//			// 对 finalSizeStr 再次去重
+//			String[] sizeArray = finalSizeStr.split(",");
+//			Set<String> uniqueSizes = Arrays.stream(sizeArray)
+//					.filter(s -> s != null && !s.isEmpty())
+//					.collect(Collectors.toCollection(HashSet::new));
+//			finalSizeStr = String.join(",", uniqueSizes);
+//			storageBillInfo.setSize(finalSizeStr);
+//		}
 
 		// 装运单编辑确认目的地,同步时,维护组批号
 		List<String> assemblyNumberList = billetBasicInfoList.stream().map(BilletBasicInfo::getAssemblyNumber)
@@ -1314,7 +1314,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 					.filter(oConvertUtils::isNotEmpty)
 					.map(s -> s + "," + distinctAssemblyNumber)
 					.orElse(distinctAssemblyNumber);
-
 			// 对 finalAssemblyNumber 再次去重
 			String[] assemblyNumberArray = finalAssemblyNumber.split(",");
 			Set<String> uniqueAssemblyNumbers = Arrays.stream(assemblyNumberArray)
@@ -1323,7 +1322,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			finalAssemblyNumber = String.join(",", uniqueAssemblyNumbers);
 			storageBillInfo.setAssemblyNumber(finalAssemblyNumber);
 		}
-
 		storageBillInfo.setAmountTotal(storageBillInfo.getAmountTotal() + rollClubCommonList.size());
 //		storageBillInfo.setBtype("0");
 		storageBillService.updateById(storageBillInfo);