update001

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/service/impl/RollClubOneServiceImpl.java

@@ -66,7 +66,13 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
         List<DestinationStatisticsDetails> rollClubOneDetailsStatisticsList = new ArrayList<>();
         sumBySize.forEach((size, totalWeight) -> {
             long count = countBySize.get(size);
-            rollClubOneDetailsStatisticsList.add(new DestinationStatisticsDetails(size, (int) count, totalWeight));
+            // 找到第一个匹配size的RollClubOneDetails对象获取其ccmNo值（假设ccmNo在同一size分组内是相同的，如有不同需调整逻辑）
+            String ccmNos = rollClubOneDetailsList.stream()
+                    .filter(detail -> detail.getSize().equals(size))
+                    .findFirst()
+                    .map(RollClubOneDetails::getCcmNo)
+                    .orElse(null);
+            rollClubOneDetailsStatisticsList.add(new DestinationStatisticsDetails(size, (int) count, totalWeight, ccmNos));
         });
         destinationStatistics.setStatisticsDetailsList(rollClubOneDetailsStatisticsList);
         return destinationStatistics;

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubThree/service/impl/RollClubThreeServiceImpl.java

@@ -66,7 +66,13 @@ public class RollClubThreeServiceImpl extends ServiceImpl<RollClubThreeMapper, R
         List<DestinationStatisticsDetails> rollClubThreeDetailsStatisticsList = new ArrayList<>();
         sumBySize.forEach((size, totalWeight) -> {
             long count = countBySize.get(size);
-            rollClubThreeDetailsStatisticsList.add(new DestinationStatisticsDetails(size, (int) count, totalWeight));
+            // 找到第一个匹配size的RollClubOneDetails对象获取其ccmNo值（假设ccmNo在同一size分组内是相同的，如有不同需调整逻辑）
+            String ccmNos = rollClubThreeDetailsList.stream()
+                    .filter(detail -> detail.getSize().equals(size))
+                    .findFirst()
+                    .map(RollClubThreeDetails::getCcmNo)
+                    .orElse(null);
+            rollClubThreeDetailsStatisticsList.add(new DestinationStatisticsDetails(size, (int) count, totalWeight, ccmNos));
         });
 
         Integer sums = rollClubThreeDetailsStatisticsList.stream()

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubTwo/service/impl/RollClubTwoServiceImpl.java

@@ -64,7 +64,13 @@ public class RollClubTwoServiceImpl extends ServiceImpl<RollClubTwoMapper, RollC
         List<DestinationStatisticsDetails> rollClubTwoDetailsStatisticsList = new ArrayList<>();
         sumBySize.forEach((size, totalWeight) -> {
             long count = countBySize.get(size);
-            rollClubTwoDetailsStatisticsList.add(new DestinationStatisticsDetails(size, (int) count, totalWeight));
+            // 找到第一个匹配size的RollClubOneDetails对象获取其ccmNo值（假设ccmNo在同一size分组内是相同的，如有不同需调整逻辑）
+            String ccmNos = rollClubTwoDetailsList.stream()
+                    .filter(detail -> detail.getSize().equals(size))
+                    .findFirst()
+                    .map(RollClubTwoDetails::getCcmNo)
+                    .orElse(null);
+            rollClubTwoDetailsStatisticsList.add(new DestinationStatisticsDetails(size, (int) count, totalWeight, ccmNos));
         });
 
         Integer sums = rollClubTwoDetailsStatisticsList.stream()

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollHeight/entity/DestinationStatisticsDetails.java

@@ -16,9 +16,14 @@ public class DestinationStatisticsDetails {
     @ApiModelProperty(value = "出坯重量")
     private Double blankOutput;
 
-    public DestinationStatisticsDetails(String size, Integer nums, Double blankOutput) {
+    /**铸机号*/
+    @ApiModelProperty(value = "铸机号")
+    private String ccmNo;
+
+    public DestinationStatisticsDetails(String size, Integer nums, Double blankOutput, String ccmNo) {
         this.size = size;
         this.nums = nums;
         this.blankOutput = blankOutput;
+        this.ccmNo = ccmNo;
     }
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollHeight/service/impl/RollHeightServiceImpl.java

@@ -65,7 +65,13 @@ public class RollHeightServiceImpl extends ServiceImpl<RollHeightMapper, RollHei
         List<DestinationStatisticsDetails> rollHeightStatisticsDetailsList = new ArrayList<>();
         sumBySize.forEach((size, totalWeight) -> {
             long count = countBySize.get(size);
-            rollHeightStatisticsDetailsList.add(new DestinationStatisticsDetails(size, (int) count, totalWeight));
+            // 找到第一个匹配size的RollClubOneDetails对象获取其ccmNo值（假设ccmNo在同一size分组内是相同的，如有不同需调整逻辑）
+            String ccmNos = rollHeightDetailsList.stream()
+                    .filter(detail -> detail.getSize().equals(size))
+                    .findFirst()
+                    .map(RollHeightDetails::getCcmNo)
+                    .orElse(null);
+            rollHeightStatisticsDetailsList.add(new DestinationStatisticsDetails(size, (int) count, totalWeight, ccmNos));
         });
         destinationStatistics.setStatisticsDetailsList(rollHeightStatisticsDetailsList);
         return destinationStatistics;

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollOutShipp/service/impl/RollOutShippServiceImpl.java

@@ -70,7 +70,13 @@ public class RollOutShippServiceImpl extends ServiceImpl<RollOutShippMapper, Rol
         List<DestinationStatisticsDetails> rollOutShippDetailsStatisticsList = new ArrayList<>();
         sumBySize.forEach((size, totalWeight) -> {
             long count = countBySize.get(size);
-            rollOutShippDetailsStatisticsList.add(new DestinationStatisticsDetails(size, (int) count, totalWeight));
+            // 找到第一个匹配size的RollClubOneDetails对象获取其ccmNo值（假设ccmNo在同一size分组内是相同的，如有不同需调整逻辑）
+            String ccmNos = rollOutShippDetailsList.stream()
+                    .filter(detail -> detail.getSize().equals(size))
+                    .findFirst()
+                    .map(RollOutShippDetails::getCcmNo)
+                    .orElse(null);
+            rollOutShippDetailsStatisticsList.add(new DestinationStatisticsDetails(size, (int) count, totalWeight, ccmNos));
         });
         Integer sums = rollOutShippDetailsStatisticsList.stream()
                 .map(DestinationStatisticsDetails::getNums)