仓库业务->修改bug

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -2026,10 +2026,17 @@ public class TFeeServiceImpl implements ITFeeService {
                 BigDecimal storageFee = value.stream().map(FeeVO::getStorageFee).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
                 // 其他费用
                 BigDecimal otherFee = value.stream().map(FeeVO::getOtherFee).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
+                // 应收费用
+                BigDecimal amount = value.stream().map(FeeVO::getFAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
+                // 已收费用
+                BigDecimal stlamount = value.stream().map(FeeVO::getFStlamount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
                 WarehouseTypeEnum storageType = WarehouseTypeEnum.fromTypeAndBusinessType(vo.getfBilltype(), "storageType");
                 vo.setfBilltype(storageType.getName());
                 vo.setStorageFee(storageFee);
+                vo.setFStlamount(stlamount);
                 vo.setOtherFee(otherFee);
+                vo.setFAmount(amount);
+                vo.setNnfinished(amount.subtract(stlamount));
                 voList.add(vo);
             });
             return AjaxResult.success(voList);