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 @@
提示
@@ -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%);