新增确认取消判断

wujianwei

2025-08-18 5cccc3698dede7018339799336909f444b80b2c5

新增确认取消判断

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

@@ -86,5 +86,5 @@
     */
    public int deleteEstimatedReceivableByIds(Integer[] ids);

    void updateEstimatedReceivableBillStatus(@Param("list") List<String> list, @Param("status") int status);
    void updateEstimatedReceivableBillStatus(@Param("list") List<String> list, @Param("status") int status,@Param("billName")String billName);
}

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

@@ -241,12 +241,12 @@
       if (settlementAmount.add(settledAmount).compareTo(totalAmount) == 0) {
            //已结算大于应计算金额为已结算
            estimatedReceivableBill.setStatus(2);
            estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,3);
            estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,3,null);
            pendingSettlementBusinessMapper.updateEstimatedReceivableBillStatus(dispatchNos,3);
        }else {
            //否则部分结算
            estimatedReceivableBill.setStatus(1);
            estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,2);
            estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,2,null);
           pendingSettlementBusinessMapper.updateEstimatedReceivableBillStatus(dispatchNos,2);
        }
        settledAmount = settledAmount.add(settlementAmount);
@@ -273,9 +273,7 @@
        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/java/com/ruoyi/cwgl/service/impl/PendingSettlementBusinessServiceImpl.java

@@ -320,7 +320,7 @@
        estimatedReceivableBill.setCreateBy(username);
        estimatedReceivableBillMapper.insertEstimatedReceivableBill(estimatedReceivableBill);
        //修改入账
        estimatedReceivableMapper.updateEstimatedReceivableBillStatus(collect,1);
        estimatedReceivableMapper.updateEstimatedReceivableBillStatus(collect,1,createBillVo.getBillName());

        //修改调度单为已创建账单
        return  pendingSettlementBusinessMapper.updatePendingSettlementBusinessIsCreate(collect,estimatedReceivableBill.getId(),createBillVo.getBillName());
@@ -366,7 +366,7 @@
        estimatedReceivableBill.setCreateBy(username);
        estimatedReceivableBillMapper.insertEstimatedReceivableBill(estimatedReceivableBill);
        //修改应收管理表已入账
        estimatedReceivableMapper.updateEstimatedReceivableBillStatus(collect,1);
        estimatedReceivableMapper.updateEstimatedReceivableBillStatus(collect,1,billName);
        //修改调度单为已创建账单
        return  pendingSettlementBusinessMapper.updatePendingSettlementBusinessIsCreate(collect,estimatedReceivableBill.getId(),billName);
    }

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

@@ -194,6 +194,10 @@
    <update id="updateEstimatedReceivableBillStatus">
        UPDATE estimated_receivable
        SET related_bill_status = #{status}
        <if test="billName !=null and billName != ''">
            , related_bill_name = #{billName}
        </if>

        WHERE dispatch_no IN
        <foreach item="item" collection="list" open="(" separator="," close=")">
            #{item}

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

@@ -540,16 +540,13 @@

    </update>
    <update id="updatePendingSettlementBusinessIsCreate">
        UPDATE pending_settlement_business p
        JOIN estimated_receivable e ON p.dispatch_no = e.dispatch_no
        UPDATE pending_settlement_business
        SET
        p.is_create = 1,
        p.bill_id = #{id},
        p.bill_name = #{billName},
        p.related_bill_status = 1,
        e.related_bill_name = #{billName},
        e.related_bill_status = 1
        WHERE p.dispatch_no IN
        is_create = 1,
        bill_id = #{id},
        bill_name = #{billName},
        related_bill_status = 1
        WHERE dispatch_no IN
        <foreach item="item" collection="list" open="(" separator="," close=")">
            #{item}
        </foreach>
@@ -563,16 +560,13 @@
            WHERE p.bill_id = #{id}
    </update>
    <update id="updateEstimatedReceivableBillStatus">
        UPDATE pending_settlement_business p
        JOIN estimated_receivable e ON p.dispatch_no = e.dispatch_no
        UPDATE pending_settlement_business
        SET
        p.is_create = 1,
        p.bill_id = #{id},
        p.bill_name = #{billName},
        p.related_bill_status = 1,
        e.related_bill_name = #{billName}
        e.related_bill_status = 1
        WHERE p.dispatch_no IN
        is_create = 1,
        bill_id = #{id},
        bill_name = #{billName},
        related_bill_status = 1,
        WHERE dispatch_no IN
        <foreach item="item" collection="list" open="(" separator="," close=")">
            #{item}
        </foreach>