修改发货审批

huminmin

2026-06-02 e18e4614ec036b8fa6f130f51fd19e24280a51d0

修改发货审批

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -3402,7 +3402,7 @@
        clearShippingAndApprovalRecords(originalSalesLedgerId);
        
        // 9. 取消原订单相关的审批流程
        cancelApproveProcesses(originalSalesLedgerId);
        cancelApproveProcesses(originalSalesLedgerId, originalLedger.getSalesContractNo());
    }

    /**
@@ -3450,7 +3450,7 @@
    /**
     * 取消原订单相关的审批流程
     */
    private void cancelApproveProcesses(Long originalSalesLedgerId) {
    private void cancelApproveProcesses(Long originalSalesLedgerId, String originalSalesContractNo) {
        // 取消入库审批流程
        List<ApproveProcess> stockInApproveProcesses = approveProcessService.list(
            new LambdaQueryWrapper<ApproveProcess>()
@@ -3469,7 +3469,7 @@
        List<ApproveProcess> deliveryApproveProcesses = approveProcessService.list(
            new LambdaQueryWrapper<ApproveProcess>()
                .eq(ApproveProcess::getApproveType, 7) // 发货审批类型
                .like(ApproveProcess::getApproveRemark, "{\"ledgerId\":" + originalSalesLedgerId)
                .like(ApproveProcess::getApproveReason, "发货审批:" + originalSalesContractNo)
                .eq(ApproveProcess::getApproveDelete, 0)
        );