diff --git a/src/common/record.js b/src/common/record.js index 1ff0b5a3..df840606 100644 --- a/src/common/record.js +++ b/src/common/record.js @@ -39,7 +39,7 @@ export function createDetailInfo(balance, pack) { let detail = deepCopyData(balance); detail.balanceQty = new Decimal(detail.qty).toNumber() detail.qty = new Decimal(detail.qty).toNumber(); - detail.packQty = new Decimal(pack.packQty).toNumber() + detail.packQty = pack.packQty?new Decimal(pack.packQty).toNumber():0 detail.packUnit = pack.packUnit detail.handleQty = new Decimal(detail.qty).toNumber(); detail.package = pack; diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 161473dc..9cdc562b 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -49,7 +49,7 @@ import comBlankView from '@/mycomponents/common/comBlankView.vue' import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" - + import { getInventoryStatusName } from '@/common/directory.js'; @@ -282,7 +282,7 @@ } else { newDetail.toInventoryStatus = this.toInventoryStatus; } - + if (newDetail.packingNumber == '') { newDetail.packingNumber = pack.number; } @@ -290,17 +290,17 @@ newDetail.fromLocationCode = result.fromLocationCode item.subList.push(newDetail); } else { - this.showErrorMessage("包装["+detail.packingNumber+"]\n"+ - "批次["+detail.batch+"]\n"+"库位["+detail.fromLocationCode+"]\n"+ - "库存状态["+getInventoryStatusName(detail.toInventoryStatus)+"]\n" - + "重复扫描") + this.showErrorMessage("包装[" + detail.packingNumber + "]\n" + + "批次[" + detail.batch + "]\n" + "库位[" + detail.fromLocationCode + "]\n" + + "库存状态[" + getInventoryStatusName(detail.toInventoryStatus) + "]\n" + + "重复扫描") } } calcHandleQty(this.detailSource); }, showErrorMessage(message) { - if(this.$refs.scanPopup){ + if (this.$refs.scanPopup) { this.$refs.scanPopup.packLoseFocus() } this.$refs.comMessage.showErrorMessage(message, res => { @@ -359,7 +359,7 @@ // this.showErrorMessage("来源库位和目标库位不能一致") // return; // } - + if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) { //查询管理模式 uni.showLoading({ @@ -372,7 +372,7 @@ getPrecisionStrategyList(precisionStrategParams, res => { if (res.success) { this.managementList = res.list; - this.submit() + this.submit() } else { uni.hideLoading(); this.showErrorMessage(res.message); @@ -385,22 +385,23 @@ } }, - - submit(){ + + submit() { //目标库位和状态都一致时不可以提交 var params = this.setParams() - let hint="" - this.dataContent.subList.forEach(res=>{ - if(res.fromLocationCode==res.toLocationCode&& - res.fromInventoryStatus==res.toInventoryStatus){ - hint +=`包装号【${res.fromPackingNumber}】来源库位与目标库位 来源状态与目标状态一致,不可以提交\n` + let hint = "" + this.dataContent.subList.forEach(res => { + if (res.fromLocationCode == res.toLocationCode) { + if (res.fromInventoryStatus == res.toInventoryStatus) { + var resultHint = res.fromPackingNumber?`包装号【${res.fromPackingNumber}】`:"" + hint += resultHint+`来源库位与目标库位 来源状态与目标状态一致,不可以提交\n` + } } }) - if(hint){ + if (hint) { uni.hideLoading() this.$refs.comMessage.showQuestionMessage1(hint, 'red', res => { - if (res) { - } + if (res) {} }); return; } @@ -424,9 +425,7 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { - if (detail.toLocationCode == '') { - detail.toLocationCode = this.toLocationCode; - } + detail.toLocationCode = this.toLocationCode; var filterResult = itemList.filter(res => { if (res.itemCode == item.itemCode && detail.toLocationCode == res.locationCode) {