From f12bbce1e4571827540d90ef24ee742d18c7db67 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Wed, 7 Dec 2022 10:26:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hongfeng/hf_manipulator/ItemProtocol.java |  2 +-
 .../hongfeng/hf_station/ItemProtocol.java     | 40 +++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/ItemProtocol.java
index 30ec3ac..b3e856b 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/ItemProtocol.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/ItemProtocol.java
@@ -117,7 +117,7 @@ public class ItemProtocol {
         list.add(new ItemDto(item_to_onset, "下发起始站", "DB3.W2"));
         list.add(new ItemDto(item_to_target, "下发目标站", "DB3.W4"));
         list.add(new ItemDto(item_to_task, "下发任务号", "DB3.D6"));
-        list.add(new ItemDto(item_to_barcode, "下发条码", "DB3.W6"));
+        list.add(new ItemDto(item_to_barcode, "下发条码", "DB3.D10"));
         return list;
     }
 
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/ItemProtocol.java
index e975951..abe0ac4 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/ItemProtocol.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/ItemProtocol.java
@@ -146,31 +146,31 @@ public class ItemProtocol {
 
     public static List<ItemDto> getReadableItemDtos() {
         ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_heartbeat, "心跳", "DB2.B0"));
-        list.add(new ItemDto(item_mode, "工作模式", "DB2.B1"));
-        list.add(new ItemDto(item_move, "光电信号", "DB2.B2"));
-        list.add(new ItemDto(item_action, "取放信号", "DB2.B3"));
-        list.add(new ItemDto(item_ioaction, "进出信号", "DB2.B4"));
-        list.add(new ItemDto(item_error, "报警信号", "DB2.B5"));
-        list.add(new ItemDto(item_task, "任务号", "DB2.D6"));
-        list.add(new ItemDto(item_status, "设备状态", "DB2.B10"));
-        list.add(new ItemDto(item_current_order_num, "当前工单数量", "DB2.D12"));
-        list.add(new ItemDto(item_order, "工单号", "DB2.S16"));
-        list.add(new ItemDto(item_weight, "重量", "DB2.D272"));
-        list.add(new ItemDto(item_barcode, "条码", "DB2.D276"));
-        list.add(new ItemDto(item_material_code, "产品编号", "DB2.S278"));
+        list.add(new ItemDto(item_heartbeat, "心跳", "DB101.B0"));
+        list.add(new ItemDto(item_mode, "工作模式", "DB101.B1"));
+        list.add(new ItemDto(item_move, "光电信号", "DB101.B2"));
+        list.add(new ItemDto(item_action, "取放信号", "DB101.B3"));
+        list.add(new ItemDto(item_ioaction, "进出信号", "DB101.B4"));
+        list.add(new ItemDto(item_error, "报警信号", "DB101.B5"));
+        list.add(new ItemDto(item_task, "任务号", "DB101.D6"));
+        list.add(new ItemDto(item_status, "设备状态", "DB101.B10"));
+        list.add(new ItemDto(item_current_order_num, "当前工单数量", "DB101.D12"));
+        list.add(new ItemDto(item_order, "工单号", "DB101.S16"));
+        list.add(new ItemDto(item_weight, "重量", "DB101.D272"));
+        list.add(new ItemDto(item_barcode, "条码", "DB101.D276"));
+        list.add(new ItemDto(item_material_code, "产品编号", "DB101.S280"));
         return list;
     }
 
     public static List<ItemDto> getWriteableItemDtos() {
         ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_to_command, "作业命令", "DB3.W0"));
-        list.add(new ItemDto(item_to_target, "目标站", "DB3.W2"));
-        list.add(new ItemDto(item_to_task, "任务号", "DB3.D4"));
-        list.add(new ItemDto(item_to_error, "故障代码", "DB3.B8"));
-        list.add(new ItemDto(item_to_order_num, "工单数量", "DB3.D10"));
-        list.add(new ItemDto(item_to_product_number, "产品编号", "DB3.S14"));
-        list.add(new ItemDto(item_to_order, "工单号", "DB3.S270"));
+        list.add(new ItemDto(item_to_command, "作业命令", "DB100.W0"));
+        list.add(new ItemDto(item_to_target, "目标站", "DB100.W2"));
+        list.add(new ItemDto(item_to_task, "任务号", "DB100.D4"));
+        list.add(new ItemDto(item_to_error, "故障代码", "DB100.B8"));
+        list.add(new ItemDto(item_to_order_num, "工单数量", "DB100.D10"));
+        list.add(new ItemDto(item_to_product_number, "产品编号", "DB100.S14"));
+        list.add(new ItemDto(item_to_order, "工单号", "DB100.S270"));
         return list;
     }