From 6874d3d63b0839cd9b3322ae1a0a12377f659d43 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 11 Dec 2023 16:30:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93=E3=80=81?= =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=85=A5=E5=BA=93=E4=BB=BB=E5=8A=A1=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/inspect/job/inspectFullDetail.vue | 4 -- pages/issue/coms/comScanIssuePack.vue | 69 +------------------------ pages/transfer/job/issueDetail.vue | 2 +- pages/transfer/job/receiptDetail.vue | 33 +++++++----- 4 files changed, 21 insertions(+), 87 deletions(-) diff --git a/pages/inspect/job/inspectFullDetail.vue b/pages/inspect/job/inspectFullDetail.vue index 2d3cb0b0..bdab4d99 100644 --- a/pages/inspect/job/inspectFullDetail.vue +++ b/pages/inspect/job/inspectFullDetail.vue @@ -99,7 +99,6 @@ }, onLoad(option) { this.id = option.id; - if (this.id != undefined) { // //新建的任务自动接收 if (option.status == "1") { @@ -336,7 +335,6 @@ return; } //如果是全检，必须全部扫描 - if (this.inspectType == "FULL") { if (this.scanCount == this.subList.length) { this.submitJob(); } else { @@ -349,8 +347,6 @@ } }); } - } - }, submitJob() { diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue index cbc52bc9..ebfe2b32 100644 --- a/pages/issue/coms/comScanIssuePack.vue +++ b/pages/issue/coms/comScanIssuePack.vue @@ -215,74 +215,7 @@ this.showErrorMessage('发料库位【' + fromlocation + '】不存在') } }, - onScan1(result) { - try { - let that = this; - if (that.fromLocationCode == '') { - that.showErrorMessage('请选择来源库位', res => { - that.$refs.toLocationCombox.onFocus(); - }); - return; - } - let packageInfo = result.package; - let itemCode = result.label.itemCode; - let packingCode = result.label.packingNumber; - let lot = result.label.batch; - - - that.dataContent.forEach(l => { - let item = l.Items.find(r => r.itemCode == itemCode); - if (item == undefined) { - continue; - // that.showErrorMessage('未查找到零件【' + itemCode + '】的发料明细', - // res => { - // that.getfocus(); - // } - // ) - // return; - } else { - //查找库存信息 - uni.showLoading({ - title: '加载中', - mask: true - }) - - - - - - - getBalanceByManagementPrecision(result.label, that.fromLocationCode, that - .fromInventoryStatuses, - balanceRes => { - if (balanceRes.success) { - if (balanceRes.data.list.length == 0) { - this.showErrorMessage('在来源库位[' + this.fromLocationCode + - '],未查找到该包装的库存记录', - res => { - this.packGetFocus(); - }) - } else if (balanceRes.data.list.length == 1) { - let balance = balanceRes.data.list[0]; - this.afterGetBalance(result.label, balance, packageInfo); - } else { - this.showBalanceSelect(balanceRes.data.list); - } - } else { - this.showErrorMessage(balanceRes.message.message); - } - uni.hideLoading(); - }); - } - - - }) - - } catch (e) { - this.showErrorMessage(e.stack) - uni.hideLoading(); - } - }, + onScan(result) { try { diff --git a/pages/transfer/job/issueDetail.vue b/pages/transfer/job/issueDetail.vue index 69f6bdd2..da4d7c5b 100644 --- a/pages/transfer/job/issueDetail.vue +++ b/pages/transfer/job/issueDetail.vue @@ -355,7 +355,7 @@ transferIssueJobSubmit(params).then(res => { if (res.data) { - this.showCommitSuccessMessage("提交成功
生成调拨出库记录" + res.data.Number ) + this.showCommitSuccessMessage("提交成功
生成调拨出库记录" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/pages/transfer/job/receiptDetail.vue b/pages/transfer/job/receiptDetail.vue index 152785f0..7288144a 100644 --- a/pages/transfer/job/receiptDetail.vue +++ b/pages/transfer/job/receiptDetail.vue @@ -276,7 +276,8 @@ ']不一致,是否继续入库?', res => { if (res) { itemDetail.scaned = true; - itemDetail.handleQty = result.label.qty + itemDetail.handleQty = result.label.qty; + itemDetail.toInventoryStatus = result.balance.inventoryStatus itemDetail.balance = result.balance; itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.stdPackQty = result.package.stdPackQty @@ -288,7 +289,8 @@ }); } else { itemDetail.scaned = true; - itemDetail.handleQty = result.label.qty + itemDetail.handleQty = result.label.qty; + itemDetail.toInventoryStatus = result.balance.inventoryStatus itemDetail.balance = result.balance; itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.stdPackQty = result.package.stdPackQty @@ -339,6 +341,7 @@ }, submitJob() { + uni.showLoading({ title: "提交中....", mask: true @@ -360,18 +363,18 @@ this.managementList = res.list; var params = this.setParams() console.log("提交参数", JSON.stringify(params)); - - // transferReceiptJobSubmit(params).then(res => { - // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成调拨入库记录" + res.data) - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // uni.hideLoading() - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) + transferReceiptJobSubmit(params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功
生成调拨入库记录
" + res.data) + } else { + this.showErrorMessage("提交失败[" + res.msg + "]") + } + + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) } else { uni.hideLoading(); this.showErrorMessage(res.message); @@ -389,6 +392,8 @@ var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, detail.packingNumber, detail.batch); detail.toPackingNumber = info.packingNumber; + detail.toContainerNumber = ''; + detail.toLocationCode = this.toLocationCode; detail.toBatch = info.batch; subList.push(detail) }