From da63376e81901e4076bc7f82a237c3848cdf71ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Fri, 6 Sep 2024 10:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/wms/produceScreen/index.vue           |  5 ++++-
 lms/nladmin-ui/src/views/wms/produceScreen/mork.js  | 12 ++++++++++--
 .../src/views/wms/produceScreen/produceScreen.js    | 13 +++++++++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
index a639059..8e2a87b 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
@@ -136,7 +136,7 @@
           >
             <template slot-scope="scope">
               <div class="select-wraper">
-                <el-select v-model="scope.row.order_code" placeholder="请选择">
+                <el-select v-model="scope.row.order_code" filterable placeholder="请选择">
                   <el-option
                     v-for="item in options2"
                     :key="item.order_code"
@@ -272,6 +272,9 @@ export default {
         crudProduceScreen.fabOrders({ device_code: this.popData.device_code }).then(res => {
           this.options2 = [...res]
         })
+        crudProduceScreen.getPointVehicle({ device_code: this.popData.device_code }).then(res => {
+          this.vcode = res.vehicle_code
+        })
         this.show = true
       } else if (type === 'BACK') {
         crudProduceScreen.fabOrders({ device_code: this.popData.device_code }).then(res => {
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/mork.js b/lms/nladmin-ui/src/views/wms/produceScreen/mork.js
index 4a02fca..ec482bf 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/mork.js
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/mork.js
@@ -95,7 +95,15 @@ export function sendVehicle(data) {
   })
 }
 
-// 11.用户登出
+// 11.获取点位的载具号
+export function getPointVehicle() {
+  const res = { vehicle_code: '123' }
+  return new Promise((resolve, reject) => {
+    resolve(res)
+  })
+}
+
+// 12.用户登出
 export function loginOut() {
   const res = {}
   return new Promise((resolve, reject) => {
@@ -104,5 +112,5 @@ export function loginOut() {
 }
 
 export default {
-  authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, loginOut
+  authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, getPointVehicle, loginOut
 }
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js b/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
index 7c1f57c..08a71e8 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
@@ -89,7 +89,16 @@ export function sendVehicle(data) {
   })
 }
 
-// 11.用户登出
+// 11.获取点位的载具号
+export function getPointVehicle(data) {
+  return request({
+    url: 'api/handheld/getPointVehicle',
+    method: 'post',
+    data
+  })
+}
+
+// 12.用户登出
 export function loginOut(data) {
   return request({
     url: 'mobile/auth/loginOut',
@@ -99,5 +108,5 @@ export function loginOut(data) {
 }
 
 export default {
-  authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, loginOut
+  authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, getPointVehicle, loginOut
 }