From 618bd365829969f137a6f9e1e0653c66d63f563b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM> Date: Fri, 26 Sep 2025 13:54:03 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E8=B6=8A=E5=8D=97=E5=AF=8C=E4=BD=B3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../conveyor/belt_conveyor/ItemProtocol.java | 28 +++++++++---------- .../acs/ext/wms/data/CreateTaskRequest.java | 2 ++ .../wms/service/impl/WmsToAcsServiceImpl.java | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java index a6c0286..5a97125 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java @@ -183,25 +183,25 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB101.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB101.B2")); - list.add(new ItemDto(item_move, "光电信号", "DB101.B3")); - list.add(new ItemDto(item_type, "出入库信号", "DB101.B4")); - list.add(new ItemDto(item_actionRequest, "动作请求", "DB101.B5")); - list.add(new ItemDto(item_action, "动作类型", "DB101.B6")); - list.add(new ItemDto(item_error, "报警", "DB101.B58")); - list.add(new ItemDto(item_barcode, "载具号", "DB101.B60")); - list.add(new ItemDto(item_task, "任务号", "DB101.D68")); + list.add(new ItemDto(item_heartbeat, "心跳", "VW15000")); + list.add(new ItemDto(item_mode, "工作模式", "VW15028")); + list.add(new ItemDto(item_move, "光电信号", "VW15030")); + list.add(new ItemDto(item_action, "取放信号", "VW15032")); + list.add(new ItemDto(item_error, "报警", "VW15034")); + list.add(new ItemDto(item_type, "出入库信号", "VW15036")); + list.add(new ItemDto(item_actionRequest, "动作请求", "VW15038")); + list.add(new ItemDto(item_barcode, "载具号", "VW15040")); + list.add(new ItemDto(item_task, "任务号", "VD15024")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_target, "下发仓位号", "DB102.W2")); - list.add(new ItemDto(item_to_command, "下发命令", "DB102.W4")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB102.D1")); - list.add(new ItemDto(item_to_barcode, "下发托盘号", "DB102.B5")); - list.add(new ItemDto(item_to_taskNum, "下发出库任务数", "DB102.B6")); + list.add(new ItemDto(item_to_command, "下发命令", "VW16028")); + list.add(new ItemDto(item_to_target, "下发目标站", "VW16030")); + list.add(new ItemDto(item_to_barcode, "下发托盘号", "VW16032")); + list.add(new ItemDto(item_to_task, "下发任务号", "VD16024")); + list.add(new ItemDto(item_to_taskNum, "下发出库任务数", "VW16034")); return list; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java index 8883b3e..7c273de 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java @@ -94,6 +94,8 @@ public class CreateTaskRequest extends BaseRequest { */ private String ext_task_id; + private String ext_task_uuid; + diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 2469054..cb1bd72 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -90,7 +90,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String data = datas.get(i).toString(); CreateTaskRequest request = JsonUtl.format(data, CreateTaskRequest.class); String paper_array = request.getPaper_array(); - String ext_task_id = request.getExt_task_id(); + String ext_task_id = request.getExt_task_uuid(); String task_code = request.getTask_code(); String start_device_code = request.getStart_device_code(); String start_device_code2 = request.getStart_device_code2();