From c6bd7e31093b098cb6a9ae66af56e429abfa128f Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 8 Jan 2024 09:28:40 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2catch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index 994e23b6..b61426e0 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -193,6 +193,8 @@ }) this.$forceUpdate() + }).catch(res=>{ + console.log("获取消息失败",res) }); }, @@ -326,7 +328,8 @@ if (res.data.length > 0) { uni.setStorageSync("dictionary", res.data) } - + }).catch(res=>{ + console.log("获取字典失败",res) }) }, From bab76aa714923d74f3ff79a6699b26c3c6856a98 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 9 Jan 2024 09:47:38 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E6=96=99?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/repleinsh/coms/comScanReplishPack.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/repleinsh/coms/comScanReplishPack.vue b/pages/repleinsh/coms/comScanReplishPack.vue index 7f1c369c..c5257d43 100644 --- a/pages/repleinsh/coms/comScanReplishPack.vue +++ b/pages/repleinsh/coms/comScanReplishPack.vue @@ -321,7 +321,7 @@ this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + '】的发料明细,是否要继续发料?', res => { if (res) { - let batch = that.createBatchInfo(label, balance); + let batch = that.createBatchInfo(label, balance,packageInfo); fromLocation.Batchs.unshift(batch); } }) @@ -348,15 +348,15 @@ } }, - createBatchInfo(data, balance) { + createBatchInfo(data, balance,packageInfo) { let batch = { - batch: data.lot, + batch: data.batch, qty: 0, uom: data.uom, handleQty: Number(data.qty), Records: [] } - let record = this.creatRecord(data, balance); + let record = this.creatRecord(data, balance,packageInfo); batch.Records.push(record); this.issueRecord.unshift(record) return batch; From 4165bc64ebfd326a434c16f34417d6a65efe800f Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 9 Jan 2024 10:14:16 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=A0=87=E7=AD=BE=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/issue/coms/comScanIssuePack.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue index 766ac666..6b4b6019 100644 --- a/pages/issue/coms/comScanIssuePack.vue +++ b/pages/issue/coms/comScanIssuePack.vue @@ -45,7 +45,7 @@ - From 206ace3ad989b5230845f9f6b7f46bd750359a59 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 9 Jan 2024 11:21:06 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B0=E8=B4=A7?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E4=B8=8D=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/inspect/job/inspectDetail.vue | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue index dd258838..6e6c8033 100644 --- a/pages/inspect/job/inspectDetail.vue +++ b/pages/inspect/job/inspectDetail.vue @@ -466,16 +466,18 @@ detail.toInventoryStatus = "NOK" } } - - } else { - detail.sampleQty = detail.qty; - detail.failedQty = 0; - detail.crackQty = 0; - detail.notPassedQty = 0; - detail.goodQty = detail.qty; - detail.inspectUser = this.$store.state.user.id - detail.toInventoryStatus = "OK" - } + } + + // else { + // detail.sampleQty = detail.qty; + // detail.failedQty = 0; + // detail.crackQty = 0; + // detail.notPassedQty = 0; + // detail.handleQty = 0; + // detail.goodQty = detail.qty; + // detail.inspectUser = this.$store.state.user.id + // detail.toInventoryStatus = "OK" + // } list.push(detail) }) From 478c6aea493a0776cbc0aa490fbba9eae0694627 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 9 Jan 2024 14:49:33 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?= =?UTF-8?q?=E3=80=81=E8=A1=A5=E6=96=99=E6=89=AB=E6=8F=8F=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E6=89=B9=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/deliver/record/deliverRecord.vue | 2 +- pages/issue/coms/comScanIssuePack.vue | 6 +- pages/issue/job/issueDetail.vue | 9 +-- pages/repleinsh/coms/comScanReplishPack.vue | 5 +- pages/repleinsh/job/repleinshDetail.vue | 85 +++++++++++---------- 5 files changed, 59 insertions(+), 48 deletions(-) diff --git a/pages/deliver/record/deliverRecord.vue b/pages/deliver/record/deliverRecord.vue index f4e9945e..271de003 100644 --- a/pages/deliver/record/deliverRecord.vue +++ b/pages/deliver/record/deliverRecord.vue @@ -121,7 +121,7 @@ }, onLoad(option) { - var typeCode = "DeliverRecord" + var typeCode = "Deliver" getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue index 6b4b6019..d594bcef 100644 --- a/pages/issue/coms/comScanIssuePack.vue +++ b/pages/issue/coms/comScanIssuePack.vue @@ -321,11 +321,15 @@ ) } } else { - if (this.jobContent.AllowModifyBatch == null) { + if (this.jobContent.allowModifyBatch == "TRUE") { this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + '】的发料明细,是否要继续发料?', res => { if (res) { let batch = that.createBatchInfo(label, balance,packageInfo); + //新增加的批次赋值details + if(fromLocation.Batchs.length>0){ + batch.detail = fromLocation.Batchs[0].detail; + } fromLocation.Batchs.unshift(batch); } }) diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue index d8641f96..015ff2df 100644 --- a/pages/issue/job/issueDetail.vue +++ b/pages/issue/job/issueDetail.vue @@ -277,7 +277,7 @@ }, setParams() { - var subList = [] + var commitSubList = [] var createTime = getCurrDateTime(); var creator = this.$store.state.user.id this.detailSource.forEach(toLocationCode => { @@ -286,8 +286,8 @@ fromLocation.Batchs.forEach(batch => { let subItem = batch.detail; if(subItem!=undefined){ - subItem.recordList = []; if (batch.Records.length > 0) { + subItem.recordList = []; batch.Records.forEach(r => { let record = {}; record.handleQty = r.qty; @@ -324,15 +324,14 @@ } subItem.recordList.push(record); }) - subList.push(subItem); + commitSubList.push(subItem); } } }) }) }) }) - - this.jobContent.subList = subList + this.jobContent.subList = commitSubList this.jobContent.createTime = createTime; this.jobContent.creator = creator; return this.jobContent; diff --git a/pages/repleinsh/coms/comScanReplishPack.vue b/pages/repleinsh/coms/comScanReplishPack.vue index c5257d43..e4d95aef 100644 --- a/pages/repleinsh/coms/comScanReplishPack.vue +++ b/pages/repleinsh/coms/comScanReplishPack.vue @@ -317,11 +317,14 @@ ) } } else { - if (this.jobContent.AllowModifyBatch == null) { + if (this.jobContent.allowModifyBatch == "TRUE") { this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + '】的发料明细,是否要继续发料?', res => { if (res) { let batch = that.createBatchInfo(label, balance,packageInfo); + if(fromLocation.Batchs.length>0){ + batch.detail = fromLocation.Batchs[0].detail; + } fromLocation.Batchs.unshift(batch); } }) diff --git a/pages/repleinsh/job/repleinshDetail.vue b/pages/repleinsh/job/repleinshDetail.vue index 019cd3dd..087d491f 100644 --- a/pages/repleinsh/job/repleinshDetail.vue +++ b/pages/repleinsh/job/repleinshDetail.vue @@ -252,7 +252,7 @@ }, setParams() { - var subList = [] + var commitSubList = [] var createTime = getCurrDateTime(); var creator = this.$store.state.user.id this.detailSource.forEach(toLocationCode => { @@ -260,52 +260,57 @@ item.Locations.forEach(fromLocation => { fromLocation.Batchs.forEach(batch => { let subItem = batch.detail; - subItem.recordList = []; - if (batch.Records.length > 0) { - batch.Records.forEach(r => { - let record = {}; - record.handleQty = r.qty; - - record.fromPackingNumber = r - .packingNumber; - record.fromBatch = r.batch; - record.fromContainerNumber = r - .ContainerNumber; - - record.toContainerNumber = r - .ContainerNumber; - record.toInventoryStatus = r - .inventoryStatus; - record.toLocationCode = this - .toLocationCode; - record.supplierCode = r.supplierCode; - - //使用在途库不改变管理模式 - if (this.jobContent.useOnTheWayLocation == - 'TRUE') { - record.toPackingNumber = r - .packingNumber; - record.toBatch = r.batch; - } else { - var info = getPackingNumberAndBatch( - this.managementList, r - .itemCode, - r.packingNumber, r - .batch); - record.toPackingNumber = info + + if (subItem != undefined) { + if (batch.Records.length > 0) { + subItem.recordList = []; + batch.Records.forEach(r => { + let record = {}; + record.handleQty = r.qty; + + record.fromPackingNumber = r .packingNumber; - record.toBatch = info.batch; - } - subItem.recordList.push(record); - }) - subList.push(subItem); + record.fromBatch = r.batch; + record.fromContainerNumber = r + .ContainerNumber; + + record.toContainerNumber = r + .ContainerNumber; + record.toInventoryStatus = r + .inventoryStatus; + record.toLocationCode = this + .toLocationCode; + record.supplierCode = r.supplierCode; + + //使用在途库不改变管理模式 + if (this.jobContent + .useOnTheWayLocation == + 'TRUE') { + record.toPackingNumber = r + .packingNumber; + record.toBatch = r.batch; + } else { + var info = + getPackingNumberAndBatch( + this.managementList, r + .itemCode, + r.packingNumber, r + .batch); + record.toPackingNumber = info + .packingNumber; + record.toBatch = info.batch; + } + subItem.recordList.push(record); + }) + commitSubList.push(subItem); + } } }) }) }) }) - this.jobContent.subList = subList + this.jobContent.subList = commitSubList this.jobContent.createTime = createTime; this.jobContent.creator = creator; return this.jobContent; From 34f26ca984a085a397f4cb47921219558e95ffd4 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 9 Jan 2024 15:38:14 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/customerReturn/record/returnRecord.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pages/customerReturn/record/returnRecord.vue b/pages/customerReturn/record/returnRecord.vue index 41d0fe8d..fc4f596a 100644 --- a/pages/customerReturn/record/returnRecord.vue +++ b/pages/customerReturn/record/returnRecord.vue @@ -388,6 +388,11 @@ }, getToLocationCode(location, code) { this.toLocationCode = code; + this.detailSource.forEach(item => { + item.subList.forEach(detail => { + detail.toLocationCode = code + }) + }) }, showCommitSuccessMessage(hint) { From 7f6036b54d79461ecf4acb00cc327d78e66fee21 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 10 Jan 2024 11:04:30 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=92=8C=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/customerReturn/record/returnRecord.vue | 50 +++++++++++--------- pages/scrap/record/scrapRecord.vue | 41 +++++++++------- 2 files changed, 52 insertions(+), 39 deletions(-) diff --git a/pages/customerReturn/record/returnRecord.vue b/pages/customerReturn/record/returnRecord.vue index fc4f596a..3dc6a45e 100644 --- a/pages/customerReturn/record/returnRecord.vue +++ b/pages/customerReturn/record/returnRecord.vue @@ -56,7 +56,8 @@ import { goHome, updateTitle, - getPackingNumberAndBatchByList + getPackingNumberAndBatchByList, + deepCopyData } from '@/common/basic.js'; import { @@ -323,27 +324,32 @@ 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; - - detail.inventoryStatus = detail.inventoryStatus; - detail.toInventoryStatus = detail.inventoryStatus; - - detail.fromPackingNumber = info.packingNumber; - detail.toPackingNumber = info.packingNumber; - - detail.fromContainerNumber = detail.containerNumber; - detail.toContainerNumber = detail.containerNumber - - detail.fromBatch = info.batch; - detail.toBatch = info.batch; - - detail.fromLocationCode = detail.locationCode; - detail.toLocationCode = detail.toLocationCode; - - subList.push(detail) + var submitItem = deepCopyData(detail) + + submitItem.itemCode = detail.itemCode; + submitItem.itemName = detail.package.itemName; + submitItem.itemDesc1 = detail.package.itemDesc1; + submitItem.itemDesc2 = detail.package.itemDesc2; + + submitItem.inventoryStatus = detail.inventoryStatus; + submitItem.toInventoryStatus = detail.inventoryStatus; + + submitItem.fromPackingNumber = info.packingNumber; + submitItem.toPackingNumber = info.packingNumber; + + submitItem.fromContainerNumber = detail.containerNumber; + submitItem.toContainerNumber = detail.containerNumber + + submitItem.fromBatch = info.batch; + submitItem.toBatch = info.batch; + + 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/scrap/record/scrapRecord.vue b/pages/scrap/record/scrapRecord.vue index 6f6a2871..421d14b1 100644 --- a/pages/scrap/record/scrapRecord.vue +++ b/pages/scrap/record/scrapRecord.vue @@ -19,6 +19,7 @@ @@ -55,6 +56,7 @@ import { goHome, + deepCopyData } from '@/common/basic.js'; import { @@ -274,30 +276,34 @@ 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; - 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) } }) }) + this.dataContent.subList =subList this.dataContent.creator = creator; return this.dataContent; @@ -337,12 +343,13 @@ }) }, clearData(){ - this.reasonCode = "" + this.reasonCode = ""; + this.fromLocationCode = ""; this.reasonText = ""; this.detailSource = []; - this.subList =[]; - this.managementList =[]; - this.dataContent ={} + this.subList = []; + this.managementList = []; + this.dataContent = {} }, updateData() { From a6dba9f145dc94a214ff29af2c1bf9e7cafe7c00 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 10 Jan 2024 11:30:51 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=9F=E6=96=99?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/putaway/record/putawayRecord.vue | 33 ++++++++++++++------------ 1 file changed, 18 insertions(+), 15 deletions(-) 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; }, From 478628aa87374d291e1a1c16aea21d58a605100b Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 10 Jan 2024 14:37:24 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F=E8=B5=8B=E5=80=BC=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/deliver/record/deliverRecord.vue | 39 +++++++++-------- .../record/productPutawayRecord.vue | 41 +++++++++++------- .../record/productReceiptRecord.vue | 41 ++++++++++-------- .../record/productionReceiptRecord.vue | 1 + .../productionReturn/record/returnToHold.vue | 42 ++++++++++--------- .../productionReturn/record/returnToStore.vue | 37 ++++++++-------- pages/purchaseReturn/record/returnRecord.vue | 33 ++++++++------- pages/transfer/coms/comTransferRecord.vue | 35 +++++++++------- pages/unPlanned/record/issueRecord.vue | 37 +++++++++------- pages/unPlanned/record/receiptRecord.vue | 31 ++++++++------ 10 files changed, 190 insertions(+), 147 deletions(-) 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) } }) }) From 971c74e794e00f233658a27ebcfb2be8fd98d05c Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 10 Jan 2024 15:03:30 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mycomponents/qty/compareQty.vue | 13 +++++++++---- pages/count/job/countDetail.vue | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mycomponents/qty/compareQty.vue b/mycomponents/qty/compareQty.vue index 28023229..bb48340f 100644 --- a/mycomponents/qty/compareQty.vue +++ b/mycomponents/qty/compareQty.vue @@ -3,7 +3,7 @@ - + {{Number(handleQty)}} @@ -15,13 +15,13 @@ - / + / {{Number(recommendQty)}} - + @@ -80,7 +80,12 @@ } }, watch: { - + handleQty: { + handler(newName, oldName) { + }, + immediate: true, + deep: true + } }, methods: { diff --git a/pages/count/job/countDetail.vue b/pages/count/job/countDetail.vue index 804f99f3..a53bfe42 100644 --- a/pages/count/job/countDetail.vue +++ b/pages/count/job/countDetail.vue @@ -230,6 +230,7 @@ data.scaned = false; let detail = data; detail.balanceQty = 0 + detail.handleQty = 0; detail.inventoryStatus = detail.inventoryStatus detail.fromLocationCode = this.fromLocationCode return detail; From d31c9eca84817981c3cb6fe8a17b6cf8430df886 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 10 Jan 2024 16:00:05 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/record.js | 1 + pages/container/record/containerBindRecord.vue | 1 + pages/container/record/containerUnBindRecord.vue | 1 + pages/customerReturn/record/returnRecord.vue | 2 +- pages/deliver/record/deliverRecord.vue | 2 +- pages/productPutaway/record/productPutawayRecord.vue | 2 +- pages/productReceipt/record/productReceiptRecord.vue | 3 ++- pages/productionReturn/coms/comReturn.vue | 2 +- pages/productionReturn/record/returnToHold.vue | 3 ++- pages/productionReturn/record/returnToStore.vue | 3 ++- pages/purchaseReturn/record/returnRecord.vue | 2 +- pages/putaway/record/putawayRecord.vue | 2 +- pages/scrap/record/scrapRecord.vue | 2 +- pages/transfer/coms/comTransferRecord.vue | 2 +- pages/transfer/job/transferDetail.vue | 2 ++ pages/unPlanned/record/issueRecord.vue | 2 +- pages/unPlanned/record/receiptRecord.vue | 3 ++- 17 files changed, 22 insertions(+), 13 deletions(-) diff --git a/common/record.js b/common/record.js index 6b310f39..8980df6c 100644 --- a/common/record.js +++ b/common/record.js @@ -30,6 +30,7 @@ export function createDetailInfo(data, pack) { detail.balanceQty = Number(detail.qty) detail.stdPackQty = Number(pack.stdPackQty) detail.stdPackUnit = pack.stdPackUnit + detail.handleQty =0; detail.package = pack; return detail; diff --git a/pages/container/record/containerBindRecord.vue b/pages/container/record/containerBindRecord.vue index 9429a8b9..2b132196 100644 --- a/pages/container/record/containerBindRecord.vue +++ b/pages/container/record/containerBindRecord.vue @@ -260,6 +260,7 @@ data.scaned = false; data.packingNumber = data.contentNumber data.qty = Number(data.qty) + data.handleQty = 0; let detail = data; return detail; }, diff --git a/pages/container/record/containerUnBindRecord.vue b/pages/container/record/containerUnBindRecord.vue index 8a337130..cd1e1ffa 100644 --- a/pages/container/record/containerUnBindRecord.vue +++ b/pages/container/record/containerUnBindRecord.vue @@ -205,6 +205,7 @@ data.scaned = false; data.packingNumber = data.contentNumber data.qty = Number(data.qty) + data.handleQty =0; let detail = data; return detail; }, diff --git a/pages/customerReturn/record/returnRecord.vue b/pages/customerReturn/record/returnRecord.vue index 3dc6a45e..9a9e3d4a 100644 --- a/pages/customerReturn/record/returnRecord.vue +++ b/pages/customerReturn/record/returnRecord.vue @@ -346,7 +346,7 @@ submitItem.fromLocationCode = detail.locationCode; submitItem.toLocationCode = detail.toLocationCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) diff --git a/pages/deliver/record/deliverRecord.vue b/pages/deliver/record/deliverRecord.vue index b3dc640b..fa16f8c0 100644 --- a/pages/deliver/record/deliverRecord.vue +++ b/pages/deliver/record/deliverRecord.vue @@ -380,7 +380,7 @@ submitItem.fromLocationCode = detail.locationCode; submitItem.toLocationCode = detail.toLocationCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) diff --git a/pages/productPutaway/record/productPutawayRecord.vue b/pages/productPutaway/record/productPutawayRecord.vue index ea503e70..644abbca 100644 --- a/pages/productPutaway/record/productPutawayRecord.vue +++ b/pages/productPutaway/record/productPutawayRecord.vue @@ -335,7 +335,7 @@ submitItem.fromLocationCode = detail.locationCode; submitItem.toLocationCode = detail.toLocationCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) } diff --git a/pages/productReceipt/record/productReceiptRecord.vue b/pages/productReceipt/record/productReceiptRecord.vue index 9cf94eda..dd183d9e 100644 --- a/pages/productReceipt/record/productReceiptRecord.vue +++ b/pages/productReceipt/record/productReceiptRecord.vue @@ -195,6 +195,7 @@ Object.assign(detail, label) detail.scaned = true; detail.qty = Number(label.qty); + detail.handleQty = 0; detail.inventoryStatus = "OK" detail.stdPackQty = pack.stdPackQty; detail.stdPackUnit = pack.stdPackUnit; @@ -326,7 +327,7 @@ submitItem.productionlineCode = this.productionLineCode; submitItem.workStationCode = this.workStationCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) diff --git a/pages/productionReturn/coms/comReturn.vue b/pages/productionReturn/coms/comReturn.vue index 911f9571..c8efa490 100644 --- a/pages/productionReturn/coms/comReturn.vue +++ b/pages/productionReturn/coms/comReturn.vue @@ -226,7 +226,7 @@ detail.inventoryStatus = this.businessTypeCode == 'ReturnToStore' ? "OK" : "HOLD" detail.stdPackQty = pack.stdPackQty; detail.stdPackUnit = pack.stdPackUnit; - + detail.handleQty = 0; detail.package = pack; detail.label = label; return detail; diff --git a/pages/productionReturn/record/returnToHold.vue b/pages/productionReturn/record/returnToHold.vue index 788bd62a..8833f5d5 100644 --- a/pages/productionReturn/record/returnToHold.vue +++ b/pages/productionReturn/record/returnToHold.vue @@ -230,6 +230,7 @@ Object.assign(detail, label) detail.scaned = true; detail.qty = Number(label.qty); + detail.handleQty = 0; detail.inventoryStatus = "OK" detail.stdPackQty = pack.stdPackQty; detail.stdPackUnit = pack.stdPackUnit; @@ -417,7 +418,7 @@ submitItem.productionlineCode = this.productionLineCode; submitItem.workStationCode = this.workStationCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; subList.push(submitItem) } diff --git a/pages/productionReturn/record/returnToStore.vue b/pages/productionReturn/record/returnToStore.vue index 253bfd64..c4214847 100644 --- a/pages/productionReturn/record/returnToStore.vue +++ b/pages/productionReturn/record/returnToStore.vue @@ -231,6 +231,7 @@ Object.assign(detail, label) detail.scaned = true; detail.qty = Number(label.qty); + detail.handleQty =0; detail.inventoryStatus = "OK" detail.stdPackQty = pack.stdPackQty; detail.stdPackUnit = pack.stdPackUnit; @@ -446,7 +447,7 @@ submitItem.productionlineCode = this.productionLineCode; submitItem.workStationCode = this.workStationCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; subList.push(submitItem) } }) diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue index 18178c36..5d5a76af 100644 --- a/pages/purchaseReturn/record/returnRecord.vue +++ b/pages/purchaseReturn/record/returnRecord.vue @@ -290,7 +290,7 @@ submitItem.fromLocationCode = this.fromLocationCode; submitItem.toLocationCode = ''; //采购退货直接出库，目标库位为空 - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package = ""; subList.push(submitItem) } diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue index b7497340..fc381f0e 100644 --- a/pages/putaway/record/putawayRecord.vue +++ b/pages/putaway/record/putawayRecord.vue @@ -381,7 +381,7 @@ // detail.toInventoryStatus = detail.inventoryStatus // detail.toLocationCode = detail.toLocationCode - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package = ""; subList.push(submitItem) } diff --git a/pages/scrap/record/scrapRecord.vue b/pages/scrap/record/scrapRecord.vue index 421d14b1..827a5728 100644 --- a/pages/scrap/record/scrapRecord.vue +++ b/pages/scrap/record/scrapRecord.vue @@ -297,7 +297,7 @@ submitItem.toLocationCode = ""; submitItem.reason = this.reasonCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) } diff --git a/pages/transfer/coms/comTransferRecord.vue b/pages/transfer/coms/comTransferRecord.vue index a4002787..e3dbd8ba 100644 --- a/pages/transfer/coms/comTransferRecord.vue +++ b/pages/transfer/coms/comTransferRecord.vue @@ -361,7 +361,7 @@ submitItem.fromLocationCode = detail.locationCode; submitItem.toLocationCode = detail.toLocationCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) diff --git a/pages/transfer/job/transferDetail.vue b/pages/transfer/job/transferDetail.vue index a1eee5e7..33d6ed75 100644 --- a/pages/transfer/job/transferDetail.vue +++ b/pages/transfer/job/transferDetail.vue @@ -221,7 +221,9 @@ createDetailInfo(data) { data.scaned = false; // data.record = {}; + let detail = data; + detail.handleQty = 0, return detail; }, diff --git a/pages/unPlanned/record/issueRecord.vue b/pages/unPlanned/record/issueRecord.vue index 0cdbc6e7..052033f6 100644 --- a/pages/unPlanned/record/issueRecord.vue +++ b/pages/unPlanned/record/issueRecord.vue @@ -255,7 +255,7 @@ submitItem.toLocationCode = ""; submitItem.reason = this.reasonCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) diff --git a/pages/unPlanned/record/receiptRecord.vue b/pages/unPlanned/record/receiptRecord.vue index 2d2e3353..f61f657c 100644 --- a/pages/unPlanned/record/receiptRecord.vue +++ b/pages/unPlanned/record/receiptRecord.vue @@ -183,6 +183,7 @@ detail.scaned = true; // Object.assign(detail, label) detail.qty = Number(label.qty) + detail.handleQty = 0, detail.inventoryStatus = "OK" detail.stdPackQty = pack.stdPackQty; detail.stdPackUnit = pack.stdPackUnit; @@ -334,7 +335,7 @@ submitItem.reason = this.reasonCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) From 8d80228f5b1bf13133d0a1111844e388e4653de9 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 10 Jan 2024 17:03:21 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/transfer/coms/comTransferRecord.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pages/transfer/coms/comTransferRecord.vue b/pages/transfer/coms/comTransferRecord.vue index e3dbd8ba..3367e37b 100644 --- a/pages/transfer/coms/comTransferRecord.vue +++ b/pages/transfer/coms/comTransferRecord.vue @@ -417,6 +417,11 @@ // return // } this.toLocationCode = code; + this.detailSource.forEach(item => { + item.subList.forEach(detail => { + detail.toLocationCode = code + }) + }) }, showCommitSuccessMessage(hint) { From 216a67e5e3a974baf1c8ee0e3f2792b4b08e33ba Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 11 Jan 2024 13:23:56 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/inventoryMove/coms/comMoveRecord.vue | 104 ++++++++++-------- pages/inventoryMove/coms/comMovebalance.vue | 12 +- .../inventoryMove/record/oktoScrapRecord.vue | 2 +- 3 files changed, 65 insertions(+), 53 deletions(-) diff --git a/pages/inventoryMove/coms/comMoveRecord.vue b/pages/inventoryMove/coms/comMoveRecord.vue index 14e52727..7d835a77 100644 --- a/pages/inventoryMove/coms/comMoveRecord.vue +++ b/pages/inventoryMove/coms/comMoveRecord.vue @@ -23,7 +23,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationTypeList="tolocationTypeList" :isShowEdit="isShowEditLocation"> @@ -63,7 +63,8 @@ } from '@/common/balance.js'; import { - getPackingNumberAndBatchByList + getPackingNumberAndBatchByList, + deepCopyData } from '@/common/basic.js'; import { @@ -124,6 +125,7 @@ dataContent: {}, fromlocationTypeList: [], tolocationTypeList: [], + isShowEditLocation:false } }, @@ -139,29 +141,11 @@ } }); this.initData(); + this.getLocationInfo(); }, onLoad() { - if (this.toLocationCode != '') { - getBasicLocationByCode(this.toLocationCode).then(res => { - if (res.data.total > 0) { - let result = res.data.list[0]; - var type = result.type; - var available = result.available; - if (available == "TRUE") { - this.toLocationInfo = res.data.list[0]; - } else { - this.showErrorMessage("扫描库位[" + this.code + "]不可用") - } - } else { - this.showErrorMessage('库位[' + this.toLocationCode + ']不存在') - } - - }).catch(error => { - uni.hideLoading(); - this.showErrorMessage(error) - }) - } + }, methods: { @@ -170,10 +154,12 @@ this.title = "库存转移记录"; this.toInventoryStatus = "" this.toLocationCode = "" + this.isShowEditLocation =true; } else if (this.businessTypeCode == "HoldToOk") { this.title = "隔离转合格记录"; this.toInventoryStatus = "OK" - this.toLocationCode = "OK" + this.toLocationCode = "" + this.isShowEditLocation =true; } else if (this.businessTypeCode == "HoldToScrap") { this.title = "隔离转报废记录"; this.toInventoryStatus = "SCRAP" @@ -182,10 +168,10 @@ this.title = "合格转隔离记录"; this.toInventoryStatus = "HOLD" this.toLocationCode = "HOLD" - } else if (this.businessTypeCode == "OktoScrap") { + } else if (this.businessTypeCode == "OkToScrap") { this.title = "合格转报废记录"; this.toInventoryStatus = "SCRAP" - this.toLocationCode = "HOLD" + this.toLocationCode = "SCRAP" } else if (this.businessTypeCode == "ScrapToHold") { this.title = "报废转隔离记录"; this.toInventoryStatus = "HOLD" @@ -195,6 +181,29 @@ title: this.title }) }, + getLocationInfo(){ + if (this.toLocationCode != "") { + getBasicLocationByCode(this.toLocationCode).then(res => { + if (res.data.total > 0) { + let result = res.data.list[0]; + var type = result.type; + var available = result.available; + if (available == "TRUE") { + this.toLocationInfo = res.data.list[0]; + } else { + this.showErrorMessage("扫描库位[" + this.code + "]不可用") + } + } else { + this.showErrorMessage('库位[' + this.toLocationCode + ']不存在') + } + + }).catch(error => { + uni.hideLoading(); + this.showErrorMessage(error) + }) + } + }, + openScanPopup() { if (this.fromLocationCode == "") { this.showFromLocationPopup(); @@ -230,13 +239,14 @@ // newDetail.inventoryStatus = balance.inventoryStatus; newDetail.toInventoryStatus = this.toInventoryStatus; newDetail.toLocationCode = this.toLocationCode; + newDetail.fromLocationCode = result.fromLocationCode itemp.subList.push(newDetail); this.detailSource.push(itemp) } else { var detail = item.subList.find(r => { if (r.packingNumber == balance.packingNumber && r.batch == balance.batch && - r.locationCode == balance.locationCode && + r.fromLocationCode == balance.locationCode && r.inventoryStatus == balance.inventoryStatus && r.scaned == true) { return r; @@ -248,6 +258,7 @@ // newDetail.inventoryStatus = balance.inventoryStatus; newDetail.toInventoryStatus = this.toInventoryStatus; newDetail.toLocationCode = this.toLocationCode; + newDetail.fromLocationCode = result.fromLocationCode item.subList.push(newDetail); } else { this.showErrorMessage(balance.packingNumber + "已经在列表中") @@ -326,7 +337,7 @@ inventoryMoveRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成" + this.title + "记录
" + + this.showCommitSuccessMessage("提交成功
生成" + this.title + "
" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") @@ -386,32 +397,33 @@ if (detail.scaned) { var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode, detail.packingNumber, detail.toLocationCode, detail.batch); - var subItem = {}; - Object.assign(subItem, detail) - subItem.itemCode = detail.itemCode; - subItem.itemName = detail.package.itemName; - subItem.itemDesc1 = detail.package.itemDesc1; - subItem.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; - subItem.fromInventoryStatus = detail.inventoryStatus; - subItem.toInventoryStatus = detail.toInventoryStatus; + submitItem.fromInventoryStatus = detail.inventoryStatus; + submitItem.toInventoryStatus = detail.toInventoryStatus; - subItem.fromPackingNumber = info.packingNumber; - subItem.toPackingNumber = info.packingNumber; + submitItem.fromPackingNumber = info.packingNumber; + submitItem.toPackingNumber = info.packingNumber; - subItem.fromContainerNumber = detail.containerNumber; - subItem.toContainerNumber = detail.containerNumber + submitItem.fromContainerNumber = detail.containerNumber; + submitItem.toContainerNumber = detail.containerNumber - subItem.fromBatch = info.batch; - subItem.toBatch = info.batch; + submitItem.fromBatch = info.batch; + submitItem.toBatch = info.batch; - subItem.fromLocationCode = detail.locationCode; - subItem.toLocationCode = detail.toLocationCode; + submitItem.fromLocationCode = detail.fromLocationCode; + submitItem.toLocationCode = detail.toLocationCode; - subItem.package = null; - subItem.Records = null; + submitItem.package = null; + submitItem.Records = null; + + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; - subList.push(subItem) + subList.push(submitItem) } }) }) diff --git a/pages/inventoryMove/coms/comMovebalance.vue b/pages/inventoryMove/coms/comMovebalance.vue index e04d8923..3aebfeb9 100644 --- a/pages/inventoryMove/coms/comMovebalance.vue +++ b/pages/inventoryMove/coms/comMovebalance.vue @@ -6,14 +6,14 @@ - + - - + + diff --git a/pages/inventoryMove/record/oktoScrapRecord.vue b/pages/inventoryMove/record/oktoScrapRecord.vue index ac309332..dfa24f3a 100644 --- a/pages/inventoryMove/record/oktoScrapRecord.vue +++ b/pages/inventoryMove/record/oktoScrapRecord.vue @@ -1,6 +1,6 @@ From 12e09e3e492bba0b021cbc6302e05f4a190c02df Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 11 Jan 2024 15:14:15 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=80=80=E6=96=99=E8=AF=A6=E7=BB=86=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mycomponents/item/itemCompareQty.vue | 4 ++-- mycomponents/recommend/recommend.vue | 8 +++++--- pages.json | 2 +- .../productionReturn/coms/comReturnDetailCard.vue | 14 +++++++++++++- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/mycomponents/item/itemCompareQty.vue b/mycomponents/item/itemCompareQty.vue index 2d1ccef2..c570dcdf 100644 --- a/mycomponents/item/itemCompareQty.vue +++ b/mycomponents/item/itemCompareQty.vue @@ -1,9 +1,9 @@