From 4b1a7ac3745a0e64575d6dfeb7e00deff25638b3 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Tue, 2 Jan 2024 13:08:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/productPutawayDetail.vue | 75 ++++++------------ .../job/productReceiptDetail.vue | 39 +--------- pages/productionReturn/job/returnDetail.vue | 37 +-------- pages/purchaseReceipt/job/receiptDetail.vue | 2 +- pages/purchaseReturn/job/returnDetail.vue | 16 ++-- pages/putaway/job/putawayDetail.vue | 77 ++++++------------- pages/repleinsh/job/repleinshDetail.vue | 48 +++--------- pages/scrap/job/scrapJobDetail.vue | 51 ++++++------ pages/transfer/job/receiptDetail.vue | 5 +- pages/transfer/job/transferDetail.vue | 55 ++++--------- pages/unPlanned/job/issueJobDetail.vue | 75 ++++++------------ pages/unPlanned/job/receiptJobDetail.vue | 50 +++--------- 12 files changed, 155 insertions(+), 375 deletions(-) diff --git a/pages/productPutaway/job/productPutawayDetail.vue b/pages/productPutaway/job/productPutawayDetail.vue index 67500518..b91b5119 100644 --- a/pages/productPutaway/job/productPutawayDetail.vue +++ b/pages/productPutaway/job/productPutawayDetail.vue @@ -7,7 +7,9 @@ 申请单号 : {{jobContent.requestNumber}} - + + + @@ -20,7 +22,6 @@ - @@ -36,7 +37,7 @@ - + @@ -62,7 +63,7 @@ navigateBack, getPackingNumberAndBatch, } from '@/common/basic.js'; - + import { getInventoryStatusName, getInventoryStatusDesc, @@ -86,8 +87,8 @@ import comDetailCard from "@/mycomponents/detail/comDetailCard.vue" import detailInfoPopup from '@/pages/productPutaway/coms/detailInfoPopup.vue' import jobTop from '@/mycomponents/job/jobTop.vue' - - + + export default { components: { winScanButton, @@ -276,42 +277,44 @@ r.fromLocationCode == result.fromLocationCode }) if (itemDetail == undefined) { - this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中") + this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result + .fromLocationCode + "】不在列表中") } else { if (itemDetail.scaned) { - this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描") + this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result + .fromLocationCode + "】已经扫描") } else { let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { - if(this.jobContent.allowModifyInventoryStatus=="TRUE"){ + if (this.jobContent.allowModifyInventoryStatus == "TRUE") { this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + ']不一致,是否继续上架?', res => { if (res) { itemDetail.scaned = true; - itemDetail.handleQty = Number(result.balance.qty) + itemDetail.handleQty = Number(result.balance.qty) itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; - itemDetail.balance.balanceQty = Number(result.balance.qty) - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) + itemDetail.balance.balanceQty = Number(result.balance.qty) + itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) itemDetail.balance.stdPackUnit = result.package.stdPackUnit this.calcHandleQty(); } else { this.scanPopupGetFocus(); } }); - }else { - + } else { + } - - + + } else { itemDetail.scaned = true; - itemDetail.handleQty = Number(result.balance.qty) + itemDetail.handleQty = Number(result.balance.qty) itemDetail.balance = result.balance; itemDetail.toInventoryStatus = result.balance.inventoryStatus; - itemDetail.balance.balanceQty = Number(result.balance.qty) - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) + itemDetail.balance.balanceQty = Number(result.balance.qty) + itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) itemDetail.balance.stdPackUnit = result.package.stdPackUnit this.calcHandleQty(); } @@ -497,38 +500,4 @@ diff --git a/pages/productReceipt/job/productReceiptDetail.vue b/pages/productReceipt/job/productReceiptDetail.vue index 8740d36c..b4e75298 100644 --- a/pages/productReceipt/job/productReceiptDetail.vue +++ b/pages/productReceipt/job/productReceiptDetail.vue @@ -7,7 +7,10 @@ 申请单号 : {{jobContent.requestNumber}} - + + + @@ -413,38 +416,4 @@ diff --git a/pages/productionReturn/job/returnDetail.vue b/pages/productionReturn/job/returnDetail.vue index 47bab093..2233601c 100644 --- a/pages/productionReturn/job/returnDetail.vue +++ b/pages/productionReturn/job/returnDetail.vue @@ -12,7 +12,9 @@ :workStationCode="titleInfo.workStationCode" :rawLocationCode="titleInfo.fromLocationCode"> - + + + diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue index dccc730c..110829a9 100644 --- a/pages/purchaseReceipt/job/receiptDetail.vue +++ b/pages/purchaseReceipt/job/receiptDetail.vue @@ -7,7 +7,7 @@ 发货单号 : {{jobContent.asnNumber}} - diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue index 5d57fbb4..bdcd7704 100644 --- a/pages/purchaseReturn/job/returnDetail.vue +++ b/pages/purchaseReturn/job/returnDetail.vue @@ -7,15 +7,17 @@ 发货单：{{jobContent.asnNumber}} - + - - + + + + @@ -237,12 +239,10 @@ r.batch == batch && r.fromLocationCode == result.fromLocationCode }) if (itemDetail == undefined) { - this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result - .fromLocationCode + "】不在列表中") + this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中") } else { if (itemDetail.scaned) { - this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result - .fromLocationCode + "】已经扫描") + this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描") } else { let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue index aa283897..805485c9 100644 --- a/pages/putaway/job/putawayDetail.vue +++ b/pages/putaway/job/putawayDetail.vue @@ -7,7 +7,10 @@ 申请单号 : {{jobContent.requestNumber}} - + + + + @@ -21,7 +24,6 @@ - @@ -81,8 +83,8 @@ import putawayDetailInfoPopup from '@/pages/putaway/coms/putawayDetailInfoPopup.vue' import comMessage from '@/mycomponents/common/comMessage.vue' import jobTop from '@/mycomponents/job/jobTop.vue' - - + + export default { components: { winScanButton, @@ -275,52 +277,56 @@ var locationCode = result.balance.locationCode; var inventoryStatus = result.balance.inventoryStatus; var detail = this.detailSource.find(r => r.itemCode == itemCode); - + if (detail == undefined) { this.showErrorMessage("物料号【" + itemCode + "】不在列表中") } else { var itemDetail = detail.subList.find(r => { return r.packingNumber == packingNumber && - r.batch == batch&& + r.batch == batch && r.fromLocationCode == result.fromLocationCode }) if (itemDetail == undefined) { - this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中") + this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result + .fromLocationCode + "】不在列表中") if (itemDetail.scaned) { - this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描") + this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result + .fromLocationCode + "】已经扫描") } else { let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { - if(this.jobContent.allowModifyInventoryStatus=="TRUE"){ - this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + + 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.handleQty = Number(result.balance.qty); + itemDetail.toInventoryStatus = result.balance.inventoryStatus itemDetail.balance = result.balance; - itemDetail.balance.balanceQty = Number(result.balance.qty) ; - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) + itemDetail.balance.balanceQty = Number(result.balance.qty); + itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) itemDetail.balance.stdPackUnit = result.package.stdPackUnit this.calcHandleQty(); } else { this.scanPopupGetFocus(); } }); - }else { - this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + + } else { + this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + + itemStatus + ']不一致,不允许转移!', res => { this.scanPopupGetFocus(); }); } - + } else { itemDetail.scaned = true; - itemDetail.handleQty = Number(result.balance.qty) ; + itemDetail.handleQty = Number(result.balance.qty); itemDetail.toInventoryStatus = itemDetail.inventoryStatus itemDetail.balance = result.balance; - itemDetail.balance.balanceQty = Number(result.balance.qty) ; + itemDetail.balance.balanceQty = Number(result.balance.qty); itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) itemDetail.balance.stdPackUnit = result.package.stdPackUnit this.calcHandleQty(); @@ -519,38 +525,5 @@ diff --git a/pages/repleinsh/job/repleinshDetail.vue b/pages/repleinsh/job/repleinshDetail.vue index cffa42a1..019cd3dd 100644 --- a/pages/repleinsh/job/repleinshDetail.vue +++ b/pages/repleinsh/job/repleinshDetail.vue @@ -7,7 +7,10 @@ 申请单号 : {{jobContent.requestNumber}} - + + + { toLocationCode.Items.forEach(item => { @@ -441,7 +444,7 @@ fromLocation.Batchs.forEach(batch => { let subItem = batch.detail; if (batch.Records.length > 0) { - scanCount+=batch.Records.length + scanCount += batch.Records.length } }) }) @@ -449,39 +452,12 @@ }) return scanCount; } - - + + } }; diff --git a/pages/scrap/job/scrapJobDetail.vue b/pages/scrap/job/scrapJobDetail.vue index f3c13ee4..bedb7caf 100644 --- a/pages/scrap/job/scrapJobDetail.vue +++ b/pages/scrap/job/scrapJobDetail.vue @@ -7,7 +7,10 @@ 申请单号 : {{jobContent.requestNumber}} - + + + @@ -68,7 +71,7 @@ import comScrapDetailCard from '@/pages/scrap/coms/comScrapDetailCard.vue' import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import jobTop from '@/mycomponents/job/jobTop.vue' - + export default { name: 'receipt_detail', components: { @@ -192,7 +195,7 @@ var locationCode = result.balance.locationCode; var inventoryStatus = result.balance.inventoryStatus; var detail = this.detailSource.find(r => r.itemCode == itemCode); - + if (detail == undefined) { this.showErrorMessage("物料号【" + itemCode + "】不在列表中") } else { @@ -209,29 +212,31 @@ let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { - if(this.jobContent.allowModifyInventoryStatus=="TRUE"){ - this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + + 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.balance = result.balance; - itemDetail.balance.balanceQty = Number(result.balance.qty); - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) + itemDetail.balance.balanceQty = Number(result.balance.qty); + itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) itemDetail.balance.stdPackUnit = result.package.stdPackUnit this.calcHandleQty(); } else { this.scanPopupGetFocus(); } }); - }else { - this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + + } else { + this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + + itemStatus + ']不一致,不允许转移!', res => { this.scanPopupGetFocus(); }); } - + } else { itemDetail.scaned = true; itemDetail.handleQty = Number(result.balance.qty); @@ -265,7 +270,7 @@ updateData() { calcHandleQty(this.detailSource); }, - + calcHandleQty() { calcHandleQty(this.detailSource) this.continueScan() @@ -273,13 +278,13 @@ }, - commit() { - - this.scanCount = getScanCount(this.subList); - if (this.scanCount == 0) { - this.showErrorMessage("扫描数为0,请先扫描") - return; - } + commit() { + + this.scanCount = getScanCount(this.subList); + if (this.scanCount == 0) { + this.showErrorMessage("扫描数为0,请先扫描") + return; + } //扫描数量和任务数量相等，直接提交 if (this.scanCount == this.subList.length) { this.submitJob(); @@ -301,7 +306,7 @@ } }, - submitJob() { + submitJob() { uni.showLoading({ title: "提交中....", mask: true @@ -312,9 +317,9 @@ scrapJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成报废出库记录
" + res.data ) + this.showCommitSuccessMessage("提交成功
生成报废出库记录
" + res.data) } else { - this.showErrorMessage("提交失败["+res.msg+"]") + this.showErrorMessage("提交失败[" + res.msg + "]") } }).catch(error => { uni.hideLoading() @@ -322,7 +327,7 @@ }) }, - + setParams() { var subList = [] var creator = this.$store.state.user.id @@ -331,7 +336,7 @@ if (detail.scaned) { detail.toPackingNumber = detail.packingNumber; detail.toContainerNumber = ""; - detail.toInventoryStatus= ""; + detail.toInventoryStatus = ""; detail.toLocationCode = ""; detail.toBatch = detail.batch; subList.push(detail) diff --git a/pages/transfer/job/receiptDetail.vue b/pages/transfer/job/receiptDetail.vue index c89f04e0..327490b0 100644 --- a/pages/transfer/job/receiptDetail.vue +++ b/pages/transfer/job/receiptDetail.vue @@ -10,7 +10,10 @@ 来源仓库 : {{jobContent.fromWarehouseCode}} - + + + diff --git a/pages/transfer/job/transferDetail.vue b/pages/transfer/job/transferDetail.vue index 9cf70ef4..a1eee5e7 100644 --- a/pages/transfer/job/transferDetail.vue +++ b/pages/transfer/job/transferDetail.vue @@ -7,7 +7,10 @@ 申请单号 : {{jobContent.requestNumber}} - + + + @@ -66,7 +69,7 @@ import comMessage from '@/mycomponents/common/comMessage.vue' import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import jobTop from '@/mycomponents/job/jobTop.vue' - + export default { name: 'returnDetail', components: { @@ -90,7 +93,7 @@ businessTypeInfo: {}, locationTypeList: [], managementList: [], - + }; }, onLoad(option) { @@ -318,24 +321,26 @@ let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { - if(this.jobContent.allowModifyInventoryStatus=="TRUE"){ + if (this.jobContent.allowModifyInventoryStatus == "TRUE") { this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + ']不一致,是否继续上架?', res => { if (res) { itemDetail.scaned = true; - itemDetail.record = this.createRecordInfo(itemDetail, result.balance); + itemDetail.record = this.createRecordInfo(itemDetail, result + .balance); this.calcHandleQty(); } else { this.scanPopupGetFocus(); } }); - }else { - this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + + } else { + this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + + itemStatus + ']不一致,不允许转移!', res => { this.scanPopupGetFocus(); }); } - + } else { itemDetail.scaned = true; itemDetail.record = this.createRecordInfo(itemDetail, result.balance); @@ -571,38 +576,4 @@ diff --git a/pages/unPlanned/job/issueJobDetail.vue b/pages/unPlanned/job/issueJobDetail.vue index 1c66537e..1dd2c7a7 100644 --- a/pages/unPlanned/job/issueJobDetail.vue +++ b/pages/unPlanned/job/issueJobDetail.vue @@ -7,7 +7,10 @@ 申请单号 : {{jobContent.requestNumber}} - + + + @@ -70,7 +73,7 @@ import comDetailCard from "@/mycomponents/detail/comDetailCard.vue" import detailInfoPopup from '@/pages/unPlanned/coms/detailInfoPopup.vue' import jobTop from '@/mycomponents/job/jobTop.vue' - + export default { name: 'receipt_detail', components: { @@ -210,53 +213,57 @@ var locationCode = result.balance.locationCode; var inventoryStatus = result.balance.inventoryStatus; var detail = this.detailSource.find(r => r.itemCode == itemCode); - + if (detail == undefined) { this.showErrorMessage("物料号【" + itemCode + "】不在列表中") } else { var itemDetail = detail.subList.find(r => { return r.packingNumber == packingNumber && - r.batch == batch&& + r.batch == batch && r.fromLocationCode == result.fromLocationCode }) if (itemDetail == undefined) { - this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中") + this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result + .fromLocationCode + "】不在列表中") } else { if (itemDetail.scaned) { - this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描") + this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result + .fromLocationCode + "】已经扫描") } else { let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { - if(this.jobContent.allowModifyInventoryStatus=="TRUE"){ - this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + + if (this.jobContent.allowModifyInventoryStatus == "TRUE") { + this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + + itemStatus + ']不一致,是否继续出库?', res => { if (res) { itemDetail.scaned = true; - itemDetail.handleQty = Number(result.balance.qty) ; + itemDetail.handleQty = Number(result.balance.qty); itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty); - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) + itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) itemDetail.balance.stdPackUnit = result.package.stdPackUnit this.calcHandleQty(); } else { this.scanPopupGetFocus(); } }); - }else { - this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + + } else { + this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + + itemStatus + ']不一致,不允许转移!', res => { this.scanPopupGetFocus(); }); } - + } else { itemDetail.scaned = true; - itemDetail.handleQty = Number(result.balance.qty) ; + itemDetail.handleQty = Number(result.balance.qty); itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; - itemDetail.balance.balanceQty = Number(result.balance.qty) ; + itemDetail.balance.balanceQty = Number(result.balance.qty); itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) itemDetail.balance.stdPackUnit = result.package.stdPackUnit this.calcHandleQty(); @@ -308,7 +315,7 @@ unPlannedIssueJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成计划外出库记录
" + res.data ) + this.showCommitSuccessMessage("提交成功
生成计划外出库记录
" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } @@ -360,7 +367,7 @@ }); }) }, - + showQuestionMessage(message, callback) { setTimeout(r => { this.scanPopupLoseFocus(); @@ -417,38 +424,4 @@ diff --git a/pages/unPlanned/job/receiptJobDetail.vue b/pages/unPlanned/job/receiptJobDetail.vue index 92e64fc5..a6ef8a8f 100644 --- a/pages/unPlanned/job/receiptJobDetail.vue +++ b/pages/unPlanned/job/receiptJobDetail.vue @@ -7,7 +7,10 @@ 申请单号 : {{jobContent.requestNumber}} - + + + @@ -218,13 +221,15 @@ this.showErrorMessage("物料号【" + itemCode + "】不在列表中") } else { - var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch - && r.fromLocationCode == result.fromLocationCode); + var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch && + r.fromLocationCode == result.fromLocationCode); if (itemDetail == undefined) { - this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中") + this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result + .fromLocationCode + "】不在列表中") } else { if (itemDetail.scaned) { - this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描") + this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result + .fromLocationCode + "】已经扫描") } else { itemDetail.scaned = true; itemDetail.handleQty = Number(result.label.qty); @@ -405,38 +410,5 @@