0afc65d0f24e642b5dba983cbb110f8faf2c2b6d..feb2adcf8ba6e56a31faea43d6e86d5da253cd75
2025-08-15 wujianwei
Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
feb2ad 对比 | 目录
2025-08-15 wujianwei
新增字段
5fe42a 对比 | 目录
1个文件已修改
7 ■■■■ 已修改文件
service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java
@@ -232,7 +232,12 @@
        logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
        settledAmount = settledAmount.add(settlementAmount);
        List<String>dispatchNos =pendingSettlementBusinessMapper.selectPendingSettlementBusinessDispatchNos(estimatedReceivableBill.getId());
        if (settledAmount.compareTo(totalAmount) > 0){
        // 检查当前提交金额+已结算金额是否超过应结算金额
        if (settlementAmount.add(settledAmount).compareTo(totalAmount) > 0) {
            // 超过应结算金额,抛出异常或处理错误
            throw new RuntimeException("当前提交金额加上已结算金额不能超过应结算金额");
        }
       if (settlementAmount.add(settledAmount).compareTo(totalAmount) == 0) {
            //已结算大于应计算金额为已结算
            estimatedReceivableBill.setStatus(2);
            estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,3);