完善钢坯明细信息对于组坯以及坯号的判空逻辑

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/service/impl/BilletSendRecordServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 import java.util.Optional;
 
@@ -100,7 +101,11 @@ public class BilletSendRecordServiceImpl extends ServiceImpl<BilletSendRecordMap
 
         // 重量转 BigDecimal，考虑 null 情况
         Double billetWeight = billetBasicInfo.getBilletWeight();
-        BigDecimal weight = billetWeight != null ? BigDecimal.valueOf(billetWeight) : BigDecimal.ZERO;
+        BigDecimal weight = billetWeight != null
+                ? BigDecimal.valueOf(billetWeight).multiply(BigDecimal.valueOf(1000))
+                : BigDecimal.ZERO;
+
+
         billetQueryVO.setPerWeight(weight);
 
         return billetQueryVO;

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillController.java

@@ -205,11 +205,14 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 			billetQuery.in(BilletBasicInfo::getBilletNo, billetNos);
 			List<BilletBasicInfo> basicList = billetBasicInfoService.list(billetQuery);
 
-			billetToAssemblyMap = basicList.stream().collect(Collectors.toMap(
-					BilletBasicInfo::getBilletNo,
-					BilletBasicInfo::getAssemblyNumber,
-					(existing, replacement) -> existing // 遇重复保留第一个
-			));
+			billetToAssemblyMap = basicList.stream()
+					.filter(info -> StringUtils.isNotBlank(info.getBilletNo()) && StringUtils.isNotBlank(info.getAssemblyNumber()))
+					.collect(Collectors.toMap(
+							BilletBasicInfo::getBilletNo,
+							BilletBasicInfo::getAssemblyNumber,
+							(existing, replacement) -> existing // 遇重复保留第一个
+					));
+
 		}
 
 		// 7. 遍历 StorageBill，填充 amountTotal 和 assemblyNumber

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

@@ -7970,11 +7970,13 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
 
             // 构建 billetNo -> assemblyNumber 映射
             billetToAssemblyMap = billetBasicInfoList.stream()
+                    .filter(info -> StringUtils.isNotBlank(info.getBilletNo()) && StringUtils.isNotBlank(info.getAssemblyNumber()))
                     .collect(Collectors.toMap(
                             BilletBasicInfo::getBilletNo,
                             BilletBasicInfo::getAssemblyNumber,
-                            (existing, replacement) -> existing // 遇到重复 billetNo，保留第一个
+                            (existing, replacement) -> existing // 遇重复保留第一个
                     ));
+
         }
 
         // 3. 遍历 details 并更新 assemblyNumber