From c1227af623785806360fa835f2707bde602ca1d9 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 15 Nov 2024 17:00:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E6=96=B0?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coms/comReceiptDetailCardBacth.vue        |  2 +-
 .../purchaseReceipt/job/receiptDetail.vue     | 20 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
index 7013495f..830e13cf 100644
--- a/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
+++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
@@ -11,7 +11,7 @@
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 				</template>
-				<package-list ref='packageListRef' :dataContent="dataContent.subList" :isEdit="settingParam.allowModifyQty=='TRUE'"
+				<package-list ref='packageListRef' :dataContent="dataContent.subList" :isEdit="false"
 					:settingParam="settingParam" @collapseChange="collapseChange" @updateData="updateData"
 					:isShowFromLocation="false" :isShowPackingNumberProps='true'></package-list>
 			</uni-collapse-item>
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 45dfdd52..6e80ce4e 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -507,7 +507,8 @@
 											pack.qty = batchDetailList[i].qty
 											
 											pack.toLocationCode = this.toLocationCode;
-											pack.labelQty = Number(qty);
+											console.log(999,result.package)
+											pack.labelQty = Number(result.package.packQty);
 											pack.scaned = true;
 											// 当前批次剩余可以扫进的数量大于当前扫描的标签数量的时候直接插入当前的批次
 										if(handleQtySub >= parseFloat(qty)){
@@ -691,15 +692,16 @@
 					let str = ''
 					let str1 = ''
 					var scanCount=0;
+					this.jobContent.allowBiggerQty = "FALSE"
 					this.detailSource.forEach((item) => {
 						item.subList.forEach(cur=>{
 							if(cur.scaned){
 								scanCount++;
 								if(parseFloat(cur.qty)>parseFloat(cur.handleQty)){
-									str += `物料号【${item.itemCode}】批次【${cur.batch}】实际提交数量【${cur.handleQty}】不可以小于任务数量【${cur.qty}】\n`
+									str += `物料号【${item.itemCode}】批次【${cur.batch}】扫描数量【${cur.handleQty}】小于任务推荐数量【${cur.qty}】，\n请修改后再提交`
 								}
 								if(parseFloat(cur.qty)<parseFloat(cur.handleQty)){
-									str1 += `物料号【${item.itemCode}】批次【${cur.batch}】实际提交数量【${cur.handleQty}】不可以大于任务数量【${cur.qty}】\n`
+									str1 += `物料号【${item.itemCode}】批次【${cur.batch}】扫描数量【${cur.handleQty}】大于任务推荐数量【${cur.qty}】，\n请修改后再提交`
 								}
 							}
 						})
@@ -710,12 +712,12 @@
 							return;
 						}
 					}
-					if(this.jobContent.allowSmallerQty == "FALSE"){
-						if(str){
-							this.$refs.comMessage.showErrorMessage(str);
-							return;
-						}
-					}
+					// if(this.jobContent.allowSmallerQty == "FALSE"){
+					// 	if(str){
+					// 		this.$refs.comMessage.showErrorMessage(str);
+					// 		return;
+					// 	}
+					// }
 					if(this.scanCount  < this.subList.length){
 						//扫描数量小于任务数量，判断是否允许部分提交
 						if (this.jobContent.allowPartialComplete == "TRUE") {