新增移除

wujianwei

2025-08-15 254a2998c07916de66c464928bbb1beeacfe72d6

新增移除

 service/src/main/java/com/ruoyi/cwgl/controller/EstimatedReceivableBillController.java

@@ -116,4 +116,16 @@
    {
        return toAjax(estimatedReceivableBillService.deleteEstimatedReceivableBillByIds(ids));
    }

    /**
     * 取消关联
     * @param id
     * @return
     */
    @GetMapping("cancel/relevancy/{id}")
    public AjaxResult cancelRelevancy(@PathVariable("id") Integer id)
    {
        return toAjax(estimatedReceivableBillService.cancelRelevancy(id));
    }

}

 service/src/main/java/com/ruoyi/cwgl/mapper/PendingSettlementBusinessMapper.java

@@ -103,4 +103,7 @@
    List<String> selectCustomName();

    List<String> selectPendingSettlementBusinessDispatchNos(Integer id);


    int cancelRelevancy(Integer id);
}

 service/src/main/java/com/ruoyi/cwgl/service/IEstimatedReceivableBillService.java

@@ -106,4 +106,11 @@
     * @return
     */
    int settlement(EstimatedReceivableBill estimatedReceivableBill);

    /**
     * 取消关联
     * @param id
     * @return
     */
    int cancelRelevancy(Integer id);
}

 service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java

@@ -1,8 +1,10 @@
package com.ruoyi.cwgl.service.impl;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;

@@ -226,4 +228,31 @@
        }
        return estimatedReceivableBillMapper.updateEstimatedReceivableBill(estimatedReceivableBill);
    }

    @Override
    public int cancelRelevancy(Integer id) {
        PendingSettlementBusiness pendingSettlementBusiness = pendingSettlementBusinessMapper.selectPendingSettlementBusinessById(id);
        if (pendingSettlementBusiness==null){
            throw new ServiceException("待入账业务不存在");
        }
        Integer billId = pendingSettlementBusiness.getBillId();
        EstimatedReceivableBill estimatedReceivableBill = estimatedReceivableBillMapper.selectEstimatedReceivableBillById(billId);
        estimatedReceivableBill.setDispatchCount(estimatedReceivableBill.getDispatchCount()-1);
        //应结算金额修改
        Long totalAmount = estimatedReceivableBill.getTotalAmount();
        estimatedReceivableBill.setTotalAmount(totalAmount-pendingSettlementBusiness.getEstimatedTotalIncome());
        EstimatedReceivableBillLog estimatedReceivableBillLog = new EstimatedReceivableBillLog();
        estimatedReceivableBillLog.setCreateTime(new Date());
        estimatedReceivableBillLog.setBillId(billId);
        estimatedReceivableBillLog.setCreateBy(SecurityUtils.getUsername());
        String dispatchNo = pendingSettlementBusiness.getDispatchNo();
        estimatedReceivableBillLog.setOperation("取消调度单"+ dispatchNo +"关联");
        logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
        List<String> dispatchNos = new ArrayList<>();
        dispatchNos.add(dispatchNo);
        estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,0);

        return  pendingSettlementBusinessMapper.cancelRelevancy(id);

    }
}

 service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml

@@ -536,5 +536,9 @@
            #{id}
        </foreach>
    </delete>
    <delete id="cancelRelevancy">
         UPDATE pending_settlement_business set bill_id = null ,bill_name = null
         where id = #{id}
    </delete>

</mapper>