|
|
@ -356,23 +356,13 @@ |
|
|
|
}, |
|
|
|
async getScanResult(result) { |
|
|
|
if(!result.label.requestNumber ){ |
|
|
|
this.showMessage("该标签未关联到收货申请") |
|
|
|
this.showMessage(`该品番对应的申请 【${ result.label.requestNumber}】下未查询到任务`) |
|
|
|
return; |
|
|
|
} |
|
|
|
uni.showLoading({ |
|
|
|
title: "加载中....", |
|
|
|
mask: true |
|
|
|
}); |
|
|
|
const res1 = await getNumberForStatus(result.label.requestNumber) |
|
|
|
if(res1.data == 5){ |
|
|
|
uni.hideLoading() |
|
|
|
this.showMessage(`该品番对应的申请【${result.label.requestNumber}】已关闭`) |
|
|
|
return |
|
|
|
}else if(res1.data == 8){ |
|
|
|
uni.hideLoading() |
|
|
|
this.showMessage(`该品番对应的生产任务【${result.label.requestNumber}】已经完成`) |
|
|
|
return |
|
|
|
} |
|
|
|
try { |
|
|
|
this.scanMessage = "" |
|
|
|
var filters = [ |
|
|
@ -404,18 +394,29 @@ |
|
|
|
{ |
|
|
|
column: "status", |
|
|
|
action: "in", |
|
|
|
value: '1,2', |
|
|
|
value: '1,2,3,4', |
|
|
|
} |
|
|
|
] |
|
|
|
getProductReceiptJobList({ |
|
|
|
filters: filters, |
|
|
|
pageNo: 1, |
|
|
|
pageSize: 100, |
|
|
|
}).then(res => { |
|
|
|
}).then(async res => { |
|
|
|
uni.hideLoading() |
|
|
|
this.scanMessage = result.scanMessage |
|
|
|
let resultList = res.data.list; |
|
|
|
if (resultList.length > 0) { |
|
|
|
|
|
|
|
const res1 = await getNumberForStatus(result.label.requestNumber) |
|
|
|
if(resultList[0].status==4||res1.data == 5){ |
|
|
|
uni.hideLoading() |
|
|
|
this.showMessage(`该品番对应的申请【${result.label.requestNumber}】下的任务已关闭`) |
|
|
|
return |
|
|
|
}else if(res1.data == 8){ |
|
|
|
uni.hideLoading() |
|
|
|
this.showMessage(`该品番对应的申请【${result.label.requestNumber}】下的任务已完成`) |
|
|
|
return |
|
|
|
} |
|
|
|
resultList.forEach(item => { |
|
|
|
item.title = item.number; |
|
|
|
item.selected = false |
|
|
@ -432,7 +433,7 @@ |
|
|
|
this.selectItem(list[0]) |
|
|
|
} |
|
|
|
} else { |
|
|
|
this.showMessage("该标签未关联到收货申请\n" + "扫描[" + result.scanMessage + "]") |
|
|
|
this.showMessage(`该品番对应的申请 【${ result.label.requestNumber}】下未查询到任务`) |
|
|
|
} |
|
|
|
}).catch(error => { |
|
|
|
uni.hideLoading() |
|
|
|