diff --git a/src/pages/issue/record/directIssue2.vue b/src/pages/issue/record/directIssue2.vue index f66a01c0..18070a91 100644 --- a/src/pages/issue/record/directIssue2.vue +++ b/src/pages/issue/record/directIssue2.vue @@ -309,53 +309,55 @@ }, afterGetBalance(result) { - let balance = result.balance; - let label = result.label; - let pack = result.package; - let packUnit = pack.packUnit; - let packQty = pack.packQty - var item = this.detailSource.find(res => { - if (res.itemCode == balance.itemCode) { - return res - } - }) - if (this.fromWarehouseCode == '') { - this.fromWarehouseCode = balance.warehouseCode; - } - if (item == undefined) { - - var itemp = createItemInfo(balance, pack); - let newDetail = createDetailInfo(balance, pack); // - newDetail.parentNumber = pack.parentNumber; - newDetail.packingNumber = pack.number - newDetail.packUnit = packUnit; - newDetail.packQty = packQty; - itemp.subList.push(newDetail); - this.detailSource.push(itemp) - calcHandleQty(this.detailSource); - - } else { - var detail = item.subList.find(r => { - if (r.packingNumber == pack.number && - r.batch == balance.batch && - r.locationCode == balance.locationCode && - r.inventoryStatus == balance.inventoryStatus) { - return r; - } - }) - if (detail == undefined) { - let newDetail = createDetailInfo(balance, pack); - newDetail.parentNumber = pack.parentNumber; - newDetail.packingNumber = pack.number - newDetail.packUnit = packUnit; - newDetail.packQty = packQty; - item.subList.push(newDetail); - calcHandleQty(this.detailSource); - } else { - if (detail.scaned == true) { - this.showErrorMessage("箱码[" + detail.packingNumber + "]批次[" + balance.batch + "]重复扫描 } - } - } + let balance = result.balance; + let label = result.label; + let pack = result.package; + let packUnit = pack.packUnit; + let packQty = pack.packQty + var item = this.detailSource.find(res => { + if (res.itemCode == balance.itemCode) { + return res + } + }) + if (this.fromWarehouseCode == '') { + this.fromWarehouseCode = balance.warehouseCode; + } + if (item == undefined) { + + var itemp = createItemInfo(balance, pack); + let newDetail = createDetailInfo(balance, pack); // + newDetail.parentNumber = pack.parentNumber; + newDetail.packingNumber = pack.number + newDetail.packUnit = packUnit; + newDetail.packQty = packQty; + itemp.subList.push(newDetail); + this.detailSource.push(itemp) + calcHandleQty(this.detailSource); + + } else { + var detail = item.subList.find(r => { + if (r.packingNumber == pack.number && + r.batch == balance.batch && + r.locationCode == balance.locationCode && + r.inventoryStatus == balance.inventoryStatus) { + return r; + } + }) + if (detail == undefined) { + let newDetail = createDetailInfo(balance, pack); + newDetail.parentNumber = pack.parentNumber; + newDetail.packingNumber = pack.number + newDetail.packUnit = packUnit; + newDetail.packQty = packQty; + item.subList.push(newDetail); + calcHandleQty(this.detailSource); + } + else { + if (detail.scaned == true) { + this.showErrorMessage("箱码[" + detail.packingNumber + "]批次[" + balance.batch + "]重复扫描") + } + } + } },