From 89e8e6ed2c75a492b0b2d1d7de0e3661a72fc191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?=
 <zhangjiangwei2000@outlook.com>
Date: Tue, 7 Feb 2023 10:17:58 +0800
Subject: [PATCH] =?UTF-8?q?lms=E6=96=B0=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SiemensConveyorDeviceDriver.java                 |  6 +++---
 .../src/views/acs/device/driver/siemens_conveyor.vue | 12 ++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
index c5ac3a170..05d274990 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
@@ -168,9 +168,9 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                 if(move == 0 && last_move == 1 ){
                     last_vehicle_code = vehicle_code;
                     last_inst_message = inst_message;
-                }
-                if (move == 0 && last_move == 1 && "06".equals(this.device.getRegion())) {
-                    this.requiresShipDeviceUpdate = false;
+                    if ("true".equals(this.device.getExtraValue().get("ship_device_update"))) {
+                        this.requiresShipDeviceUpdate = false;
+                    }
                 }
                 logServer.deviceItemValue(this.device_code, "move", String.valueOf(move));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move);
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue b/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue
index 0020634e4..7ecfb7dfb 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue
@@ -136,6 +136,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="是否需要反馈光电" label-width="150px">
+              <el-switch v-model="form.ship_device_update" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </el-card>
 
@@ -306,7 +313,8 @@ export default {
         manual_create_task: true,
         is_pickup: true,
         is_release: true,
-        link_device_code: []
+        link_device_code: [],
+        ship_device_update: true
       },
       rules: {}
     }
@@ -459,7 +467,7 @@ export default {
     test_read1() {
       testRead(this.data1, this.opc_id).then(data => {
         this.data1 = data
-        console.log(this.data1 )
+        console.log(this.data1)
         this.notify('操作成功!', 'success')
       }).catch(err => {
         console.log(err.response.data.message)