gongchunyi
2 天以前 6ef4265f1859e88e3e5ff22ef1848e12fa849e26
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -259,22 +259,23 @@
        }
        // 出库审批修改 (订单级别)
        if(approveProcess.getApproveType().equals(7)){
            String scanRemark = approveProcess.getApproveRemark();
            if (org.springframework.util.StringUtils.hasText(scanRemark) && scanRemark.startsWith("SCAN_SHIP_DELIVERY_JSON:")) {
                salesLedgerService.onScanShipDeliveryApproveOutcome(approveProcess, status);
            } else {
            String[] split = approveProcess.getApproveReason().split(":");
            if (split.length > 1) {
                String identifier = split[1];
                // 查找销售台账
                SalesLedger salesLedger = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
                        .eq(SalesLedger::getSalesContractNo, identifier)
                        .last("limit 1"));
                if (salesLedger != null) {
                    if(status.equals(2)){
                        // 审批完成 -> 修改状态为审核通过,不扣除库存(扣除库存在发货台账补充信息)
                        updateSalesLedgerDeliveryStatus(salesLedger.getId(), 4);
                        updateShippingInfoStatusByOrder(salesLedger.getId(), "审核通过");
                    } else if(status.equals(3)){
                        updateSalesLedgerDeliveryStatus(salesLedger.getId(), 3);
                        // 更新关联的发货记录为审核拒绝
                        updateShippingInfoStatusByOrder(salesLedger.getId(), "审核拒绝");
                    } else if(status.equals(1)){
                        updateSalesLedgerDeliveryStatus(salesLedger.getId(), 2);
@@ -283,6 +284,7 @@
                }
            }
        }
        }
        // 销售订单成品入库审批
        if (approveProcess.getApproveType().equals(9)) {