|
@ -62,12 +62,13 @@ |
|
|
navigateBack, |
|
|
navigateBack, |
|
|
updateTitle, |
|
|
updateTitle, |
|
|
getPackingNumberAndBatch, |
|
|
getPackingNumberAndBatch, |
|
|
|
|
|
getSwitchInfoByCode |
|
|
} from '@/common/basic.js'; |
|
|
} from '@/common/basic.js'; |
|
|
|
|
|
|
|
|
import { |
|
|
import { |
|
|
getInventoryStatusName, |
|
|
getInventoryStatusName, |
|
|
getInventoryStatusDesc, |
|
|
getInventoryStatusDesc, |
|
|
getDirectoryItemArray |
|
|
getDirectoryItemArray, |
|
|
} from '@/common/directory.js'; |
|
|
} from '@/common/directory.js'; |
|
|
import { |
|
|
import { |
|
|
getLocationTypeArray |
|
|
getLocationTypeArray |
|
@ -289,6 +290,10 @@ |
|
|
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result |
|
|
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result |
|
|
.fromLocationCode + "】已经扫描") |
|
|
.fromLocationCode + "】已经扫描") |
|
|
} else { |
|
|
} else { |
|
|
|
|
|
|
|
|
|
|
|
this.addDetail(itemDetail, result); |
|
|
|
|
|
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) { |
|
@ -296,24 +301,40 @@ |
|
|
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + |
|
|
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + |
|
|
']不一致,是否继续上架?', res => { |
|
|
']不一致,是否继续上架?', res => { |
|
|
if (res) { |
|
|
if (res) { |
|
|
itemDetail.scaned = true; |
|
|
this.addDetail(itemDetail, result); |
|
|
itemDetail.handleQty = Number(result.balance.qty) |
|
|
// itemDetail.scaned = true; |
|
|
itemDetail.toInventoryStatus = result.balance.inventoryStatus; |
|
|
// itemDetail.handleQty = Number(result.balance.qty) |
|
|
itemDetail.balance = result.balance; |
|
|
// itemDetail.toInventoryStatus = result.balance.inventoryStatus; |
|
|
itemDetail.balance.balanceQty = Number(result.balance.qty) |
|
|
// itemDetail.balance = result.balance; |
|
|
itemDetail.balance.packQty = Number(result.package.packQty) |
|
|
// itemDetail.balance.balanceQty = Number(result.balance.qty) |
|
|
itemDetail.balance.packUnit = result.package.packUnit |
|
|
// itemDetail.balance.packQty = Number(result.package.packQty) |
|
|
this.calcHandleQty(); |
|
|
// itemDetail.balance.packUnit = result.package.packUnit |
|
|
|
|
|
// this.calcHandleQty(); |
|
|
} else { |
|
|
} else { |
|
|
this.scanPopupGetFocus(); |
|
|
this.scanPopupGetFocus(); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
|
|
|
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(); |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} catch (e) { |
|
|
|
|
|
this.showMessage(e.message) |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
addDetail(itemDetail, result) { |
|
|
} else { |
|
|
|
|
|
itemDetail.scaned = true; |
|
|
itemDetail.scaned = true; |
|
|
itemDetail.handleQty = Number(result.balance.qty) |
|
|
itemDetail.handleQty = Number(result.balance.qty) |
|
|
itemDetail.balance = result.balance; |
|
|
itemDetail.balance = result.balance; |
|
@ -322,13 +343,6 @@ |
|
|
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 |
|
|
this.calcHandleQty(); |
|
|
this.calcHandleQty(); |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} catch (e) { |
|
|
|
|
|
this.showMessage(e.message) |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
scanLocationCode(location, code) { |
|
|
scanLocationCode(location, code) { |
|
|