From e0808d770c3584e66bfda68b60211ab90869e904 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Wed, 13 Dec 2023 15:48:41 +0800 Subject: [PATCH] =?UTF-8?q?rev=20=E6=9B=B4=E6=96=B0=E5=A5=97=E7=AE=A1?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../casing_station/CasingStationConveyorDeviceDriver.java | 2 +- .../device_driver/basedriver/casing_station/ItemProtocol.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java index 7887b995a..c66092802 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java @@ -241,7 +241,7 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i case 3: log.info("运行中"); break; - case 4: + case 5: if (move == 1 && !requireSucess && task > 0 && task1 > 0) { //申请套管校验 // apply_for_casing_inspection(material1, material2); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/ItemProtocol.java index be18b5821..143c66e17 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/ItemProtocol.java @@ -117,11 +117,11 @@ public class ItemProtocol { list.add(new ItemDto(item_move, "光电信号", "DB101.W4")); list.add(new ItemDto(item_carrier_direction, "托盘方向", "DB101.W6")); list.add(new ItemDto(item_error, "报警", "DB101.W8")); - list.add(new ItemDto(item_task, "任务号1", "DB101.DW116")); - list.add(new ItemDto(item_task1, "任务号2", "DB101.DW118")); list.add(new ItemDto(item_material1, "物料1", "DB101.STRING10.50")); list.add(new ItemDto(item_material2, "物料2", "DB101.STRING62.50")); list.add(new ItemDto(item_qty, "数量", "DB101.W114")); + list.add(new ItemDto(item_task, "纸管库任务号", "DB101.D116")); + list.add(new ItemDto(item_task1, "行架任务号", "DB101.D120")); return list; }