From f973f705227536b71ff05b2bcef2018722e0300b Mon Sep 17 00:00:00 2001 From: liejiu946 Date: Mon, 17 Feb 2025 13:16:58 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=8A=B6=E6=80=81=204:=E7=AD=89=E5=BE=85=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=B8=AD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java | 3 +++ .../java/org/nl/acs/task/service/impl/TaskServiceImpl.java | 2 +- .../src/main/java/org/nl/quartz/task/AutoCreateInst.java | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index 4307305..4c7d87e 100644 --- a/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -160,6 +160,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic inst.setCarno(String.valueOf(carno)); instructionService.update(inst); transportOrder = inst.getTask_code(); + //车辆分配任务时 状态为1 执行中 + task.setTask_status("1"); + taskserver.update(task); logServer.deviceExecuteLog(this.device_code, "", "", "agvphase：" + "反馈:" + data); //车辆状态归零 agv_status = 0; diff --git a/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 5fa358d..f357ef2 100644 --- a/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -861,7 +861,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme // } // } removeByCodeFromCache(entity.getTask_code()); - if (StrUtil.equals(dto.getTask_status(), "0") || StrUtil.equals(dto.getTask_status(), "1")) { + if (StrUtil.equals(dto.getTask_status(), "0") || StrUtil.equals(dto.getTask_status(), "1") || StrUtil.equals(dto.getTask_status(), "4")) { tasks.add(dto); } // 判断是否为WMS下发的任务，如果是反馈任务状态给WMS diff --git a/nlsso-server/src/main/java/org/nl/quartz/task/AutoCreateInst.java b/nlsso-server/src/main/java/org/nl/quartz/task/AutoCreateInst.java index 2190e4a..71cf2fa 100644 --- a/nlsso-server/src/main/java/org/nl/quartz/task/AutoCreateInst.java +++ b/nlsso-server/src/main/java/org/nl/quartz/task/AutoCreateInst.java @@ -198,8 +198,8 @@ public class AutoCreateInst { continue; } log.info("任务 [" + taskcode + "] 指令成功生成！"); - //创建指令后修改任务状态 - acsTask.setTask_status("1"); + //创建指令后修改任务状态,车辆还未分配任务时 状态为4 等待执行中 + acsTask.setTask_status("4"); taskserver.update(acsTask); }