wlzboy
2025-12-26 4fdde57a837b47b0a04aa17a7627c21b7425eda2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusPushServiceImpl.java
@@ -129,6 +129,10 @@
                    log.info("取消转运任务: {}", emergency.getLegacyServiceOrdId());
                    cancelTask(emergency.getLegacyServiceOrdId(), emergency.getCancelReason(), emergency.getCancelBy());
                }
                if(LongUtil.isNotEmpty(emergency.getLegacyDispatchOrdId())){
                    log.info("取消调度单: {}", emergency.getLegacyDispatchOrdId());
                    cancelDispatch(emergency.getLegacyDispatchOrdId(), emergency.getCancelReason(), emergency.getCancelBy());
                }
            }
            // 推送状态到旧系统
            boolean result = updateLegacyTaskStatus(emergency.getLegacyDispatchOrdId(), targetStatusCode);
@@ -149,6 +153,10 @@
            log.error("【新推旧】推送任务状态异常,任务ID: {}", taskId, e);
            return false;
        }
    }
    private void cancelDispatch(Long legacyDispatchOrdId, String cancelReason, String cancelReasonText) {
        dispatchOrdService.cancelDispatchOrd(legacyDispatchOrdId, Integer.parseInt(cancelReason), cancelReasonText);
    }
    
    /**
@@ -223,7 +231,7 @@
    private void cancelTask(Long serviceOrderId, String cancelReason, String cancelBy){
        // 取消任务,更新SQL Server中的ServiceOrder表
        try {
            if (serviceOrderId == null || serviceOrderId <= 0) {
            if (LongUtil.isEmpty(serviceOrderId)) {
                log.warn("ServiceOrderID为空,无法取消任务");
                return;
            }