From e834c37c08d11c5f27428f18ad4218f561f002bb Mon Sep 17 00:00:00 2001 From: zhang_li Date: Fri, 18 Apr 2025 21:45:13 +0800 Subject: [PATCH] =?UTF-8?q?YT-2397WMS=E3=80=8A=E5=8F=B7=E5=8F=A3=E5=93=81?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=BB=BB=E5=8A=A1=E3=80=8B=EF=BC=8CPDA?= =?UTF-8?q?=E5=9C=A8=E6=89=AB=E7=A0=81=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=B8=AD=E7=9A=84=E7=94=B3=E8=AF=B7=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E7=8A=B6=E6=80=81=E6=98=AF=E5=B7=B2=E5=85=B3?= =?UTF-8?q?=E9=97=AD=EF=BC=8C=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=B8=BA=EF=BC=9A?= =?UTF-8?q?=E8=AF=A5=E5=93=81=E7=95=AA=E5=AF=B9=E5=BA=94=E7=9A=84=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=20[=E7=94=B3=E8=AF=B7=E5=8D=95=E5=8F=B7]=20=E5=B7=B2?= =?UTF-8?q?=E5=85=B3=E9=97=AD=EF=BC=9B=E5=A6=82=E6=9E=9C=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=94=B3=E8=AF=B7=E5=8D=95=E5=8F=B7=E7=9A=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=AF=E5=B7=B2=E5=AE=8C=E6=88=90=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=B8=BA=EF=BC=9A=E8=AF=A5=E5=93=81?= =?UTF-8?q?=E7=95=AA=E5=AF=B9=E5=BA=94=E7=9A=84=E7=94=9F=E4=BA=A7=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=20[=E7=94=B3=E8=AF=B7=E5=8D=95=E5=8F=B7]=20=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/label.js | 19 ++++++++++--------- src/mycomponents/scan/winComScan.vue | 7 ++++++- src/mycomponents/scan/winScanPack.vue | 9 +++++++-- src/mycomponents/scan/winScanPackJob.vue | 7 ++++++- .../job/fgProductReceiptJob.vue | 2 +- .../job/productReceiptDetail.vue | 6 ++++-- .../productReceipt/job/productReceiptJob.vue | 8 ++++++-- 7 files changed, 40 insertions(+), 18 deletions(-) diff --git a/src/common/label.js b/src/common/label.js index 20c55f55..b28117f0 100644 --- a/src/common/label.js +++ b/src/common/label.js @@ -14,7 +14,8 @@ import { getManagementPrecisions } from '@/common/balance.js'; -export function getLabelInfo(scanMsg, headerType, callBack,locationCode,isHavePackNumber) { +export function getLabelInfo(scanMsg, headerType, callBack,locationCode,isHavePackNumber,isNoSearchPackage) { + console.log(33,locationCode,isHavePackNumber,isNoSearchPackage) if (scanMsg.length == 0) { return null } @@ -42,17 +43,17 @@ export function getLabelInfo(scanMsg, headerType, callBack,locationCode,isHavePa let type = header.substring(header.length - 1, header.length); if (type == 'Q') //qrcode { - getQRCodeInfo(header, version, scanMsg, callBack,locationCode,isHavePackNumber); + getQRCodeInfo(header, version, scanMsg, callBack,locationCode,isHavePackNumber,isNoSearchPackage); } // else if (type == 'B') //barcode // { // getBarCodeInfo(header, version, items[2], callBack); // } else { //直接输入文本 - getBarCodeInfo('text', 'V1.0', scanMsg, callBack,locationCode,isHavePackNumber); + getBarCodeInfo('text', 'V1.0', scanMsg, callBack,locationCode,isHavePackNumber,isNoSearchPackage); } } else { - getBarCodeInfo('text', 'V1.0', scanMsg, callBack,locationCode,isHavePackNumber); + getBarCodeInfo('text', 'V1.0', scanMsg, callBack,locationCode,isHavePackNumber,isNoSearchPackage); // let labelResult = { // label: { // labelType: "", @@ -67,7 +68,7 @@ export function getLabelInfo(scanMsg, headerType, callBack,locationCode,isHavePa } } -export function getQRCodeInfo(header, version, scanMsg, callBack,locationCode,isHavePackNumber) { +export function getQRCodeInfo(header, version, scanMsg, callBack,locationCode,isHavePackNumber,isNoSearchPackage) { //获取包装信息 let labelItem = labelDic.find(r => r.header == header && r.version == version); if (labelItem == undefined) { @@ -92,7 +93,7 @@ export function getQRCodeInfo(header, version, scanMsg, callBack,locationCode,is }; labelDic.push(newItem); - getLabelItems(newItem, scanMsg, callBack,locationCode,isHavePackNumber); + getLabelItems(newItem, scanMsg, callBack,locationCode,isHavePackNumber,isNoSearchPackage); } }).catch(err => { labelResult.success = false; @@ -100,11 +101,11 @@ export function getQRCodeInfo(header, version, scanMsg, callBack,locationCode,is callBack(err); }) } else { - getLabelItems(labelItem, scanMsg, callBack,locationCode,isHavePackNumber); + getLabelItems(labelItem, scanMsg, callBack,locationCode,isHavePackNumber,isNoSearchPackage); } } -export async function getLabelItems(labelItem, scanMsg, callBack,locationCode) { +export async function getLabelItems(labelItem, scanMsg, callBack,locationCode,isHavePackNumber,isNoSearchPackage) { let managementType = "" let labelResult = analysisQRCodeLabel(labelItem, scanMsg); if (labelResult.label.labelType == 'PurchaseLabel' || labelResult.label.labelType == 'MakeLabel') { @@ -124,7 +125,7 @@ export async function getLabelItems(labelItem, scanMsg, callBack,locationCode) { } }) } - if (packingNumber != undefined && packingNumber != '') { + if (packingNumber != undefined && packingNumber != '' && !isNoSearchPackage) { await getPackageListByNumber(packingNumber).then(pack => { if (pack.data.reqPackage) { labelResult.package = pack.data.reqPackage; diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue index f9f109c8..6c1ceb1e 100644 --- a/src/mycomponents/scan/winComScan.vue +++ b/src/mycomponents/scan/winComScan.vue @@ -98,6 +98,11 @@ type: Boolean, default: false }, + // 是否不走搜索包裝信息的接口，默认走 + isNoSearchPackage: { + type: Boolean, + default: false + }, }, data() { return { @@ -201,7 +206,7 @@ } }) } - },this.locationCode,this.isHavePackNumber); + },this.locationCode,this.isHavePackNumber,this.isNoSearchPackage); }, 200); } }, diff --git a/src/mycomponents/scan/winScanPack.vue b/src/mycomponents/scan/winScanPack.vue index 68af998f..7df7e823 100644 --- a/src/mycomponents/scan/winScanPack.vue +++ b/src/mycomponents/scan/winScanPack.vue @@ -15,7 +15,7 @@ + :isShowHistory="isShowHistory" :clearResult="true" :locationCode='locationCode' :isHavePackNumber='isHavePackNumber' :isNoSearchPackage='isNoSearchPackage'> @@ -49,6 +49,11 @@ type: String, default: 'HPQ' }, + // 是否不走搜索包裝信息的接口，默认走 + isNoSearchPackage: { + type: Boolean, + default: false + }, }, data() { return { @@ -69,7 +74,7 @@ this.showMessage(callback.message) } - }) + },this.locationCode,this.isHavePackNumber,this.isNoSearchPackage) }, openScanPopup(locationCode1,isHavePackNumber) { this.$refs.popup.open('bottom') diff --git a/src/mycomponents/scan/winScanPackJob.vue b/src/mycomponents/scan/winScanPackJob.vue index c9db3744..1eabe1ea 100644 --- a/src/mycomponents/scan/winScanPackJob.vue +++ b/src/mycomponents/scan/winScanPackJob.vue @@ -14,7 +14,7 @@ + :isShowHistory="isShowHistory" :clearResult="true" :headerType="headerType" :isNoSearchPackage='isNoSearchPackage'> @@ -58,6 +58,11 @@ type: String, default: "HPQ,HMQ" }, + // 是否不走搜索包裝信息的接口，默认走 + isNoSearchPackage: { + type: Boolean, + default: false + }, }, data() { return { diff --git a/src/pages/productReceipt/job/fgProductReceiptJob.vue b/src/pages/productReceipt/job/fgProductReceiptJob.vue index 6a1b1589..01f699db 100644 --- a/src/pages/productReceipt/job/fgProductReceiptJob.vue +++ b/src/pages/productReceipt/job/fgProductReceiptJob.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 6a369cba..f3d5b7fa 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -70,7 +70,7 @@ - + @@ -147,7 +147,8 @@ jobToLocationCode: "", status: '', scanMessage: "", - productionLineCode: "" + productionLineCode: "", + isNoSearchPackage:false }; }, onLoad(option) { @@ -158,6 +159,7 @@ this.id = option.id; this.scanMessage = option.scanMessage; this.status = option.status || '' + this.isNoSearchPackage=option.isNoSearchPackage }, onShow() { diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index 64d202d4..170ac141 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -21,7 +21,7 @@ - + @@ -97,6 +97,10 @@ type: String, default: '' }, + isNoSearchPackage: { + type: Boolean, + default: false + }, }, @@ -482,7 +486,7 @@ if (this.type == 'predict'||this.type == 'assemble') { uni.navigateTo({ url: './productReceiptDetail?id=' + result.masterId + '&status=' + result.status + - '&scanMessage=' + scanMessage + '&title=' + this.title + '&scanMessage=' + scanMessage + '&title=' + this.title + '&isNoSearchPackage=' + this.isNoSearchPackage }); } else if (this.type == 'assemble') { uni.navigateTo({