|
@ -298,41 +298,26 @@ |
|
|
.fromLocationCode + "】已经扫描") |
|
|
.fromLocationCode + "】已经扫描") |
|
|
} else { |
|
|
} else { |
|
|
|
|
|
|
|
|
this.addDetail(itemDetail, result); |
|
|
// this.addDetail(itemDetail, result); |
|
|
return; |
|
|
// return; |
|
|
|
|
|
|
|
|
//暂时先不判断状态 |
|
|
//暂时先不判断状态 |
|
|
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); |
|
|
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); |
|
|
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); |
|
|
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); |
|
|
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { |
|
|
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { |
|
|
if (this.jobContent.allowModifyInventoryStatus == "TRUE") { |
|
|
// if (this.jobContent.allowModifyInventoryStatus == "TRUE") { |
|
|
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + |
|
|
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + |
|
|
']不一致,是否继续上架?', res => { |
|
|
']不一致,是否继续上架?', res => { |
|
|
if (res) { |
|
|
if (res) { |
|
|
this.addDetail(itemDetail, result); |
|
|
this.addDetail(itemDetail, result); |
|
|
// itemDetail.scaned = true; |
|
|
|
|
|
// itemDetail.handleQty = Number(result.balance.qty) |
|
|
|
|
|
// itemDetail.toInventoryStatus = 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 { |
|
|
} else { |
|
|
this.scanPopupGetFocus(); |
|
|
this.scanPopupGetFocus(); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
} else { |
|
|
// } else { |
|
|
this.addDetail(itemDetail, result); |
|
|
// this.addDetail(itemDetail, result); |
|
|
// itemDetail.scaned = true; |
|
|
// } |
|
|
// itemDetail.handleQty = Number(result.balance.qty) |
|
|
|
|
|
// itemDetail.balance = result.balance; |
|
|
|
|
|
// itemDetail.toInventoryStatus = result.balance.inventoryStatus; |
|
|
|
|
|
// itemDetail.balance.balanceQty = Number(result.balance.qty) |
|
|
|
|
|
// itemDetail.balance.packQty = Number(result.package.packQty) |
|
|
|
|
|
// itemDetail.balance.packUnit = result.package.packUnit |
|
|
|
|
|
// this.calcHandleQty(); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -346,6 +331,7 @@ |
|
|
itemDetail.handleQty = Number(result.balance.qty) |
|
|
itemDetail.handleQty = Number(result.balance.qty) |
|
|
itemDetail.balance = result.balance; |
|
|
itemDetail.balance = result.balance; |
|
|
itemDetail.toInventoryStatus = result.balance.inventoryStatus; |
|
|
itemDetail.toInventoryStatus = result.balance.inventoryStatus; |
|
|
|
|
|
itemDetail.fromInventoryStatus = result.balance.inventoryStatus; |
|
|
itemDetail.balance.balanceQty = Number(result.balance.qty) |
|
|
itemDetail.balance.balanceQty = Number(result.balance.qty) |
|
|
itemDetail.balance.packQty = Number(result.package.packQty) |
|
|
itemDetail.balance.packQty = Number(result.package.packQty) |
|
|
itemDetail.balance.packUnit = result.package.packUnit |
|
|
itemDetail.balance.packUnit = result.package.packUnit |
|
|