From 42dd62d4a38d71526ddcdc01d2feea922378cec8 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 6 Mar 2025 15:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=93=E5=AD=98=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/wms/produceScreen/index.vue     | 35 +++++++++++++++++++
 .../src/views/wms/produceScreen/mork.js       | 19 +++++++++-
 .../views/wms/produceScreen/produceScreen.js  | 11 +++++-
 .../src/views/wms/produceScreen/style.scss    |  2 +-
 4 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
index 41a38b1..7726960 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
@@ -11,6 +11,7 @@
         <p class="point_value">{{ e.device_code }}</p>
         <div v-if="e.type === '1'" class="button" @click="showPop('CONTAINER', e)">呼叫空框</div>
         <div v-if="e.type === '1'" class="button" @click="showPop('SCANER', e)">完成入库</div>
+        <div v-if="e.type === '0'" class="button" @click="showPop('CACHE', e)">缓存物料</div>
         <div v-if="e.type === '0'" class="button" @click="showPop('PALLET', e)">当前托盘</div>
         <div v-if="e.type === '0'" class="button" @click="showPop('BACK', e)">回库</div>
       </div>
@@ -267,6 +268,34 @@
         </el-col>
       </el-row>
     </div>
+    <div v-show="type === 'CACHE'" class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
+      <el-row :gutter="20" class="filter-wraper">
+        <el-col :span="2" class="p-label">载具号</el-col>
+        <el-col :span="8" class="select-wraper">
+          <input v-model="vcode" type="text" class="set-input" disabled>
+        </el-col>
+      </el-row>
+      <div class="pop-grid pop-grid_1">
+        <el-table
+          :data="popList"
+          height="100%"
+        >
+          <el-table-column
+            prop="order_code"
+            label="订单号"
+          />
+          <el-table-column
+            prop="material_id"
+            label="物料号"
+          />
+        </el-table>
+      </div>
+      <el-row type="flex" justify="space-around">
+        <el-col :span="4">
+          <button class="login_button login_button_dis" @click="show = false">返回</button>
+        </el-col>
+      </el-row>
+    </div>
     <div v-show="show" class="modal" />
     <div v-show="alertShow" class="pop-wraper pop-wraper-1" :class="{'popshow': alertShow, 'pophide': !alertShow}" style="z-index: 22;">
       <div class="pop-h1">提示</div>
@@ -384,6 +413,12 @@ export default {
           this.popList = [...res.materialList]
         })
         this.show = true
+      } else if (type === 'CACHE') {
+        crudProduceScreen.selectCacheTask({ deviceCode: this.popData.device_code }).then(res => {
+          this.popList = [...res.materialList]
+          this.vcode = res.vehicleCode
+          this.show = true
+        })
       }
     },
     handleCurrentChange(val) {
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/mork.js b/lms/nladmin-ui/src/views/wms/produceScreen/mork.js
index 4b6945f..447b916 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/mork.js
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/mork.js
@@ -132,6 +132,23 @@ export function selectMaterialAndJpg() {
   })
 }
 
+// 14. 缓存物料
+export function selectCacheTask() {
+  const res = {
+    materialList: [{
+      order_code: '800035707683',
+      material_id: 'A7E0019000630_01'
+    }, {
+      order_code: '800035707681',
+      material_id: 'A7E0019000630_02'
+    }],
+    vehicleCode: 'p01a00038'
+  }
+  return new Promise((resolve, reject) => {
+    resolve(res)
+  })
+}
+
 export default {
-  authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, getPointVehicle, loginOut, selectMaterialAndJpg
+  authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, getPointVehicle, loginOut, selectMaterialAndJpg, selectCacheTask
 }
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js b/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
index e969a60..f9e5609 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
@@ -115,6 +115,15 @@ export function selectMaterialAndJpg(code) {
   })
 }
 
+// 14. 缓存物料
+export function selectCacheTask(data) {
+  return request({
+    url: 'api/schBaseTask/selectCacheTask',
+    method: 'post',
+    data
+  })
+}
+
 export default {
-  authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, getPointVehicle, loginOut, selectMaterialAndJpg
+  authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, getPointVehicle, loginOut, selectMaterialAndJpg, selectCacheTask
 }
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/style.scss b/lms/nladmin-ui/src/views/wms/produceScreen/style.scss
index 1cf5d13..a9e03d5 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/style.scss
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/style.scss
@@ -266,7 +266,7 @@
   background-image: linear-gradient(0deg, #277ddc, #213bc6);
   width: 80%;
   max-width: 150px;
-  margin: 30px auto;
+  margin: 20px auto;
   border-radius: 10px;
   border: 1px solid #2965e2;
   box-shadow: 0px 4px 4px rgba(18, 15, 15, 60%);