From 83b381fa4655b2d45ba89332a79258568bf8ce18 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 13 Jan 2025 12:54:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/wms/produceScreen/index.vue     | 12 +++++-----
 .../src/views/wms/produceScreen/mork.js       | 22 ++++++++++++++++++-
 .../views/wms/produceScreen/produceScreen.js  | 10 ++++++++-
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
index 1152e9b..deae538 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
@@ -219,7 +219,7 @@
               label="订单号"
             />
             <el-table-column
-              prop="material_code"
+              prop="material_id"
               label="零件号"
             />
             <el-table-column
@@ -253,7 +253,7 @@
             @current-change="handleCurrentChange1"
           >
             <el-table-column
-              prop="vehicle_path"
+              prop="material_id"
               label="图纸查看"
             />
           </el-table>
@@ -380,10 +380,8 @@ export default {
           this.show = true
         })
       } else if (type === 'PALLET') {
-        crudProduceScreen.getPointVehicle({ device_code: this.popData.device_code }).then(res => {
-          crudProduceScreen.fabMaterial({ vehicle_code: res }).then(res => {
-            this.popList = [...res]
-          })
+        crudProduceScreen.selectMaterialAndJpg(this.popData.device_code).then(res => {
+          this.popList = [...res.materialList]
         })
         this.show = true
       }
@@ -467,7 +465,7 @@ export default {
     },
     handleCurrentChange1(val) {
       if (val) {
-        this.imgSrc = val.vehicle_path
+        this.imgSrc = val.material_path
       }
     }
   }
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/mork.js b/lms/nladmin-ui/src/views/wms/produceScreen/mork.js
index 0b9ef91..190f0f1 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/mork.js
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/mork.js
@@ -112,6 +112,26 @@ export function loginOut() {
   })
 }
 
+// 13. 当前托盘
+export function selectMaterialAndJpg() {
+  const res = {
+    vehiclePath: null,
+    materialList: [
+      {
+        material_path: null,
+        material_id: 'A7E0019014060_01'
+      },
+      {
+        material_path: null,
+        material_id: 'A7E0019011140_00'
+      }
+    ]
+  }
+  return new Promise((resolve, reject) => {
+    resolve(res)
+  })
+}
+
 export default {
-  authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, getPointVehicle, loginOut
+  authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, getPointVehicle, loginOut, selectMaterialAndJpg
 }
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js b/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
index 08a71e8..e864d31 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
@@ -107,6 +107,14 @@ export function loginOut(data) {
   })
 }
 
+// 13. 当前托盘
+export function selectMaterialAndJpg(code) {
+  return request({
+    url: 'api/handheld/selectMaterialAndJpg?pointCode=',
+    method: 'get'
+  })
+}
+
 export default {
-  authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, getPointVehicle, loginOut
+  authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, getPointVehicle, loginOut, selectMaterialAndJpg
 }