From 3c7760b8a7681dcbe4a9658897bd93c7929d06e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Fri, 25 Oct 2024 17:30:16 +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?=
 =?UTF-8?q?=202024/8/5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/productReceipt/job/ccProductReceiptDetail.vue b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
index 0cd84a48..e31feda5 100644
--- a/src/pages/productReceipt/job/ccProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
@@ -70,7 +70,7 @@
 	import { getManagementPrecisions } from '@/common/balance.js'
 
 	import { getProductReceiptJobDetail, takeProductReceiptJob, cancleTakeProductReceiptJob, ccProductReceiptJobsubmit } from '@/api/request2.js'
-	import { goHome, navigateBack, getPackingNumberAndBatch } from '@/common/basic.js'
+	import { goHome, navigateBack, getPackingNumberAndBatch ,getSwitchInfoByCode} from '@/common/basic.js'
 
 	import { getDirectoryItemArray, getInventoryStatusName } from '@/common/directory.js'
 
@@ -291,10 +291,13 @@
 			showErrorMessage('扫描数为0,请先扫描')
 			return
 		}
-		// 校验库位、
-		if (!checkLocation()) {
-			return
-		}
+    let valiDate = getSwitchInfoByCode("fgProductReceipCommitValidate")
+    //校验库位
+    if(valiDate){
+      if (!this.checkLocation()) {
+        return
+      }
+    }
 
 		// 扫描数量和任务数量相等，直接提交
 		if (scanCount.value == subList.value.length) {
diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
index a65e5217..52c26a8d 100644
--- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
@@ -381,11 +381,13 @@ const commit = () => {
   // 	this.showErrorMessage("扫描数为0,请先扫描")
   // 	return;
   // }
-  // 校验库位、
-  if (!checkLocation()) {
-    return
-  }
   const valiDate = getSwitchInfoByCode('fgProductReceipCommitValidate')
+  // 校验库位
+  if(valiDate){
+    if (!this.checkLocation()) {
+      return
+    }
+  }
   detailSource.value.forEach((item) => {
     item.subList.forEach((subitem) => {
       if (valiDate) {