From bb339f4a048760bbc14efb03e03ef1956bd8e452 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 5 Aug 2024 18:28:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=96=9C=E5=A9=B7--=E5=85=B3=EF=BC=9A=E4=B8=8D?=
 =?UTF-8?q?=E7=94=A8=E6=89=AB=E6=8F=8F=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productReceipt/job/ccProductReceiptDetail.vue     |  9 ++++++---
 .../productReceipt/job/fgProductReceiptDetail.vue     | 11 +++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/pages/productReceipt/job/ccProductReceiptDetail.vue b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
index b3c5e3e6..52a96f9e 100644
--- a/src/pages/productReceipt/job/ccProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
@@ -339,9 +339,12 @@
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
 				}
-				//校验库位、
-				if (!this.checkLocation()) {
-					return
+				var valiDate = getSwitchInfoByCode("fgProductReceipCommitValidate")
+				//校验库位
+				if(valiDate){
+					if (!this.checkLocation()) {
+						return
+					}
 				}
 
 
diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
index 52474a1a..9e4331c5 100644
--- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
@@ -441,11 +441,14 @@
 				// 	this.showErrorMessage("扫描数为0,请先扫描")
 				// 	return;
 				// }
-				//校验库位、
-				if (!this.checkLocation()) {
-					return
+				
+				var valiDate = getSwitchInfoByCode("fgProductReceipCommitValidate")
+				//校验库位
+				if(valiDate){
+					if (!this.checkLocation()) {
+						return
+					}
 				}
-				var valiDate = getSwitchInfoByCode("fgProductReceipCommitValidate")
 				this.detailSource.forEach(item => {
 					item.subList.forEach(subitem => {
 						if (valiDate) {