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