From 39fa261b32d98fc003024841269ad81638d8fa0a Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Wed, 14 Dec 2022 13:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hongfeng/hf_station/HfStationDeviceDriver.java   |  6 +++++-
 .../acs/device/driver/hongfeng/hf_manipulator.vue    | 12 +++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java
index 45736a4..01e205d 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java
@@ -538,8 +538,12 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De
             if (inspect_in_stocck.toString().equals("true")) {
                 json.put("is_first", "true");
             }
+            String prx = "00";
+            if (barcode < 10){
+                prx = "000";
+            }
             json.put("device_code", device_code);
-            json.put("barcode", barcode);
+            json.put("barcode", prx + barcode);
             HttpResponse result = acsToWmsService.updateBarcode(json);
             if (ObjectUtil.isNotEmpty(result)) {
                 if (result.getStatus() == 200) {
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/hongfeng/hf_manipulator.vue b/acs/nladmin-ui/src/views/acs/device/driver/hongfeng/hf_manipulator.vue
index be2b6fc..af894b0 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/hongfeng/hf_manipulator.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/hongfeng/hf_manipulator.vue
@@ -97,9 +97,9 @@
 
         <el-row>
           <el-col :span="8">
-            <el-form-item label="关联设备" prop="device_code">
+            <el-form-item label="取货位" prop="device_code">
               <el-select
-                v-model="form.link_device_code"
+                v-model="form.link_get_device_code"
                 filterable
                 multiple
                 placeholder="请选择"
@@ -114,11 +114,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="关联三色灯" prop="device_code" label-width="100px">
+            <el-form-item label="放货位" prop="device_code" label-width="100px">
               <el-select
-                v-model="form.link_three_lamp"
+                v-model="form.link_put_device_code"
                 filterable
                 clearable
+                multiple
                 placeholder="请选择"
               >
                 <el-option
@@ -297,7 +298,8 @@ export default {
         manual_create_task: true,
         is_pickup: true,
         is_release: true,
-        link_device_code: []
+        link_put_device_code: [],
+        link_get_device_code: []
       },
       rules: {}
     }