YT-2397WMS《号口品生产任务》，PDA在扫码时，如果标签中的申请单号的状态是已关闭，提示语为：该品番对应的申请 [申请单号] 已关闭；如果标签中的申请单号的状态是已完成，提示语为：该品番对应的生产任务 [申请单号] 已经完成

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;

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);
 				}
 			},

src/mycomponents/scan/winScanPack.vue

@@ -15,7 +15,7 @@
 				<view class="">
 					<view class="">
 						<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult" :headerType="headerType"
-							:isShowHistory="isShowHistory" :clearResult="true" :locationCode='locationCode' :isHavePackNumber='isHavePackNumber'></win-com-scan>
+							:isShowHistory="isShowHistory" :clearResult="true" :locationCode='locationCode' :isHavePackNumber='isHavePackNumber' :isNoSearchPackage='isNoSearchPackage'></win-com-scan>
 					</view>
 				</view>
 			</view>
@@ -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')

src/mycomponents/scan/winScanPackJob.vue

@@ -14,7 +14,7 @@
 				<view class="">
 					<view class="">
 						<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult"
-							:isShowHistory="isShowHistory" :clearResult="true" :headerType="headerType"></win-com-scan>
+							:isShowHistory="isShowHistory" :clearResult="true" :headerType="headerType" :isNoSearchPackage='isNoSearchPackage'></win-com-scan>
 					</view>
 				</view>
 			</view>
@@ -58,6 +58,11 @@
 				type: String,
 				default: "HPQ,HMQ"
 			},
+			// 是否不走搜索包裝信息的接口，默认走
+			isNoSearchPackage: {
+				type: Boolean,
+				default: false
+			},
 		},
 		data() {
 			return {

src/pages/productReceipt/job/fgProductReceiptJob.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<product-receipt-job :title="title" ref="productreceiptjob" type='assemble'></product-receipt-job>
+		<product-receipt-job :title="title" ref="productreceiptjob" type='assemble' :isNoSearchPackage='true'></product-receipt-job>
 	</view>
 </template>
 

src/pages/productReceipt/job/productReceiptDetail.vue

@@ -70,7 +70,7 @@
 		</view>
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack ref="scanPopup" @getResult='getScanResult' :title="'制品标签'" headerType="HMQ"></win-scan-pack>
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult' :title="'制品标签'" headerType="HMQ" :isNoSearchPackage='isNoSearchPackage'></win-scan-pack>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -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() {

src/pages/productReceipt/job/productReceiptJob.vue

@@ -21,7 +21,7 @@
 
 			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
 			<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
-			<winScanPackJob ref="scanPopup" @getResult='getScanResult' title='制品标签'></winScanPackJob>
+			<winScanPackJob ref="scanPopup" @getResult='getScanResult' title='制品标签' :isNoSearchPackage='isNoSearchPackage'></winScanPackJob>
 			<jobList ref="jobList" @selectItem="selectItem"></jobList>
 			<comMessage ref="comMessage"></comMessage>
 		</view>
@@ -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({