|
|
@ -201,8 +201,7 @@ |
|
|
|
getManagementPrecisions(itemCodes, that.fromLocationCode, res => { |
|
|
|
if (res.success) { |
|
|
|
this.managementList = res.list; |
|
|
|
this.managementType = this.managementList.some(item => item.ManagementPrecision == |
|
|
|
'BY_BATCH') ? 'BY_BATCH' : '' |
|
|
|
this.managementType = this.managementList&&this.managementList[0]&&this.managementList[0].ManagementPrecision?this.managementList[0].ManagementPrecision:'BY_PACKAGING' |
|
|
|
} |
|
|
|
}) |
|
|
|
} else { |
|
|
@ -248,6 +247,14 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
getScanResult(result) { |
|
|
|
if(this.managementType == 'BY_BATCH' ||this.managementType == "BY_QUANTITY" ){ |
|
|
|
this.getScanResultAfterBatch(result) |
|
|
|
}else{ |
|
|
|
this.getScanResultAfter(result) |
|
|
|
} |
|
|
|
|
|
|
|
}, |
|
|
|
getScanResultAfter(result){ |
|
|
|
try { |
|
|
|
var packingNumber = result.label.packingNumber; |
|
|
|
var batch = result.label.batch; |
|
|
@ -266,7 +273,7 @@ |
|
|
|
r.batch == batch && |
|
|
|
r.fromLocationCode == result.fromLocationCode && |
|
|
|
r.inventoryStatus == result.balance.inventoryStatus |
|
|
|
|
|
|
|
|
|
|
|
}) |
|
|
|
if (itemDetail) { |
|
|
|
// 箱码、批次、库位、状态一致 |
|
|
@ -292,7 +299,7 @@ |
|
|
|
r.batch == batch && |
|
|
|
r.fromLocationCode == result.fromLocationCode |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
if (itemDetail) { |
|
|
|
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); |
|
|
|
//箱码、批次、库位相等,状态不相等 |
|
|
@ -324,16 +331,100 @@ |
|
|
|
this.showErrorMessage("箱码【" + packingNumber + "】\n批次【" + batch + "】\n库位【" + result |
|
|
|
.fromLocationCode + "】\n状态【" + balanceStatus + "】\n不在任务列表中") |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
this.scanPopupGetFocus(); |
|
|
|
} catch (e) { |
|
|
|
this.showErrorMessage(e.message); |
|
|
|
} |
|
|
|
}, |
|
|
|
getScanResultAfterBatch(result){ |
|
|
|
try { |
|
|
|
var packingNumber = result.label.packingNumber; |
|
|
|
var batch = result.label.batch; |
|
|
|
var qty = result.label.qty; |
|
|
|
var itemCode = result.label.itemCode; |
|
|
|
var itemDetail = undefined; |
|
|
|
var detail = this.detailSource.find(r => r.itemCode == itemCode); |
|
|
|
if (detail == undefined) { |
|
|
|
this.showMessage("物料号【" + itemCode + "】不在列表中") |
|
|
|
} else { |
|
|
|
detail.scaned = true |
|
|
|
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); |
|
|
|
//箱码、批次、库位、状态 都相等 |
|
|
|
itemDetail = detail.subList.find(r => { |
|
|
|
return |
|
|
|
r.batch == batch && |
|
|
|
r.fromLocationCode == result.fromLocationCode && |
|
|
|
r.inventoryStatus == result.balance.inventoryStatus |
|
|
|
|
|
|
|
}) |
|
|
|
if (itemDetail) { |
|
|
|
// 箱码、批次、库位、状态一致 |
|
|
|
if (itemDetail.scaned) { |
|
|
|
this.showErrorMessage("\n批次【" + batch + "】\n库位【" + result |
|
|
|
.fromLocationCode + "】\n状态【" + balanceStatus + "】\n已经扫描") |
|
|
|
return; |
|
|
|
} else { |
|
|
|
itemDetail.scaned = true; |
|
|
|
itemDetail.handleQty = Number(result.balance.qty); |
|
|
|
itemDetail.toInventoryStatus = result.balance.inventoryStatus; |
|
|
|
itemDetail.inventoryStatus = result.balance.inventoryStatus; |
|
|
|
itemDetail.balance = result.balance; |
|
|
|
itemDetail.balance.balanceQty = Number(result.balance.qty); |
|
|
|
itemDetail.balance.packQty = Number(result.package.packQty) |
|
|
|
itemDetail.balance.packUnit = result.package.packUnit |
|
|
|
this.calcHandleQty(); |
|
|
|
} |
|
|
|
} else { |
|
|
|
//箱码、批次、库位相等 |
|
|
|
itemDetail = detail.subList.find(r => { |
|
|
|
return r.batch == batch && |
|
|
|
r.fromLocationCode == result.fromLocationCode |
|
|
|
}) |
|
|
|
|
|
|
|
if (itemDetail) { |
|
|
|
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); |
|
|
|
//箱码、批次、库位相等,状态不相等 |
|
|
|
if (this.jobContent.allowModifyInventoryStatus == "TRUE") { |
|
|
|
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + |
|
|
|
']不一致,是否继续回收?', res => { |
|
|
|
if (res) { |
|
|
|
itemDetail.scaned = true; |
|
|
|
itemDetail.handleQty = Number(result.balance.qty); |
|
|
|
itemDetail.toInventoryStatus = result.balance.inventoryStatus; |
|
|
|
itemDetail.inventoryStatus = result.balance.inventoryStatus; |
|
|
|
itemDetail.balance = result.balance; |
|
|
|
itemDetail.balance.balanceQty = result.balance.qty; |
|
|
|
itemDetail.balance.packQty = result.package.packQty |
|
|
|
itemDetail.balance.packUnit = result.package.packUnit |
|
|
|
this.calcHandleQty(); |
|
|
|
} else { |
|
|
|
this.scanPopupGetFocus(); |
|
|
|
} |
|
|
|
}); |
|
|
|
} else { |
|
|
|
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + |
|
|
|
itemStatus + |
|
|
|
']不一致,不允许回收!', res => { |
|
|
|
this.scanPopupGetFocus(); |
|
|
|
}); |
|
|
|
} |
|
|
|
} else { |
|
|
|
this.showErrorMessage("\n批次【" + batch + "】\n库位【" + result |
|
|
|
.fromLocationCode + "】\n状态【" + balanceStatus + "】\n不在任务列表中") |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
this.scanPopupGetFocus(); |
|
|
|
} catch (e) { |
|
|
|
this.showErrorMessage(e.message); |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
commit() { |
|
|
|
this.scanCount = getScanCount(this.subList); |
|
|
|
if (this.scanCount == 0) { |
|
|
@ -344,12 +435,20 @@ |
|
|
|
// //允许部分提交 |
|
|
|
// //扫描数量和任务数量相等,直接提交 |
|
|
|
if (this.scanCount == this.subList.length) { |
|
|
|
if(this.managementType == 'BY_BATCH' ||this.managementType == "BY_QUANTITY" ){ |
|
|
|
this.checkCountBatch() |
|
|
|
}else{ |
|
|
|
this.checkCount(); |
|
|
|
} |
|
|
|
} else if (this.scanCount < this.subList.length) { |
|
|
|
//扫描数量小于任务数量,判断是否允许部分提交 |
|
|
|
if (this.jobContent.allowPartialComplete == "TRUE") { |
|
|
|
//提交 |
|
|
|
if(this.managementType == 'BY_BATCH' ||this.managementType == "BY_QUANTITY" ){ |
|
|
|
this.checkCountBatch() |
|
|
|
}else{ |
|
|
|
this.checkCount(); |
|
|
|
} |
|
|
|
} else { |
|
|
|
//不允许部分提交,提示 |
|
|
|
this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => { |
|
|
@ -388,6 +487,33 @@ |
|
|
|
this.submitJob() |
|
|
|
} |
|
|
|
}, |
|
|
|
checkCountBatch(){ |
|
|
|
// 提交的数量和任务数量不一致提示 |
|
|
|
let str = '' |
|
|
|
this.detailSource.forEach((item) => { |
|
|
|
item.subList.forEach(cur => { |
|
|
|
if (cur.qty != cur.handleQty) { |
|
|
|
var tempHandleQty =0 |
|
|
|
if(cur.handleQty){ |
|
|
|
tempHandleQty=cur.handleQty |
|
|
|
}else { |
|
|
|
tempHandleQty =0 |
|
|
|
} |
|
|
|
str += `物料号【${item.itemCode}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致` |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
|
if (str) { |
|
|
|
str = '任务明细未全部完成,是否提交?\n'+str |
|
|
|
this.$refs.comMessage.showQuestionMessage1(str, 'red', res => { |
|
|
|
if (res) { |
|
|
|
this.submitJob() |
|
|
|
} |
|
|
|
}); |
|
|
|
} else { |
|
|
|
this.submitJob() |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
submitJob() { |
|
|
|
uni.showLoading({ |
|
|
|