|
@@ -3489,7 +3489,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
Long materialId = bom.getMaterialId();
|
|
Long materialId = bom.getMaterialId();
|
|
// ContractProduct contractProduct = productMap.get(bom.getContractProductId());
|
|
// ContractProduct contractProduct = productMap.get(bom.getContractProductId());
|
|
// BigDecimal multiply = bom.getQuantity().multiply(contractProduct.getQuantity());
|
|
// BigDecimal multiply = bom.getQuantity().multiply(contractProduct.getQuantity());
|
|
- BigDecimal multiply = bom.getQuantity();
|
|
|
|
|
|
+ BigDecimal multiply = ObjectUtil.defaultIfNull(bom.getQuantity(), BigDecimal.ZERO);
|
|
|
|
|
|
//合并相同物料
|
|
//合并相同物料
|
|
AvailableStockBo inOutBo = inOutBoMap.get(materialId);
|
|
AvailableStockBo inOutBo = inOutBoMap.get(materialId);
|