diff --git a/pages/zw/manual-returnmater.vue b/pages/zw/manual-returnmater.vue
index 82b691d..b9e4f3b 100644
--- a/pages/zw/manual-returnmater.vue
+++ b/pages/zw/manual-returnmater.vue
@@ -20,6 +20,54 @@
+
+
+ 料桶号
+
+
+
+
+
+
+
+ 物料编码
+
+
+
+
+
+
+
+ 物料名称
+
+
+
+
+
+
+
+ 供应商编码
+
+
+
+
+
+
+
+ 供应商名称
+
+
+
+
+
+
+
+ 批次
+
+
+
+
+
物料数量
@@ -42,7 +90,7 @@
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import NumberInput from '@/components/NumberInput.vue'
- import {getPdaCallEquipment, checkoutbillBackMaterial} from '@/utils/getData4.js'
+ import {getPdaCallEquipment, getMaterialSuppByDeviceCode, checkoutbillBackMaterial} from '@/utils/getData4.js'
export default {
components: {
NavBar,
@@ -56,6 +104,7 @@
index2: '',
options4: [{text:'退料', value:'1'}, {text:'退空桶', value: '2'}],
index4: '',
+ currentData: {},
qty: null,
disabled: false
};
@@ -80,6 +129,7 @@
selectChange2 (e) {
if (e) {
this.index2 = e
+ this._getMaterialSuppByDeviceCode()
}
},
selectChange4 (e) {
@@ -91,9 +141,9 @@
this.qty = null
this.disabled = false
},
- async _getMaterialSuppByVehicleCode () {
+ async _getMaterialSuppByDeviceCode () {
try {
- let res = await getMaterialSuppByVehicleCode(this.val2)
+ let res = await getMaterialSuppByDeviceCode(this.index2)
if (res.code === '200') {
this.currentData = res.data
} else {
@@ -160,7 +210,7 @@
let res = await checkoutbillBackMaterial(this.index2, this.index4, qty)
if (res.code === '200') {
uni.showToast({
- title: res.message,
+ title: '退料提交成功，分配的入库库位是：' + res.data,
icon: 'none'
})
this.clearUp()
diff --git a/utils/getData4.js b/utils/getData4.js
index 17715c4..a293b22 100644
--- a/utils/getData4.js
+++ b/utils/getData4.js
@@ -277,6 +277,12 @@ export const checkoutbillBackMaterial = (code, type, qty) => request({
url:'api/checkoutbill/BackMaterial',
data: {device_code: code, task_type: type, qty: qty}
})
+// PDA根据点位获取载具中物料信息
+export const getMaterialSuppByDeviceCode = (dcode) => request({
+ url:'api/pda/iosOut/getMaterialSuppByDeviceCode',
+ data: {device_code: dcode}
+})
+
// 获取库位(已弃用)
export const getPdaStruct = (scode) => request({
url:'api/pda/iosIn/getPdaStruct',