From f5c8c3723bd8e019603b820a36adec54606ed691 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Sun, 10 Sep 2023 09:40:11 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=20=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LnshPalletizingManipulatorSiteDeviceDriver.java   |  1 +
 .../org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java   |  6 +++++-
 .../nl/modules/lucene/service/dto/LuceneLogDto.java   | 11 +++++++++++
 acs/nladmin-ui/src/views/acs/instruction/index.vue    |  2 +-
 acs/nladmin-ui/src/views/acs/task/index.vue           |  2 +-
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
index 9ed6e56..0206a02 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
@@ -839,6 +839,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
             request.setRequest_medthod_code(Thread.currentThread().getStackTrace()[1].getMethodName());
             request.setRequest_medthod_name(RequestMethodEnum.getName(Thread.currentThread().getStackTrace()[1].getMethodName()));
             request.setMaterial_code(material);
+            request.setQty(String.valueOf(encoder_qty));
             request.setWeight(String.valueOf(weight));
             request.setVehicle_code(String.valueOf(barcode));
             List<ApplyDeviceDto> listDto = new ArrayList<>();
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java
index 4e67f75..f7ba123 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java
@@ -161,7 +161,11 @@ public class DeviceOpcSynchronizeAutoRun extends AbstractAutoRunnable {
                     }
 
 //                    boolean allNull = itemStatus.entrySet().stream().map((map) -> {
-//                        return OpcUtl.getValue((Item)map.getKey(), (ItemState)map.getValue());
+//                        try {
+//                            return OpcUtl.getValue((Item)map.getKey(), (ItemState)map.getValue());
+//                        } catch (Exception e) {
+//                            throw new RuntimeException(e);
+//                        }
 //                    }).allMatch(Objects::isNull);
 //                    if (allNull) {
 //                        opcEntity.getItems().clear();
diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/dto/LuceneLogDto.java b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/dto/LuceneLogDto.java
index 7bae9fb..d10fbe4 100644
--- a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/dto/LuceneLogDto.java
+++ b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/dto/LuceneLogDto.java
@@ -92,4 +92,15 @@ public class LuceneLogDto {
                 + remark;
     }
 
+    public LuceneLogDto(final LuceneLogDto dto) {
+        super();
+        this.device_code = device_code;
+        this.method = method;
+
+        this.content = "设备 ["
+                + device_code
+                + "] - "
+                + remark;
+    }
+
 }
diff --git a/acs/nladmin-ui/src/views/acs/instruction/index.vue b/acs/nladmin-ui/src/views/acs/instruction/index.vue
index b364ff7..6385c31 100644
--- a/acs/nladmin-ui/src/views/acs/instruction/index.vue
+++ b/acs/nladmin-ui/src/views/acs/instruction/index.vue
@@ -132,7 +132,7 @@
 <!--        <el-table-column prop="next_parent_code" label="父终点点位" min-width="100" show-overflow-tooltip />-->
         <el-table-column prop="start_point_code2" label="起点2" min-width="100" show-overflow-tooltip />
         <el-table-column prop="next_point_code2" label="终点2" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="next_device_code" label="放货位" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="put_device_code" label="放货位" min-width="100" show-overflow-tooltip />
 
         <el-table-column prop="carno" label="车号" />
         <el-table-column prop="compound_inst" label="复合指令">
diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue
index a2baa61..293a9e5 100644
--- a/acs/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs/nladmin-ui/src/views/acs/task/index.vue
@@ -266,7 +266,7 @@
 <!--        <el-table-column prop="next_parent_code" label="父终点点位" min-width="100" show-overflow-tooltip />-->
         <el-table-column prop="start_point_code2" label="起点2" min-width="100" show-overflow-tooltip />
         <el-table-column prop="next_point_code2" label="终点2" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="next_device_code" label="放货位" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="put_device_code" label="放货位" min-width="100" show-overflow-tooltip />
 
         <el-table-column prop="compound_task" label="复合任务">
           <template slot-scope="scope">