From 82eaf91bbb8f23412c4be5545d4db6cf8aab235f Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 4 Sep 2024 11:46:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E6=A0=A1=E9=AA=8C=E5=A4=A7=E5=B0=8F=E5=86=99=202024/6?= =?UTF-8?q?/26=2015:04:54?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/scan/winCheckFgLabel.vue | 2 +- src/mycomponents/scan/winScanLocation.vue | 4 ++++ src/mycomponents/scan/winScanPackAndLocation.vue | 4 ++++ .../scan/winScanPackAndLocationNoBalance.vue | 4 ++++ src/mycomponents/scan/winScanPackJob.vue | 2 +- src/pages/customerReturn/job/returnDetail.vue | 2 +- src/pages/deliver/coms/comDeliverRequestPopup.vue | 2 +- src/pages/deliver/job/deliverDetail.vue | 2 +- src/pages/inventoryMove/coms/comMoveRecord.vue | 4 ++++ src/pages/inventoryMove/job/inventoryMoveDetail.vue | 2 +- src/pages/issue/coms/comIssueRequestPopup.vue | 2 +- .../productPutaway/job/productPutawayDetail.vue | 2 +- .../productRecycle/job/productRecycleJobDetail.vue | 2 +- .../job/productionReceiptDetail.vue | 2 +- .../productionReturn/coms/comReturnRequestPopup.vue | 2 +- src/pages/purchaseReturn/job/returnDetail.vue | 2 +- src/pages/putaway/job/putawayDetail.vue | 2 +- .../repleinsh/coms/comRepleinshRequestPopup.vue | 2 +- src/pages/stockUp/job/stockUpJobDetail.vue | 2 +- src/pages/transfer/job/issueDetail.vue | 2 +- src/pages/transfer/job/receiptDetail.vue | 2 +- src/pages/transfer/job/transferDetail.vue | 12 +----------- 22 files changed, 34 insertions(+), 28 deletions(-) diff --git a/src/mycomponents/scan/winCheckFgLabel.vue b/src/mycomponents/scan/winCheckFgLabel.vue index eb6c7f3a..1d3cfcf6 100644 --- a/src/mycomponents/scan/winCheckFgLabel.vue +++ b/src/mycomponents/scan/winCheckFgLabel.vue @@ -36,7 +36,7 @@ import winComScanCustomerLabel from '@/mycomponents/scan/winComScanCustomerLabel import balanceSelect from '@/mycomponents/balance/balanceSelect.vue' import { getBalanceByManagementPrecision } from '@/common/balance.js' -import { getBasicLocationByCode, getCustomerItemList } from '@/api/request2.js' +import { getCustomerItemList } from '@/api/request2.js' import { getListLocationAreaTypeDesc, checkDirectoryItemExist, getDirectoryItemArray, getLocationAreaTypeName, getInventoryStatusDesc } from '@/common/directory.js' diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue index 4236ee3e..f4c6655d 100644 --- a/src/mycomponents/scan/winScanLocation.vue +++ b/src/mycomponents/scan/winScanLocation.vue @@ -83,6 +83,10 @@ const getScanResult = (result) => { proxy.$modal.closeLoading() if (res.data.total > 0) { const result = res.data.list[0] + if (result.code != code.value) { + showErrorMessage(`未查询到库位[${code.value}]`) + return + } const { type } = result const { areaType } = result const { available } = result diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index ad1aa8fe..850693d2 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -202,6 +202,10 @@ const scanLocation = (scanResult) => { uni.hideLoading() if (res.data.total > 0) { const result = res.data.list[0] + if (result.code != fromLocationCode.value) { + showErrorMessage(`未查询到库位[${fromLocationCode.value}]`) + return + } const type = result.areaType const { available } = result if (available == 'TRUE') { diff --git a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue index 1153f6da..21970655 100644 --- a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue +++ b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue @@ -162,6 +162,10 @@ const getScanResult = (scanResult) => { .then((res) => { if (res.data.total > 0) { const result = res.data.list[0] + if (result.code != fromLocationCode.value) { + showErrorMessage(`未查询到库位[${fromLocationCode.value}]`) + return + } const { type } = result const { available } = result if (available == 'TRUE') { diff --git a/src/mycomponents/scan/winScanPackJob.vue b/src/mycomponents/scan/winScanPackJob.vue index 225bb0b2..e8569592 100644 --- a/src/mycomponents/scan/winScanPackJob.vue +++ b/src/mycomponents/scan/winScanPackJob.vue @@ -23,7 +23,7 @@ import { ref, getCurrentInstance, nextTick } from 'vue' import winComScan from '@/mycomponents/scan/winComScan.vue' import { getBalanceByManagementPrecision } from '@/common/balance.js' -import { getBasicLocationByCode, getPutawayJobList } from '@/api/request2.js' +import { getPutawayJobList } from '@/api/request2.js' import { getListLocationTypeDesc, checkDirectoryItemExist, getDirectoryItemArray, getLocationTypeName, getInventoryStatusDesc } from '@/common/directory.js' diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue index c23a7d14..54f343a5 100644 --- a/src/pages/customerReturn/job/returnDetail.vue +++ b/src/pages/customerReturn/job/returnDetail.vue @@ -35,7 +35,7 @@ import { ref, getCurrentInstance, nextTick } from 'vue' import { onLoad, onShow, onNavigationBarButtonTap, onReady, onBackPress, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app' import { getManagementPrecisions } from '@/common/balance.js' -import { getCustomerReturnJobDetail, getBasicLocationByCode, takeCustomerReturnJob, cancleTakeCustomerReturnJob, customerReturnJobSubmit } from '@/api/request2.js' +import { getCustomerReturnJobDetail, takeCustomerReturnJob, cancleTakeCustomerReturnJob, customerReturnJobSubmit } from '@/api/request2.js' import { goHome, navigateBack, getPackingNumberAndBatch, getInventoryStatusName, getDirectoryItemArray } from '@/common/basic.js' import { getDataSource, createRecordInfo, calcHandleQty, getScanCount } from '@/common/detail.js' diff --git a/src/pages/deliver/coms/comDeliverRequestPopup.vue b/src/pages/deliver/coms/comDeliverRequestPopup.vue index d2f461a3..5c5ae6b2 100644 --- a/src/pages/deliver/coms/comDeliverRequestPopup.vue +++ b/src/pages/deliver/coms/comDeliverRequestPopup.vue @@ -61,7 +61,7 @@