From cf2f9b3798701070848b3e27286a3ca160b890e6 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 12 Nov 2024 13:02:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winScanPackAndLocation.vue    |  2 +-
 src/pages/issue/job/issueDetailBatch.vue            | 11 +++++++++++
 src/pages/productionReturn/job/okToReturnDetail.vue |  7 +++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 10f15f13..ba3aeae9 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -27,7 +27,7 @@
 							placeholder-style="font-size:12px" style="padding: 5px;" @confirm="scanLocation" /> -->
 
 						<view v-if='allowModifyLocation'>
-							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请扫描来源库位"
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请扫描来源库位" disabled
 								@confirm="handleConfirm" style='height: 30rpx;border:1px solid #fff ;'></uni-combox>
 						</view>
 						<view v-else>
diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue
index 15272fa9..ecfc19cb 100644
--- a/src/pages/issue/job/issueDetailBatch.vue
+++ b/src/pages/issue/job/issueDetailBatch.vue
@@ -217,6 +217,7 @@
 						that.showMessage('未获取到详情');
 					} else {
 						if (res.data.subList.length > 0) {
+							res.data.allowModifyLocation = 'FALSE'
 							that.jobContent = res.data;
 							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
@@ -260,10 +261,20 @@
 			},
 
 			getScanResult(result, managementTypeParams) {
+				console.log(this.jobContent.allowModifyLocation)
+				// if(this.jobContent.allowModifyLocation == 'TRUE'){
+				// 	this.managementType = managementTypeParams
+				// 	if(managementTypeParams == "BY_BATCH" ||managementTypeParams == "BY_QUANTITY" ){
+				// 		this.setDataBatch(result)
+				// 	}
+				// }else{
+				// 		this.showErrorMessage(`不可以扫描推荐库位【${this.fromLocationCode}】的库位`)
+				// }
 				this.managementType = managementTypeParams
 				if(managementTypeParams == "BY_BATCH" ||managementTypeParams == "BY_QUANTITY" ){
 					this.setDataBatch(result)
 				}
+				
 			},
 			setDataBatch(result) {
 				try {
diff --git a/src/pages/productionReturn/job/okToReturnDetail.vue b/src/pages/productionReturn/job/okToReturnDetail.vue
index 8e5a865a..1a6ca3a4 100644
--- a/src/pages/productionReturn/job/okToReturnDetail.vue
+++ b/src/pages/productionReturn/job/okToReturnDetail.vue
@@ -207,7 +207,6 @@
 								if (res.success) {
 									this.managementList = res.list;
 									this.managementType = this.managementList&&this.managementList[0]&&this.managementList[0].ManagementPrecision
-									this.managementType = 'BY_QUANTITY'
 									if(this.managementType == 'BY_BATCH'){
 										that.detailSource.forEach(item=>{
 											item.subList.forEach(cur=>{
@@ -308,8 +307,9 @@
 					var qty = result.label.qty;
 					var itemCode = result.label.itemCode;
 					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					let itemcodes = this.detailSource.map(item=>item.itemCode).join(',')
 					if (detail == undefined) {
-						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+						this.showErrorMessage(`扫描的物料【 ${ result.label.itemCode} 】与任务明细中的物料【 ${itemcodes} 】不一致`)
 					} else {
 						var itemDetail = detail.subList.find(r => {
 							return r.batch == batch
@@ -489,8 +489,7 @@
 					if (res.success) {
 						this.managementList = res.list;
 						var params = this.setParams()
-						console.log("提交参数", JSON.stringify(params));
-
+						console.log("提交参数", params);
 						productionReturnJobSubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {