|
|
|
@ -328,23 +328,23 @@ |
|
|
|
if (itemCode == undefined) { |
|
|
|
that.showScanMessage('所扫描的箱码【' + result.data.code + '】对应的物料【' + result.data.itemCode + '】不在任务中'); |
|
|
|
}else { |
|
|
|
//零件号相同、箱码相同 |
|
|
|
//ERP料号相同、箱码相同 |
|
|
|
var itemCode1 = that.details.find(r => { |
|
|
|
return r.itemCode === result.data.itemCode&& |
|
|
|
r.recommendPackingCode === result.data.code |
|
|
|
r.scaned === scaned |
|
|
|
}) |
|
|
|
//零件号相同、箱码不相同 |
|
|
|
//ERP料号相同、箱码不相同 |
|
|
|
if(itemCode1 == undefined){ |
|
|
|
var itemCode2 = that.details.find(r => { |
|
|
|
return r.itemCode === result.data.itemCode&& |
|
|
|
r.recommendLot === result.data.lot |
|
|
|
&&r.scaned === scaned |
|
|
|
}) |
|
|
|
//零件号相同、箱码不相同、批次相同 |
|
|
|
//ERP料号相同、箱码不相同、批次相同 |
|
|
|
if(itemCode2==undefined){ |
|
|
|
//零件号相同、箱码不相同、批次不相同 |
|
|
|
console.log("零件号相同、箱码不相同、批次不相同") |
|
|
|
//ERP料号相同、箱码不相同、批次不相同 |
|
|
|
console.log("ERP料号相同、箱码不相同、批次不相同") |
|
|
|
setTimeout(res => { |
|
|
|
showConfirmMsg(itemCode.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => { |
|
|
|
if (confirm) { |
|
|
|
@ -357,15 +357,15 @@ |
|
|
|
}, 100) |
|
|
|
|
|
|
|
}else { |
|
|
|
console.log("零件号相同、箱码不相同、批次相同") |
|
|
|
//零件号相同、箱码不相同、批次相同 |
|
|
|
console.log("ERP料号相同、箱码不相同、批次相同") |
|
|
|
//ERP料号相同、箱码不相同、批次相同 |
|
|
|
that.currentItem = itemCode2; |
|
|
|
that.afterScanPackLabel(result); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
}else { |
|
|
|
//零件号相同、箱码相同、批次相同 |
|
|
|
//ERP料号相同、箱码相同、批次相同 |
|
|
|
var itemCode3 = that.details.find(r => { |
|
|
|
return r.itemCode === result.data.itemCode&& |
|
|
|
r.recommendPackingCode === result.data.code&& |
|
|
|
@ -373,8 +373,8 @@ |
|
|
|
&&r.scaned === scaned |
|
|
|
}) |
|
|
|
if(itemCode3==undefined){ |
|
|
|
//零件号相同、箱码相同、批次不同 |
|
|
|
console.log("零件号相同、箱码相同、批次不同") |
|
|
|
//ERP料号相同、箱码相同、批次不同 |
|
|
|
console.log("ERP料号相同、箱码相同、批次不同") |
|
|
|
setTimeout(res => { |
|
|
|
showConfirmMsg(itemCode1.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => { |
|
|
|
if (confirm) { |
|
|
|
@ -387,8 +387,8 @@ |
|
|
|
}, 100) |
|
|
|
|
|
|
|
}else { |
|
|
|
console.log("零件号相同、箱码相同、批次相同") |
|
|
|
//零件号相同、箱码相同、批次相同 |
|
|
|
console.log("ERP料号相同、箱码相同、批次相同") |
|
|
|
//ERP料号相同、箱码相同、批次相同 |
|
|
|
that.currentItem = itemCode3; |
|
|
|
that.afterScanPackLabel(result); |
|
|
|
} |
|
|
|
@ -405,13 +405,13 @@ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// //没找到符合的箱码、零件号、箱码、批次都相等 |
|
|
|
// //没找到符合的箱码、ERP料号、箱码、批次都相等 |
|
|
|
// if (that.currentItem === undefined) { |
|
|
|
// var itemCode = that.details.find(res => { |
|
|
|
// return res.itemCode === result.data.itemCode && |
|
|
|
// res.scaned === scaned |
|
|
|
// }) |
|
|
|
// //零件号相等 |
|
|
|
// //ERP料号相等 |
|
|
|
// if (itemCode != undefined) { |
|
|
|
// var lot = that.details.find(res => { |
|
|
|
// return res.itemCode === result.data.itemCode && |
|
|
|
@ -438,7 +438,7 @@ |
|
|
|
|
|
|
|
// } |
|
|
|
// } else { |
|
|
|
// //零件号不相等 |
|
|
|
// //ERP料号不相等 |
|
|
|
// var lot = that.details.find(res => { |
|
|
|
// return res.recommendLot === result.data.lot && |
|
|
|
// res.scaned === scaned |
|
|
|
@ -448,7 +448,7 @@ |
|
|
|
// // 在该任务中未找到零件。 |
|
|
|
// that.showScanMessage('在该任务中未找到零件'); |
|
|
|
// } else { |
|
|
|
// //零件号不相等,批次不相等 |
|
|
|
// //ERP料号不相等,批次不相等 |
|
|
|
// that.showScanMessage('所扫描的物料不在任务中'); |
|
|
|
// } |
|
|
|
// } |
|
|
|
@ -491,7 +491,7 @@ |
|
|
|
issueBalances(params) |
|
|
|
.then(res => { |
|
|
|
if (res.totalCount === 0) { |
|
|
|
this.showScanMessage('按零件号【' + result.data.itemCode + '】箱码【' + result.data.code + '】批次【' + |
|
|
|
this.showScanMessage('按ERP料号【' + result.data.itemCode + '】箱码【' + result.data.code + '】批次【' + |
|
|
|
result |
|
|
|
.data.lot + '】在【原料库、半成品库】未查询到库存信息'); |
|
|
|
} else { |
|
|
|
|
