From 5ddfe64d93dc3275d499540f703e96bad1d5cc2d 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: Mon, 23 Sep 2024 14:03:33 +0800
Subject: [PATCH] =?UTF-8?q?=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          | 14 ++++++++++++--
 lms/nladmin-ui/src/views/wms/produceScreen/mork.js |  2 +-
 .../src/views/wms/produceScreen/setup.vue          |  7 -------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
index 794fd83..17d8e69 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
@@ -275,7 +275,15 @@ export default {
         this.show = true
         this.emptyObj.device_code = e.name
       } else if (type === 'SCANER') {
-        crudProduceScreen.fabOrders({ device_code: this.screenData.in_code }).then(res => {
+        const arr = []
+        if (JSON.stringify(this.screenData) !== '{}') {
+          this.screenData.region_points.map(el => {
+            if (el.type === '0') {
+              arr.push(el.device_code)
+            }
+          })
+        }
+        crudProduceScreen.fabOrders({ device_code: arr }).then(res => {
           this.options2 = [...res]
         })
         crudProduceScreen.getPointVehicle({ device_code: this.popData.device_code }).then(res => {
@@ -284,7 +292,9 @@ export default {
         this.popList.push({ order_code: '', material_qty: '' })
         this.show = true
       } else if (type === 'BACK') {
-        crudProduceScreen.fabOrders({ device_code: this.popData.device_code }).then(res => {
+        const arr = []
+        arr.push(this.popData.device_code)
+        crudProduceScreen.fabOrders({ device_code: arr }).then(res => {
           this.popList = [...res]
           this.popList.map(el => {
             this.$set(el, 'material_qty', 0)
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/mork.js b/lms/nladmin-ui/src/views/wms/produceScreen/mork.js
index e47304b..8cc73d5 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/mork.js
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/mork.js
@@ -21,7 +21,7 @@ export function getUserOrDevice() {
 
 // 3.登录跳转
 export function deviceInLogin() {
-  const res = { device_name: 'TP5000冲床加工', device_code: '111-02', region_points: [{ name: 'OUT1', type: '1', device_code: '1234' }, { name: 'OUT2', type: '1', device_code: 'RGZWDJW01' }, { name: 'OUT3', type: '1', device_code: '1234' }, { name: 'OUT4', type: '1', device_code: '1234' }, { name: '叫料', type: '0', device_code: '1234' }, { name: '叫料', type: '0', device_code: '1234' }] }
+  const res = { device_name: 'TP5000冲床加工', device_code: '111-02', region_points: [{ name: 'OUT1', type: '1', device_code: '1234' }, { name: 'OUT2', type: '1', device_code: 'RGZWDJW01' }, { name: 'OUT3', type: '1', device_code: '1234' }, { name: 'OUT4', type: '1', device_code: '1234' }, { name: '叫料', type: '0', device_code: '1' }, { name: '叫料', type: '0', device_code: '2' }] }
   return new Promise((resolve, reject) => {
     resolve(res)
   })
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue b/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue
index 08bc6b2..e7a6623 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue
@@ -92,13 +92,6 @@ export default {
       }
       crudProduceScreen.deviceInLogin({ device_code: this.value }).then(res => {
         res.username = this.username
-        let in_code = ''
-        res.region_points.map(el => {
-          if (el.type === '0') {
-            in_code = el.device_code
-          }
-        })
-        res.in_code = in_code
         this.$store.dispatch('addScreenData', JSON.stringify(res))
         this.show = false
         this.disabled = false