diff --git a/pages/deliver/record/deliverRecord.vue b/pages/deliver/record/deliverRecord.vue index 271de003..b3dc640b 100644 --- a/pages/deliver/record/deliverRecord.vue +++ b/pages/deliver/record/deliverRecord.vue @@ -60,7 +60,8 @@ } from '@/api/request2.js'; import { goHome, - getPackingNumberAndBatchByList + getPackingNumberAndBatchByList, + deepCopyData } from '@/common/basic.js'; import { @@ -359,32 +360,36 @@ if (detail.scaned) { var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode, detail.packingNumber, detail.toLocationCode, detail.batch); - detail.itemCode = detail.itemCode; - detail.itemName = detail.package.itemName; - detail.itemDesc1 = detail.package.itemDesc1; - detail.itemDesc2 = detail.package.itemDesc2; + var submitItem = deepCopyData(detail) + submitItem.itemCode = detail.itemCode; + submitItem.itemName = detail.package.itemName; + submitItem.itemDesc1 = detail.package.itemDesc1; + submitItem.itemDesc2 = detail.package.itemDesc2; - detail.inventoryStatus = detail.inventoryStatus; + submitItem.inventoryStatus = detail.inventoryStatus; - detail.fromPackingNumber = info.packingNumber; - detail.toPackingNumber = info.packingNumber; + submitItem.fromPackingNumber = info.packingNumber; + submitItem.toPackingNumber = info.packingNumber; - detail.fromContainerNumber = detail.containerNumber; - detail.toContainerNumber = detail.containerNumber + submitItem.fromContainerNumber = detail.containerNumber; + submitItem.toContainerNumber = detail.containerNumber - detail.fromBatch = info.batch; - detail.toBatch = info.batch; + submitItem.fromBatch = info.batch; + submitItem.toBatch = info.batch; - detail.fromLocationCode = detail.locationCode; - detail.toLocationCode = detail.toLocationCode; - - subList.push(detail) + submitItem.fromLocationCode = detail.locationCode; + submitItem.toLocationCode = detail.toLocationCode; + + submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.package =""; + + subList.push(submitItem) } }) }) this.dataContent.subList = subList; this.dataContent.creator = creator; - this.dataContent.customerCode =this.customerCode; + this.dataContent.customerCode = this.customerCode; this.dataContent.fromWarehouseCode = this.detailSource[0].subList[0].warehouseCode; this.dataContent.toWarehouseCode = this.toWarehouseCode; return this.dataContent; diff --git a/pages/productPutaway/record/productPutawayRecord.vue b/pages/productPutaway/record/productPutawayRecord.vue index b29a2738..ea503e70 100644 --- a/pages/productPutaway/record/productPutawayRecord.vue +++ b/pages/productPutaway/record/productPutawayRecord.vue @@ -46,7 +46,8 @@ } from '@/api/request2.js'; import { goHome, - getPackingNumberAndBatchByList + getPackingNumberAndBatchByList, + deepCopyData } from '@/common/basic.js'; import { getPrecisionStrategyList @@ -312,28 +313,31 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { + var submitItem = deepCopyData(detail) var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode, detail.packingNumber, detail.toLocationCode, detail.batch); - detail.itemCode = detail.itemCode; - detail.itemName = detail.package.itemName; - detail.itemDesc1 = detail.package.itemDesc1; - detail.itemDesc2 = detail.package.itemDesc2; + submitItem.itemCode = detail.itemCode; + submitItem.itemName = detail.package.itemName; + submitItem.itemDesc1 = detail.package.itemDesc1; + submitItem.itemDesc2 = detail.package.itemDesc2; - detail.inventoryStatus = detail.inventoryStatus; + submitItem.inventoryStatus = detail.inventoryStatus; - detail.fromPackingNumber = info.packingNumber; - detail.toPackingNumber = info.packingNumber; + submitItem.fromPackingNumber = info.packingNumber; + submitItem.toPackingNumber = info.packingNumber; - detail.fromContainerNumber = detail.containerNumber; - detail.toContainerNumber = detail.containerNumber + submitItem.fromContainerNumber = detail.containerNumber; + submitItem.toContainerNumber = detail.containerNumber - detail.fromBatch = info.batch; - detail.toBatch = info.batch; + submitItem.fromBatch = info.batch; + submitItem.toBatch = info.batch; - detail.fromLocationCode = detail.locationCode; - detail.toLocationCode = detail.toLocationCode; - - subList.push(detail) + submitItem.fromLocationCode = detail.locationCode; + submitItem.toLocationCode = detail.toLocationCode; + + submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.package =""; + subList.push(submitItem) } }) }) @@ -377,6 +381,11 @@ }, getToLocationCode(location, code) { this.toLocationCode = code; + this.detailSource.forEach(item => { + item.subList.forEach(detail => { + detail.toLocationCode = this.toLocationCode + }) + }) }, showCommitSuccessMessage(hint) { diff --git a/pages/productReceipt/record/productReceiptRecord.vue b/pages/productReceipt/record/productReceiptRecord.vue index ef7d4ca4..9cf94eda 100644 --- a/pages/productReceipt/record/productReceiptRecord.vue +++ b/pages/productReceipt/record/productReceiptRecord.vue @@ -57,7 +57,8 @@ } from '@/common/balance.js'; import { goHome, - getPackingNumberAndBatchByList + getPackingNumberAndBatchByList, + deepCopyData } from '@/common/basic.js'; import { @@ -300,31 +301,35 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { + var submitItem = deepCopyData(detail) var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode, detail.packingNumber, detail.toLocationCode, detail.batch); - detail.itemCode = detail.itemCode; - detail.itemName = detail.package.itemName; - detail.itemDesc1 = detail.package.itemDesc1; - detail.itemDesc2 = detail.package.itemDesc2; + submitItem.itemCode = detail.itemCode; + submitItem.itemName = detail.package.itemName; + submitItem.itemDesc1 = detail.package.itemDesc1; + submitItem.itemDesc2 = detail.package.itemDesc2; - detail.inventoryStatus = detail.inventoryStatus; + submitItem.inventoryStatus = detail.inventoryStatus; - detail.fromPackingNumber = info.packingNumber; - detail.toPackingNumber = info.packingNumber; + submitItem.fromPackingNumber = info.packingNumber; + submitItem.toPackingNumber = info.packingNumber; - detail.fromContainerNumber = detail.containerNumber; - detail.toContainerNumber = detail.containerNumber + submitItem.fromContainerNumber = detail.containerNumber; + submitItem.toContainerNumber = detail.containerNumber - detail.fromBatch = info.batch; - detail.toBatch = info.batch; + submitItem.fromBatch = info.batch; + submitItem.toBatch = info.batch; - detail.fromLocationCode = detail.locationCode; - detail.toLocationCode = detail.toLocationCode; + submitItem.fromLocationCode = detail.locationCode; + submitItem.toLocationCode = detail.toLocationCode; - detail.productionlineCode = this.productionLineCode; - detail.workStationCode = this.workStationCode; - - subList.push(detail) + submitItem.productionlineCode = this.productionLineCode; + submitItem.workStationCode = this.workStationCode; + + submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.package =""; + + subList.push(submitItem) } }) }) diff --git a/pages/productionReceipt/record/productionReceiptRecord.vue b/pages/productionReceipt/record/productionReceiptRecord.vue index 70df6299..6a51526b 100644 --- a/pages/productionReceipt/record/productionReceiptRecord.vue +++ b/pages/productionReceipt/record/productionReceiptRecord.vue @@ -47,6 +47,7 @@ } from '@/api/request2.js'; import { goHome, + deepCopyData } from '@/common/basic.js'; import { diff --git a/pages/productionReturn/record/returnToHold.vue b/pages/productionReturn/record/returnToHold.vue index a82c9237..788bd62a 100644 --- a/pages/productionReturn/record/returnToHold.vue +++ b/pages/productionReturn/record/returnToHold.vue @@ -58,7 +58,8 @@ import { goHome, - getPackingNumberAndBatchByList + getPackingNumberAndBatchByList, + deepCopyData } from '@/common/basic.js'; import { @@ -388,34 +389,37 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { + var submitItem = deepCopyData(detail) var fromInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode, detail.packingNumber, detail.fromLocationCode, detail.batch); var toInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode, detail.packingNumber, detail.toLocationCode, detail.batch); - detail.itemCode = detail.itemCode; - detail.itemName = detail.package.itemName; - detail.itemDesc1 = detail.package.itemDesc1; - detail.itemDesc2 = detail.package.itemDesc2; + submitItem.itemCode = detail.itemCode; + submitItem.itemName = detail.package.itemName; + submitItem.itemDesc1 = detail.package.itemDesc1; + submitItem.itemDesc2 = detail.package.itemDesc2; - detail.inventoryStatus = detail.inventoryStatus; + submitItem.inventoryStatus = detail.inventoryStatus; - detail.fromPackingNumber = fromInfo.packingNumber; - detail.toPackingNumber = toInfo.packingNumber; + submitItem.fromPackingNumber = fromInfo.packingNumber; + submitItem.toPackingNumber = toInfo.packingNumber; - detail.fromContainerNumber = detail.containerNumber; - detail.toContainerNumber = detail.containerNumber + submitItem.fromContainerNumber = detail.containerNumber; + submitItem.toContainerNumber = detail.containerNumber - detail.fromBatch = fromInfo.batch; - detail.toBatch = toInfo.batch; + submitItem.fromBatch = fromInfo.batch; + submitItem.toBatch = toInfo.batch; - detail.fromLocationCode = detail.fromLocationCode; - detail.toLocationCode = detail.toLocationCode; + submitItem.fromLocationCode = detail.fromLocationCode; + submitItem.toLocationCode = detail.toLocationCode; - detail.productionlineCode = this.productionLineCode; - detail.workStationCode = this.workStationCode; - - subList.push(detail) + submitItem.productionlineCode = this.productionLineCode; + submitItem.workStationCode = this.workStationCode; + + submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + + subList.push(submitItem) } }) }) @@ -428,8 +432,6 @@ - - showMessage(message) { this.scanPopupLoseFocus(); this.$refs.comMessage.showMessage(message, res => { diff --git a/pages/productionReturn/record/returnToStore.vue b/pages/productionReturn/record/returnToStore.vue index 6ca1de7c..253bfd64 100644 --- a/pages/productionReturn/record/returnToStore.vue +++ b/pages/productionReturn/record/returnToStore.vue @@ -50,6 +50,7 @@ import { goHome, getPackingNumberAndBatchByList, + deepCopyData } from '@/common/basic.js'; import { @@ -417,34 +418,36 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { + var submitItem = deepCopyData(detail) var fromInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode, detail.packingNumber, detail.fromLocationCode, detail.batch); var toInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode, detail.packingNumber, detail.toLocationCode, detail.batch); - detail.itemCode = detail.itemCode; - detail.itemName = detail.package.itemName; - detail.itemDesc1 = detail.package.itemDesc1; - detail.itemDesc2 = detail.package.itemDesc2; + submitItem.itemCode = detail.itemCode; + submitItem.itemName = detail.package.itemName; + submitItem.itemDesc1 = detail.package.itemDesc1; + submitItem.itemDesc2 = detail.package.itemDesc2; - detail.inventoryStatus = detail.inventoryStatus; + submitItem.inventoryStatus = detail.inventoryStatus; - detail.fromPackingNumber = fromInfo.packingNumber; - detail.toPackingNumber = toInfo.packingNumber; + submitItem.fromPackingNumber = fromInfo.packingNumber; + submitItem.toPackingNumber = toInfo.packingNumber; - detail.fromContainerNumber = detail.containerNumber; - detail.toContainerNumber = detail.containerNumber + submitItem.fromContainerNumber = detail.containerNumber; + submitItem.toContainerNumber = detail.containerNumber - detail.fromBatch = fromInfo.batch; - detail.toBatch = toInfo.batch; + submitItem.fromBatch = fromInfo.batch; + submitItem.toBatch = toInfo.batch; - detail.fromLocationCode = detail.fromLocationCode; - detail.toLocationCode = detail.toLocationCode; + submitItem.fromLocationCode = detail.fromLocationCode; + submitItem.toLocationCode = detail.toLocationCode; - detail.productionlineCode = this.productionLineCode; - detail.workStationCode = this.workStationCode; - - subList.push(detail) + submitItem.productionlineCode = this.productionLineCode; + submitItem.workStationCode = this.workStationCode; + + submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + subList.push(submitItem) } }) }) diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue index 58b1dafd..18178c36 100644 --- a/pages/purchaseReturn/record/returnRecord.vue +++ b/pages/purchaseReturn/record/returnRecord.vue @@ -54,7 +54,8 @@ import { goHome, updateTitle, - navigateBack + navigateBack, + deepCopyData } from '@/common/basic.js'; import { @@ -273,28 +274,30 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { - detail.itemCode = detail.itemCode; - detail.inventoryStatus = detail.inventoryStatus; + var submitItem = deepCopyData(detail) + submitItem.itemCode = detail.itemCode; + submitItem.inventoryStatus = detail.inventoryStatus; - detail.fromPackingNumber = detail.packingNumber; - detail.toPackingNumber = detail.packingNumber;; + submitItem.fromPackingNumber = detail.packingNumber; + submitItem.toPackingNumber = detail.packingNumber;; - detail.fromContainerNumber = detail.containerNumber; - detail.toContainerNumber = detail.containerNumber + submitItem.fromContainerNumber = detail.containerNumber; + submitItem.toContainerNumber = detail.containerNumber - detail.fromBatch = detail.batch; - detail.toBatch = detail.batch; + submitItem.fromBatch = detail.batch; + submitItem.toBatch = detail.batch; - detail.fromLocationCode = this.fromLocationCode; - detail.toLocationCode = ''; //采购退货直接出库，目标库位为空 - - detail.package = null; - subList.push(detail) + submitItem.fromLocationCode = this.fromLocationCode; + submitItem.toLocationCode = ''; //采购退货直接出库，目标库位为空 + + submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.package = ""; + subList.push(submitItem) } }) }) this.dataContent.subList = subList - + this.dataContent.creator = creator; // this.dataContent.jobNumber = ''; return this.dataContent; }, diff --git a/pages/transfer/coms/comTransferRecord.vue b/pages/transfer/coms/comTransferRecord.vue index f547133a..a4002787 100644 --- a/pages/transfer/coms/comTransferRecord.vue +++ b/pages/transfer/coms/comTransferRecord.vue @@ -51,6 +51,7 @@ import { goHome, + deepCopyData, getPackingNumberAndBatchByList } from '@/common/basic.js'; @@ -338,28 +339,32 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { + var submitItem = deepCopyData(detail) var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode, detail.packingNumber, detail.toLocationCode, detail.batch); - detail.itemCode = detail.itemCode; - detail.itemName = detail.package.itemName; - detail.itemDesc1 = detail.package.itemDesc1; - detail.itemDesc2 = detail.package.itemDesc2; + submitItem.itemCode = detail.itemCode; + submitItem.itemName = detail.package.itemName; + submitItem.itemDesc1 = detail.package.itemDesc1; + submitItem.itemDesc2 = detail.package.itemDesc2; - detail.inventoryStatus = detail.inventoryStatus; + submitItem.inventoryStatus = detail.inventoryStatus; - detail.fromPackingNumber = info.packingNumber; - detail.toPackingNumber = info.packingNumber; + submitItem.fromPackingNumber = info.packingNumber; + submitItem.toPackingNumber = info.packingNumber; - detail.fromContainerNumber = detail.containerNumber; - detail.toContainerNumber = detail.containerNumber + submitItem.fromContainerNumber = detail.containerNumber; + submitItem.toContainerNumber = detail.containerNumber - detail.fromBatch = info.batch; - detail.toBatch = info.batch; + submitItem.fromBatch = info.batch; + submitItem.toBatch = info.batch; - detail.fromLocationCode = detail.locationCode; - detail.toLocationCode = detail.toLocationCode; - - subList.push(detail) + submitItem.fromLocationCode = detail.locationCode; + submitItem.toLocationCode = detail.toLocationCode; + + submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.package =""; + + subList.push(submitItem) } }) }) diff --git a/pages/unPlanned/record/issueRecord.vue b/pages/unPlanned/record/issueRecord.vue index e5d9b738..0cdbc6e7 100644 --- a/pages/unPlanned/record/issueRecord.vue +++ b/pages/unPlanned/record/issueRecord.vue @@ -71,7 +71,8 @@ import { goHome, - updateTitle + updateTitle, + deepCopyData } from '@/common/basic.js'; export default { @@ -233,27 +234,31 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { - detail.itemCode = detail.itemCode; - detail.itemName = detail.package.itemName; - detail.itemDesc1 = detail.package.itemDesc1; - detail.itemDesc2 = detail.package.itemDesc2; + var submitItem = deepCopyData(detail) + submitItem.itemCode = detail.itemCode; + submitItem.itemName = detail.package.itemName; + submitItem.itemDesc1 = detail.package.itemDesc1; + submitItem.itemDesc2 = detail.package.itemDesc2; - detail.inventoryStatus = detail.inventoryStatus; + submitItem.inventoryStatus = detail.inventoryStatus; - detail.fromPackingNumber = detail.packingNumber; - detail.toPackingNumber = detail.packingNumber; + submitItem.fromPackingNumber = detail.packingNumber; + submitItem.toPackingNumber = detail.packingNumber; - detail.fromContainerNumber = detail.containerNumber; - detail.toContainerNumber = detail.containerNumber + submitItem.fromContainerNumber = detail.containerNumber; + submitItem.toContainerNumber = detail.containerNumber - detail.fromBatch = detail.batch; - detail.toBatch = detail.batch; + submitItem.fromBatch = detail.batch; + submitItem.toBatch = detail.batch; - detail.fromLocationCode = detail.locationCode; - detail.toLocationCode = ""; + submitItem.fromLocationCode = detail.locationCode; + submitItem.toLocationCode = ""; - detail.reason = this.reasonCode; - subList.push(detail) + submitItem.reason = this.reasonCode; + submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.package =""; + + subList.push(submitItem) } }) }) diff --git a/pages/unPlanned/record/receiptRecord.vue b/pages/unPlanned/record/receiptRecord.vue index 99f50cc0..2d2e3353 100644 --- a/pages/unPlanned/record/receiptRecord.vue +++ b/pages/unPlanned/record/receiptRecord.vue @@ -67,6 +67,7 @@ import { goHome, updateTitle, + deepCopyData, getPackingNumberAndBatchByList } from '@/common/basic.js'; @@ -308,31 +309,35 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { + var submitItem = deepCopyData(detail) var info = getPackingNumberAndBatchByList(this.managementList, detail.label.itemCode, detail.label.packingNumber, detail.toLocationCode, detail.label.batch); - detail.itemCode = detail.package.itemCode; - detail.itemName = detail.package.itemName; - detail.itemDesc1 = detail.package.itemDesc1; - detail.itemDesc2 = detail.package.itemDesc2; + submitItem.itemCode = detail.package.itemCode; + submitItem.itemName = detail.package.itemName; + submitItem.itemDesc1 = detail.package.itemDesc1; + submitItem.itemDesc2 = detail.package.itemDesc2; - detail.inventoryStatus = detail.inventoryStatus; + submitItem.inventoryStatus = detail.inventoryStatus; - detail.fromPackingNumber = info.packingNumber; - detail.toPackingNumber = info.packingNumber; + submitItem.fromPackingNumber = info.packingNumber; + submitItem.toPackingNumber = info.packingNumber; // detail.fromContainerNumber = detail.containerNumber; // detail.toContainerNumber = detail.containerNumber - detail.fromBatch = info.batch; - detail.toBatch = info.batch; + submitItem.fromBatch = info.batch; + submitItem.toBatch = info.batch; - detail.fromLocationCode = ""; - detail.toLocationCode = detail.toLocationCode; + submitItem.fromLocationCode = ""; + submitItem.toLocationCode = detail.toLocationCode; - detail.reason = this.reasonCode; + submitItem.reason = this.reasonCode; - subList.push(detail) + submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.package =""; + + subList.push(submitItem) } }) })