bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

平衡表

This commit is contained in:
mashuai 2025-10-31 10:25:58 +08:00
parent 4ef78a3a49
commit f98f630eba
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
View File

@ -1465,8 +1465,8 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
// 获取施工队及分包数据 // 获取施工队及分包数据
List<MaterialProvideNumInfo> subList = materialMachineMapper.getSubNumList(bean); List<MaterialProvideNumInfo> subList = materialMachineMapper.getSubNumList(bean);
// 若任一列表为空，直接返回（无需处理） // 若列表为空，直接返回（无需处理）
if (CollectionUtils.isEmpty(recordList) || CollectionUtils.isEmpty(subList)) { if (CollectionUtils.isEmpty(recordList) && CollectionUtils.isEmpty(subList)) {
return recordList; return recordList;
} }
@ -1490,7 +1490,8 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
// 合并数值字段（假设为BigDecimal，确保非null，若可能为null需先判断） // 合并数值字段（假设为BigDecimal，确保非null，若可能为null需先判断）
matchedRecord.setUseNum(subInfo.getUseNum().add(matchedRecord.getUseNum())); matchedRecord.setUseNum(subInfo.getUseNum().add(matchedRecord.getUseNum()));
matchedRecord.setStoreNum(matchedRecord.getStoreNum().subtract(subInfo.getUseNum())); matchedRecord.setStoreNum(matchedRecord.getStoreNum().subtract(subInfo.getUseNum()).compareTo(BigDecimal.ZERO) < 0
? BigDecimal.ZERO : matchedRecord.getStoreNum().subtract(subInfo.getUseNum()));
// 合并协议ID（使用StringBuilder优化拼接） // 合并协议ID（使用StringBuilder优化拼接）
matchedRecord.setAgreementIds(matchedRecord.getAgreementIds() + "," + subInfo.getAgreementIds()); matchedRecord.setAgreementIds(matchedRecord.getAgreementIds() + "," + subInfo.getAgreementIds());
} }