diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue index 62fdf419..b7497340 100644 --- a/pages/putaway/record/putawayRecord.vue +++ b/pages/putaway/record/putawayRecord.vue @@ -59,7 +59,8 @@ goHome, updateTitle, getCurrDateTime, - getPackingNumberAndBatchByList + getPackingNumberAndBatchByList, + deepCopyData } from '@/common/basic.js'; import { getInventoryStatusDesc, @@ -311,7 +312,7 @@ putawayRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成采购上架记录" + res.data, ) + this.showCommitSuccessMessage("提交成功
生成原料上架记录
" + res.data, ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } @@ -359,30 +360,30 @@ }, setRecordParams() { - this.dataContent.creator = creator; - this.dataContent.fromWarehouseCode = this.fromWarehouseCode; - var creator = this.$store.state.user.id var subList = [] + var creator = this.$store.state.user.id this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode, detail.packingNumber, detail.toLocationCode, detail.batch); - detail.toPackingNumber = info.packingNumber; - detail.toBatch = info.batch; - detail.toContainerNumber = detail.containerNumber; + var submitItem = deepCopyData(detail) + submitItem.toPackingNumber = info.packingNumber; + submitItem.toBatch = info.batch; + submitItem.toContainerNumber = detail.containerNumber; - detail.fromPackingNumber = info.packingNumber; - detail.fromBatch = info.batch; - detail.fromContainerNumber = detail.containerNumber; + submitItem.fromPackingNumber = info.packingNumber; + submitItem.fromBatch = info.batch; + submitItem.fromContainerNumber = detail.containerNumber; - detail.fromLocationCode = detail.locationCode; - detail.toLocationCode = detail.toLocationCode; + submitItem.fromLocationCode = detail.locationCode; + submitItem.toLocationCode = detail.toLocationCode; // detail.toInventoryStatus = detail.inventoryStatus // detail.toLocationCode = detail.toLocationCode - detail.package = null; - subList.push(detail) + submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.package = ""; + subList.push(submitItem) } }) }) @@ -390,6 +391,8 @@ this.dataContent.toWarehouseCode = subList[0].toWarehouseCode; } this.dataContent.subList = subList + this.dataContent.creator = creator; + this.dataContent.fromWarehouseCode = this.fromWarehouseCode; return this.dataContent; },