From c695154058ba91f4c8750197ddc840a0208ff8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com> Date: Mon, 28 Oct 2024 10:39:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=202024/8/6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/coms/comScanIssuePack.vue | 98 ++++++++++++----------- src/pages/issue/job/issueDetail.vue | 7 +- 2 files changed, 54 insertions(+), 51 deletions(-) diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index b200ff08..a1f76bd6 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -66,7 +66,7 @@ import { uniqueArray } from '@/common/basic.js' import { calc } from '@/common/calc.js' import { getBalanceByManagementPrecision } from '@/common/balance.js' -import { getDirectoryItemArray } from '../../../common/directory.js' +import { getDirectoryItemArray,getInventoryStatusDesc,getListLocationAreaTypeDesc } from '../../../common/directory.js' import { getLabelInfo } from '@/common/label.js' const { proxy } = getCurrentInstance() @@ -200,7 +200,51 @@ const onScanResult = (result) => { }) return }else { - queryBalance(result) + let params = { + itemCode: result.package.itemCode, + batch: result.label.batch, + packingNumber: result.label.packingNumber, + parentPackingNumber: result.package.parentNumber, + inventoryStatus: jobContent.value.outInventoryStatuses.split(','), + areaType: jobContent.value.fromAreaTypes.split(','), + bussinessCode: jobContent.value.businessType + } + uni.showLoading({ + title: '查询中', + mask: true + }) + getBalanceByParams(params).then(res => { + if (res.data.length == 0) { + let status = getInventoryStatusDesc(params.inventoryStatus) + let areaType = getListLocationAreaTypeDesc(params.areaType) + let hint = + "按物料号 [" + params.itemCode + "]
" + + "包装号 [" + params.packingNumber + "]
" + + "批次 [" + params.batch + "]
" + + "状态 [" + status + "]
" + + "库区 [" + areaType + "]
" + + "未查找到库存余额" + showErrorMessage(hint) + } else if (res.data.length == 1) { + result.balance = res.data[0] + + if (result.label.packingNumber != result.balance.packingNumber) { + result.balance.handleQty = Number(result.label.qty) + } + else + { + result.balance.handleQty = Number(result.balance.qty) + } + afterGetBalance(result.label, result.balance, result.package); + } else { + //多条记录 + balanceSelectRef.value.openPopup(res.data); + } + uni.hideLoading() + }).catch(error => { + uni.hideLoading() + showErrorMessage(error) + }) } // getBalance(result.label, packageInfoParams, (balances) => { // packageInfo.value = packageInfoParams @@ -266,49 +310,6 @@ const onScanResult = (result) => { uni.hideLoading() } } -const queryBalance = (result)=>{ - var params = { - itemCode: result.package.itemCode, - batch: result.label.batch, - packingNumber: result.label.packingNumber, - parentPackingNumber: result.package.parentNumber, - inventoryStatus: jobContent.value.outInventoryStatuses.split(','), - areaType:jobContent.value.fromAreaTypes.split(','), - bussinessCode:jobContent.value.businessType - } - uni.showLoading({ - title: '查询中', - mask: true - }) - getBalanceByParams(params).then(res => { - if (res.data.length == 0) { - var status = getInventoryStatusDesc(params.inventoryStatus) - var areaType = getListLocationAreaTypeDesc(params.areaType) - var hint = - "按物料号 [" + params.itemCode + "]
" + - "包装号 [" + params.packingNumber + "]
" + - "批次 [" + params.batch + "]
" + - "状态 [" + status + "]
" + - "库区 [" + areaType + "]
" + - "未查找到库存余额" - this.showErrorMessage(hint) - } else if (res.data.length == 1) { - - result.balance = res.data[0] - if (result.label.packingNumber != result.balance.packingNumber) { - result.balance.lableQty = Number(result.label.qty) - } - this.afterGetBalance(result.label, result.balance, result.package); - } else { - //多条记录 - this.$refs.balanceSelect.openPopup(res.data); - } - uni.hideLoading() - }).catch(error => { - uni.hideLoading() - this.showErrorMessage(error) - }) -} const getBalance = (label, packageInfoParams, callback) => { const filters = [] @@ -450,7 +451,7 @@ const afterGetBalance = (label, balance, packageInfo) => { const record = batch.Records.find((r) => r.packingNumber == packingCode) if (record == undefined) { // 如果有推荐箱码 - if (batch.Recommends.length > 0) { + if (batch.Recommends != undefined &&batch.Recommends.length > 0) { const recommend = batch.Recommends.find((r) => r.packingNumber == packingCode) if (recommend != undefined) { addRecord(batch, label, balance, packageInfo) @@ -507,7 +508,7 @@ const createBatchInfo = (data, balance, packageInfo) => { batch: data.batch, qty: 0, uom: data.uom, - handleQty: Number(data.qty), + handleQty: Number(balance.handleQty), Records: [] } const record = creatRecord(data, balance, packageInfo) @@ -526,7 +527,8 @@ const creatRecord = (label, balance, packageInfo) => { batch: label.batch, // qty: Number(balance.qty), // qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty), - qty: balance.qty ?? Number(label.qty), + qty: balance.handleQty, + handleQty:balance.handleQty, uom: balance.uom, inventoryStatus: balance.inventoryStatus, balance, diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue index 2ff3fc98..9fc6b424 100644 --- a/src/pages/issue/job/issueDetail.vue +++ b/src/pages/issue/job/issueDetail.vue @@ -206,6 +206,7 @@ const submitJob = () => { showErrorMessage('请扫描您需要提交的发料任务') return } + return issueJobSubmit(params) .then((res) => { uni.hideLoading() @@ -344,9 +345,9 @@ const afterScan = () => { submit() } else { comMessageRef.value.showQuestionMessage(`实际扫描数量【${totalHandleQty}】与物料需求数量【${item.qty}】不一致，是否继续提交`, (res) => { - // if (res) { - // submit() - // } + if (res) { + submit() + } }) } })