From 10c25d60a60dc8e397abfceb4f9eb326f1881936 Mon Sep 17 00:00:00 2001
From: lishuai <1793460677@qq.com>
Date: Wed, 31 Jan 2024 08:56:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E6=B5=8B=E8=AF=95=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AddressServiceImpl.java      |  3 +-
 .../device_driver/driver/OpcDeviceDriver.java |  2 +-
 .../return_good_manipulator.vue               | 38 ++++++++++++++++++-
 .../one_manipulator/trapped_manipulator.vue   | 38 ++++++++++++++++++-
 4 files changed, 76 insertions(+), 5 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java
index e6558cc23..ef0cc7e30 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java
@@ -132,10 +132,9 @@ public class AddressServiceImpl extends CommonServiceImpl<AddressMapper, Address
 
     @Override
     public void create(AddressDto dto) {
-        CommonFinalParam commonFinalParam = new CommonFinalParam();
         String Methods_code = dto.getMethods_code();
         AddressDto methodsDto = this.findByCode(Methods_code);
-        if (methodsDto != null &&  commonFinalParam.getDELETE().equals(methodsDto.getIs_delete()) && dto.getMethods_code().equals(methodsDto.getMethods_code())) {
+        if (methodsDto != null &&  CommonFinalParam.DELETE.equals(methodsDto.getIs_delete()) && dto.getMethods_code().equals(methodsDto.getMethods_code())) {
             throw new BadRequestException(LangProcess.msg("error_checkExist", methodsDto.getMethods_code()));
         }
         Long userId = Long.valueOf(SecurityUtils.getCurrentUserId());
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
index 04fbae0a4..fab615663 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
@@ -190,7 +190,7 @@ public interface OpcDeviceDriver extends DeviceDriver {
      * @return
      */
     default String getStringValue(String protocol) {
-        return (String) this.getOpcValueAccessor().getValue(this.getItem(protocol));
+        return String.valueOf(this.getOpcValueAccessor().getValue(this.getItem(protocol)));
     }
 
     /**
diff --git a/acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/return_good_manipulator.vue b/acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/return_good_manipulator.vue
index d553d9a90..eead42460 100644
--- a/acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/return_good_manipulator.vue
+++ b/acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/return_good_manipulator.vue
@@ -41,7 +41,43 @@
           </el-select>
         </el-col>
       </el-row>
-
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="取货点" prop="device_code">
+            <el-select
+              v-model="form.get_device_code"
+              multiple
+              filterable
+              reserve-keyword
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :label="item.device_name"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="放货点" prop="device_code" label-width="100px">
+            <el-select
+              v-model="form.put_device_code"
+              filterable
+              reserve-keyword
+              multiple
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_name"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-card>
 
     <el-card class="box-card" shadow="never">
diff --git a/acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/trapped_manipulator.vue b/acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/trapped_manipulator.vue
index b71606f9b..d9df1cab2 100644
--- a/acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/trapped_manipulator.vue
+++ b/acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/trapped_manipulator.vue
@@ -41,7 +41,43 @@
           </el-select>
         </el-col>
       </el-row>
-
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="取货点" prop="device_code">
+            <el-select
+              v-model="form.get_device_code"
+              multiple
+              filterable
+              reserve-keyword
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :label="item.device_name"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="放货点" prop="device_code" label-width="100px">
+            <el-select
+              v-model="form.put_device_code"
+              filterable
+              reserve-keyword
+              multiple
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_name"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-card>
 
     <el-card class="box-card" shadow="never">