From 908af9994956ae634c3876fe255837b5f0683e4c Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 16 Aug 2024 13:10:08 +0800
Subject: [PATCH] =?UTF-8?q?HL-5359=20=E5=9C=A8=E5=BC=80=E5=85=B3=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3=EF=BC=9AsemiProdu?=
 =?UTF-8?q?ctReceipCommitValidate=EF=BC=8C=E5=9C=A8=E9=A2=84=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E5=AE=8C=E5=B7=A5=E6=94=B6=E8=B4=A7=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E6=A0=B9=E6=8D=AE=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E8=A6=81=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E4=B8=8D=E6=89=AB=E6=8F=8F=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E5=8F=96=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84=E7=9B=AE=E6=A0=87?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=8F=82=E8=80=83=E8=A3=85=E9=85=8D?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84fgProductReceipCommitValida?=
 =?UTF-8?q?te=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.vue                     |  2 +-
 .../job/productReceiptDetail.vue              | 20 +++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 8fb3b6c7..1fa86ce7 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -388,7 +388,7 @@
 					console.log("包装规格获取失败", res)
 				})
 				
-				var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated";
+				var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,semiProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated";
 
 				getSwitchByCode(switchCode).then(res=>{
 					uni.setStorageSync("switch", res.data)
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 7a898713..1c6c3cb3 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -85,7 +85,8 @@
 	import {
 		goHome,
 		navigateBack,
-		getPackingNumberAndBatch,
+		getPackingNumberAndBatch,
+		getSwitchInfoByCode
 	} from '@/common/basic.js';
 
 	import {
@@ -334,18 +335,21 @@
 				});
 			},
 
-			commit() {
+			commit() {
 				this.scanCount = getScanCount(this.subList);
 				if (this.scanCount == 0) {
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
+				}
+				var valiDate = getSwitchInfoByCode("semiProductReceipCommitValidate")
+				//校验库位、
+				if(valiDate){
+					if (!this.checkLocation()) {
+						return
+					}
+				}else{
+					this.toLocationCode = this.jobToLocationCode
 				}
-				//校验库位、
-				if (!this.checkLocation()) {
-					return
-				}
-
-
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
 					if (this.checkCount()) {