From 731ece5c55adcbb0da5eb5b4ee1c498597fc9af9 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 26 Nov 2024 15:05:39 +0800
Subject: [PATCH] =?UTF-8?q?YT-1270=E3=80=90=E6=89=AB=E6=8F=8F=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E3=80=91=E5=90=88=E8=AE=A1=E5=B0=8F=E4=BA=8E=E3=80=90?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E6=95=B0=E9=87=8F=E3=80=91=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=97=B6PDA=E7=AB=AF=E6=8F=90=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/label.js                             |  1 +
 src/pages/purchaseReceipt/job/receiptDetail.vue | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/common/label.js b/src/common/label.js
index 82bec5b7..9eafd6eb 100644
--- a/src/common/label.js
+++ b/src/common/label.js
@@ -133,6 +133,7 @@ export async function getLabelItems(labelItem, scanMsg, callBack,locationCode) {
 					labelResult.success = false;
 					labelResult.message = '包装号[' + packingNumber + ']没有包装信息';
 				}
+				labelResult.managementType = managementType
 				callBack(labelResult);
 			}).catch(err => {
 				labelResult.success = false;
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 18f2b652..08d9d5fe 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -708,12 +708,15 @@
 					let str = ''
 					let str1 = ''
 					let str2 = ''
+					let taskQty = 0
+					let handleQty = 0
 					this.detailSource.forEach((item) => {
+						taskQty = calc.add(taskQty,item.qty)
+						handleQty = calc.add(handleQty,item.handleQty)
 						item.subList.forEach(cur=>{
 							if(cur.scaned){
 								if(parseFloat(cur.qty)>parseFloat(cur.handleQty)){
 									str += `物料号【${item.itemCode}】批次【${cur.batch}】扫描数量【${cur.handleQty}】小于任务推荐数量【${cur.qty}】，\n请修改后再提交`	
-									str2 += `物料号【${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请修改后再提交`
@@ -733,6 +736,9 @@
 					// 		return;
 					// 	}
 					// }
+					if(parseFloat(taskQty)>parseFloat(handleQty)){
+						str2 += `实际收货数量【${handleQty}】小于收货任务的收货数量【${taskQty}】，\n`
+					}
 					if(str2){
 						//扫描数量小于任务数量，判断是否允许部分提交
 						if (this.jobContent.allowPartialComplete == "TRUE") {
@@ -753,6 +759,8 @@
 					}else{
 						this.submitJob();
 					}
+					
+
 			},
 			reject() {
 				if (!this.reasonText) {