Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into intex

.env.production

@@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=http://192.168.120.34:81/admin-api
 VITE_TENANT='[{"text":"英泰","value":1}]'
 
 # 是否是测试环境
-VITE_isDevelopment=true
+VITE_isDevelopment=false
 
 # 积木报表请求路径
 VITE_JMREPORT_BASE_URL='http://192.168.120.34:81/api'

src/manifest.json

@@ -3,8 +3,8 @@
     "package" : "com.yingtai.pda",
     "appid" : "__UNI__F36DDCF",
     "description" : "",
-    "versionName" : "1.0.9",
+    "versionName" : "1.1.0",
-    "versionCode" : 9,
+    "versionCode" : 10,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

src/pages/productReceipt/job/productReceiptDetail.vue

@@ -255,9 +255,7 @@
 							that.toLocationCode = that.subList[0].toLocationCode
 							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
 							that.detailSource = getDataSource(that.subList)
-							if (that.scanMessage) {
+					
-								this.$refs.scanPopup.simulateScan(that.scanMessage);
-							}
 							//获取管理模式，封装参数
 							var itemCodes = []
 							this.detailSource.forEach(item => {
@@ -279,6 +277,9 @@
 										}
 
 									})
+									if (that.scanMessage) {
+										this.$refs.scanPopup.simulateScan(that.scanMessage);
+									}
 								}
 							})
 						} else {
@@ -313,7 +314,6 @@
 				var qty = label.qty;
 				var itemCode = label.itemCode;
 
-
 				var detail = this.detailSource.find(r => r.itemCode == itemCode);
 				if (detail == undefined) {
 					this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
@@ -380,6 +380,7 @@
 							this.showErrorMessage("包装[" + packingNumber + "]" + "批次[" + batch + "]不在任务列表中")
 						}
 					}
+					uni.hideLoading()
 
 				}
 			},

src/pages/productReceipt/job/productReceiptJob.vue

@@ -356,23 +356,13 @@
 			},
 			async getScanResult(result) {
 				if(!result.label.requestNumber ){
-					this.showMessage("该标签未关联到收货申请")
+					this.showMessage(`该品番对应的申请 【${ result.label.requestNumber}】下未查询到任务`)
 					return;
 				}
 				uni.showLoading({
 					title: "加载中....",
 					mask: true
 				});
-				const res1 = await getNumberForStatus(result.label.requestNumber)
-				if(res1.data == 5){
-					uni.hideLoading()	
-					this.showMessage(`该品番对应的申请【${result.label.requestNumber}】已关闭`)
-					return
-				}else if(res1.data == 8){
-					uni.hideLoading()	
-					this.showMessage(`该品番对应的生产任务【${result.label.requestNumber}】已经完成`)
-					return
-				}
 				try {
 					this.scanMessage = ""
 					var filters = [
@@ -404,18 +394,29 @@
 						{
 							column: "status",
 							action: "in",
-							value: '1,2',
+							value: '1,2,3,4',
 						}
 					]
 					getProductReceiptJobList({
 						filters: filters,
 						pageNo: 1,
 						pageSize: 100,
-					}).then(res => {
+					}).then(async res => {
 						uni.hideLoading()	
 						this.scanMessage = result.scanMessage
 						let resultList = res.data.list;
 						if (resultList.length > 0) {
+							
+							const res1 = await getNumberForStatus(result.label.requestNumber)
+							if(resultList[0].status==4||res1.data == 5){
+								uni.hideLoading()	
+								this.showMessage(`该品番对应的申请【${result.label.requestNumber}】下的任务已关闭`)
+								return
+							}else if(res1.data == 8){
+								uni.hideLoading()	
+								this.showMessage(`该品番对应的申请【${result.label.requestNumber}】下的任务已完成`)
+								return
+							}
 							resultList.forEach(item => {
 								item.title = item.number;
 								item.selected = false
@@ -432,7 +433,7 @@
 								this.selectItem(list[0])
 							}
 						} else {
-							this.showMessage("该标签未关联到收货申请\n" + "扫描[" + result.scanMessage + "]")
+							this.showMessage(`该品番对应的申请 【${ result.label.requestNumber}】下未查询到任务`)
 						}
 					}).catch(error => {
 						uni.hideLoading()	

src/pages/productReceipt/job/semiProductReceiptJob.vue

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