From 9935c7c458895c6e0d5e236908884d5bb3311c21 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 28 Jul 2025 15:55:44 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/auto/run/OneNDCSocketConnectionAutoRun.java | 4 ++-- .../autodoor/standard_autodoor/ItemProtocol.java | 11 ++++------- .../service/impl/InstructionServiceImpl.java | 4 +++- .../src/main/resources/config/application-dev.yml | 2 +- .../src/main/resources/config/application-prod.yml | 2 +- .../src/main/resources/config/application.yml | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java index 14988ca..d728390 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java @@ -224,10 +224,10 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { log.info("agv车号为"+carno+",进入自动门:"+device_code+"区域，请求开门中"); // 状态不为0且门开到位 - if (driver.getMode() != 0) { + if (driver.getMode() != 0 && driver.getAction() == 1) { flag = true; } else { - String message = "自动门未联机，无法开门。"; + String message = "自动门未联机或未开到位，无法开门。"; driver.setMessage(message); logServer.deviceExecuteLog(device_code, "", "", message); log.error("agv车号为"+carno+",进入自动门区域:"+"自动门:"+device_code+"未联机，无法开门。"); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java index 719a568..3afdea3 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java @@ -61,18 +61,15 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB600.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_state, "工作状态", "DB600.B2")); - list.add(new ItemDto(item_action, "动作信号", "DB600.B3")); - list.add(new ItemDto(item_error, "报警信号", "DB600.B4")); + list.add(new ItemDto(item_heartbeat, "心跳", "VB100")); + list.add(new ItemDto(item_mode, "工作模式", "VB101", Boolean.valueOf(true))); + list.add(new ItemDto(item_action, "动作信号", "VB102")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_state, "下发状态", "DB601.W3", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_command, "作业命令", "VW200", Boolean.valueOf(true))); return list; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index f43bad0..3bc0a79 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -948,7 +948,9 @@ public class InstructionServiceImpl extends CommonServiceImpl