From b4f703fe9b1ec43add07abd3327047245fc2e26d Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sat, 26 Oct 2024 11:47:10 +0800
Subject: [PATCH] =?UTF-8?q?YT-506PDA=E7=AB=AF=E6=89=A7=E8=A1=8C=E9=A2=84?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=94=B6=E8=B4=A7=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F=E6=97=B6=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=95=B0=E9=87=8F=E7=9A=84=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/qty/recommendQtyEdit.vue                   | 6 +++++-
 src/pages/productReceipt/coms/comProductDetailCardBatch.vue | 2 +-
 src/pages/purchaseReceipt/job/receiptDetail.vue             | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/mycomponents/qty/recommendQtyEdit.vue b/src/mycomponents/qty/recommendQtyEdit.vue
index db2ad1e1..9510cb05 100644
--- a/src/mycomponents/qty/recommendQtyEdit.vue
+++ b/src/mycomponents/qty/recommendQtyEdit.vue
@@ -108,6 +108,10 @@ import { nextTick } from 'vue';
 				type: Object,
 				default: null
 			},
+			isNumTips: {
+				type: Boolean,
+				default: true
+			},
 		},
 		methods: {
 			getPackUnitName(packUnit) {
@@ -170,7 +174,7 @@ import { nextTick } from 'vue';
 			setValue() {
 				// var recommendQty = Number(this.dataContent.qty);
 				// var labelQty = Number(this.dataContent.record.label.qty);
-				if (this.allQty > this.labelQty) {
+				if (this.allQty > this.labelQty && this.isNumTips) {
 					this.$refs.comMessage.showErrorMessage('数量[' + this.allQty + ']不允许大于标签数量[' +
 						this.labelQty +
 						']',
diff --git a/src/pages/productReceipt/coms/comProductDetailCardBatch.vue b/src/pages/productReceipt/coms/comProductDetailCardBatch.vue
index 2fc2be38..900c0057 100644
--- a/src/pages/productReceipt/coms/comProductDetailCardBatch.vue
+++ b/src/pages/productReceipt/coms/comProductDetailCardBatch.vue
@@ -25,7 +25,7 @@
 		</view>
 
 
-		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
+		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm" :isNumTips='false'>
 		</recommend-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
 			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index cca90c6a..0ba7c527 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -792,7 +792,7 @@
 								pack.handleQty = 0
 							}
 						})
-					detail.toLocationCode = this.toLocationCode
+					detail.toLocationCode = this.toLocationCode ? this.toLocationCode :this.jobToLocationCode
 						var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
 							detail.packingNumber, detail.batch);
 						detail.toPackingNumber = info.packingNumber;