From 38cd317d8515945feccbd1b5bf5a55939efd2691 Mon Sep 17 00:00:00 2001
From: ls <1793460677@qq.com>
Date: Fri, 16 Jan 2026 09:02:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A3=85=E7=AE=B1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BoxPackageManipulatorDeviceDriver.java | 10 +++++-----
.../box_package_manipulator/ItemProtocol.java | 1 +
.../src/views/acs/history/instRecord/index.vue | 1 +
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java
index 1860f2729..1d4ef73f8 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java
@@ -553,11 +553,11 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
map12.put("value", interactionJsonDTO.getFrpModel());
list.add(map12);
}
-// if (ObjectUtil.isNotEmpty(interactionJsonDTO.getIsHave())) {
-// map13.put("code", "to_have_or_not");
-// map13.put("value", interactionJsonDTO.getIsHave());
-// list.add(map13);
-// }
+ if (ObjectUtil.isNotEmpty(interactionJsonDTO.getIsHave())) {
+ map13.put("code", "to_have_or_not");
+ map13.put("value", interactionJsonDTO.getIsHave());
+ list.add(map13);
+ }
}
this.writing(list);
luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder()
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/ItemProtocol.java
index 8411b7d1e..948b71ee7 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/ItemProtocol.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/ItemProtocol.java
@@ -260,6 +260,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_to_len, "下发子卷长度", "DB2.W16"));
list.add(new ItemDto(item_to_barcode, "下发木箱条码", "DB601.STRING1.50"));
list.add(new ItemDto(item_frpModel, "下发管芯尺寸", "DB601.STRING1.50"));
+ list.add(new ItemDto(item_to_have_or_not, "下发是否有子卷", "DB601.STRING1.50"));
return list;
}
}
diff --git a/acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue b/acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue
index d434d39ab..c39ee95e3 100644
--- a/acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue
@@ -173,6 +173,7 @@
+