修改储运工作台炉号信息对应的高线重量显示异常的问题

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/impl/StorageBillServiceImpl.java

@@ -3781,6 +3781,13 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             heatNoDetails.add(heatNoDetail);
         }
 
+        BigDecimal totalWeight = heatNoInfos.stream()
+                .map(StorageCenterCarDetailVO.heatNoInfo::getSizeWeight)
+                .filter(Objects::nonNull)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+
+        storageCenterCarDetailVO.setTotalWeight(totalWeight);
         storageCenterCarDetailVO.setHeatNoInfos(heatNoInfos);
         storageCenterCarDetailVO.setHeatNoDetails(heatNoDetails);
 
@@ -4039,11 +4046,11 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                 rollSendDetailList.add(rollSendDetail);
             });
 
-            // 赋值给 rollOneHeatNo
-            rollOneHeatNo.setSizeDetails(sizeDetailsList);
-            rollOneHeatNo.setRollSendDetails(rollSendDetailList);
+            // 赋值给 rollHeightHeatNo
+            rollHeightHeatNo.setSizeDetails(sizeDetailsList);
+            rollHeightHeatNo.setRollSendDetails(rollSendDetailList);
 
-            storageCenterHeatNoDetailVO.setRollClubOneDetails(rollOneHeatNo);
+            storageCenterHeatNoDetailVO.setRollHeightDetails(rollHeightHeatNo);
 
         }
 
@@ -4592,16 +4599,15 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                 String stackAddr = "未知";
                 String layer = "未知";
                 String address = "未知";
-                String size = "未知";
 
                 if (!stackingAndLoadingVehicles.isEmpty()) {
                     stackAddr = stackingAndLoadingVehicles.get(0).getStackAddr();
                     layer = stackingAndLoadingVehicles.get(0).getLayer();
                     address = stackingAndLoadingVehicles.get(0).getAddress();
-                    size = stackingAndLoadingVehicles.get(0).getSize();
+//                    size = stackingAndLoadingVehicles.get(0).getSize();
                 }
 
-//                Integer size = Optional.ofNullable(billets.get(0).getLength()).orElse(0); // 避免 NullPointerException
+                Integer size = Optional.ofNullable(billets.get(0).getLength()).orElse(0); // 避免 NullPointerException
                 String spec = Optional.ofNullable(billets.get(0).getSpec()).orElse("Unknown"); // 避免 null 赋值
 
                 // 计算 weight 总和

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/vo/StorageCenterHeatNoDetailVO.java

@@ -187,7 +187,7 @@ public class StorageCenterHeatNoDetailVO {
     public static class StackingVehiclesDetail {
 
         @ApiModelProperty(value = "定尺")
-        private String size;
+        private Integer size;
 
         @ApiModelProperty(value = "规格")
         private String spec;