From 28c9ce8921d3e42a03f08f423cf33d374069e43e Mon Sep 17 00:00:00 2001 From: lsymicc Date: Thu, 11 Jun 2026 11:13:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=BF=E5=88=A9=E6=80=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java | 2 +- ruoyi-admin/src/main/resources/logback.xml | 1 + ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java index 99d7cf9..147eed3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java @@ -123,7 +123,7 @@ public class DdjThread implements Runnable { mydoJobService.updateMydoJob(mydoJob); //回传完成信号 - 方法在存储过程【proc_mydojob_finish】中 ddjTaskFinish(rwh, ddj.getId()); - log.info("【堆垛机入库】堆垛机编号：" + ddj.getId() + " 执行完成，任务结束，任务号："+ddj.getRwh()); + log.info("【堆垛机执行】堆垛机编号：" + ddj.getId() + " 执行完成，任务结束，任务号："+ddj.getRwh()); } } diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index ba693ff..2f3f460 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -111,6 +111,7 @@ + diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index 58e6adb..5b25298 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -44,7 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" job_id,status,task_no,roadway_id,cargo_space_id,target_roadway_id,target_cargo_space_id,priority,execution_phase,in_or_out,create_time,start_time,finish_time,entrance_id,exit_id,warehouse_id,fault_flag,flag,tray_code,tray_size,wms_task_no,'mydo_job_wcs' AS source_table FROM mydo_job_wcs UNION ALL - SELECTjob_id,status,task_no,roadway_id,cargo_space_id,target_roadway_id,target_cargo_space_id,priority,execution_phase,in_or_out,create_time,start_time,finish_time,entrance_id,exit_id,warehouse_id,fault_flag,flag,tray_code,tray_size,wms_task_no,'mydo_job_wcs_finish' AS source_table + SELECT + job_id,status,task_no,roadway_id,cargo_space_id,target_roadway_id,target_cargo_space_id,priority,execution_phase,in_or_out,create_time,start_time,finish_time,entrance_id,exit_id,warehouse_id,fault_flag,flag,tray_code,tray_size,wms_task_no,'mydo_job_wcs_finish' AS source_table FROM mydo_job_wcs_finish ) AS combined_jobs