From a45813976d020248d6d314cf9392e22d43f73b67 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 9 Sep 2024 15:06:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E6=95=B0=E9=87=8F=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coms/comReturnDetailCard.vue              |   2 +-
 .../purchaseReturn/coms/comScanReturnPack.vue |   1 +
 src/pages/purchaseReturn/job/returnDetail.vue | 102 +++++++++---------
 3 files changed, 51 insertions(+), 54 deletions(-)

diff --git a/src/pages/purchaseReturn/coms/comReturnDetailCard.vue b/src/pages/purchaseReturn/coms/comReturnDetailCard.vue
index b8aa17a7..73289f9a 100644
--- a/src/pages/purchaseReturn/coms/comReturnDetailCard.vue
+++ b/src/pages/purchaseReturn/coms/comReturnDetailCard.vue
@@ -12,7 +12,7 @@
 						<uni-swipe-action ref="swipeAction">
 							<uni-swipe-action-item @click="itemCoceClick($event,item,index)"
 								:right-options="removeOptions">
-								<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
+								<item-qty :dataContent="item" :isShowBalanceQty="false"  :handleQty="item.handleQty"></item-qty>
 							</uni-swipe-action-item>
 						</uni-swipe-action>
 						<!-- 			<com-issue-request-info :workShopCode="dataContent.workShopCode" :dataContent="dataContent">
diff --git a/src/pages/purchaseReturn/coms/comScanReturnPack.vue b/src/pages/purchaseReturn/coms/comScanReturnPack.vue
index 826d8ad4..d3e5ad52 100644
--- a/src/pages/purchaseReturn/coms/comScanReturnPack.vue
+++ b/src/pages/purchaseReturn/coms/comScanReturnPack.vue
@@ -497,6 +497,7 @@
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				this.calcBatchHandleQty(batch);
+				this.$emit('updateData', "");
 				this.getfocus();
 			},
 
diff --git a/src/pages/purchaseReturn/job/returnDetail.vue b/src/pages/purchaseReturn/job/returnDetail.vue
index 73ee9054..ea58b775 100644
--- a/src/pages/purchaseReturn/job/returnDetail.vue
+++ b/src/pages/purchaseReturn/job/returnDetail.vue
@@ -236,25 +236,53 @@
 			},
 
 			updateData(record) {
-				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
-				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
-				let itemHandleQty = 0;
-				if (item != undefined) {
-					item.Locations.forEach(l => {
-						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
-								.packingNumber == null || b.packingNumber == '') && b.batch ==
-							record.batch);
-						let handleQty = 0;
-						if (batch != undefined) {
-							batch.Records.forEach(res => {
-								handleQty = calc.add(handleQty, res.qty)
+					
+				if(record){
+					let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
+					let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
+					let itemHandleQty = 0;
+					if (item != undefined) {
+						item.Locations.forEach(l => {
+							let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+									.packingNumber == null || b.packingNumber == '') && b.batch ==
+								record.batch);
+							let handleQty = 0;
+							if (batch != undefined) {
+								batch.Records.forEach(res => {
+									handleQty = calc.add(handleQty, res.qty)
+								})
+								batch.handleQty = handleQty;
+								itemHandleQty = calc.add(itemHandleQty, handleQty)
+							}
+						})
+						item.handleQty=itemHandleQty;
+					}
+					this.$forceUpdate()
+				}else {
+					//计算扫描数量
+					this.detailSource.forEach(detail => {
+						detail.Items.forEach(item => {
+							var taskQty =0;
+							item.taskQty =calc.add(taskQty,item.qty)
+							var totalQty =0;
+							item.Locations.forEach(lco => {
+								lco.Batchs.forEach(batch => {
+									batch.Records.forEach(record => {
+										if(record){
+											var handleQty =record.qty?record.qty:0
+											totalQty = calc.add(totalQty,handleQty)
+										}
+										
+									})
+								})
 							})
-							batch.handleQty = handleQty;
-							itemHandleQty = calc.add(itemHandleQty, handleQty)
-						}
+							//实际扫描的数量
+							item.handleQty =totalQty
+						})
 					})
 				}
-				// item.handleQty=itemHandleQty;
+				
+				// 
 			},
 			
 			submit(){
@@ -280,50 +308,18 @@
 			checkCount(){
 				let str=""
 				let commitHint=""
-				this.detailSource.forEach(detail => {
-					detail.Items.forEach(item => {
-						var taskQty =0;
-						item.taskQty =calc.add(taskQty,item.qty)
-						var totalQty =0;
-						item.Locations.forEach(lco => {
-							lco.Batchs.forEach(batch => {
-								batch.Records.forEach(record => {
-									// if (batch.qty != record.qty) {
-									// 	var tempHandleQty = 0
-									// 	if (record.qty) {
-									// 		tempHandleQty = record.qty
-									// 	} else {
-									// 		tempHandleQty = 0
-									// 	}
-									// 	if (batch.qty != 0) {
-									// 		str +=
-									// 			`包装号【${record.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${batch.qty}】不一致\n`
-									// 	}
-									// }
-									if(record){
-										var hanleQty =record.qty?record.qty:0
-										totalQty = calc.add(totalQty,hanleQty)
-									}
-									
-								})
-							})
-						})
-						//实际扫描的数量
-						item.totalQty =totalQty
-						
-					})
-				})
+			
 				//如果允许部分提交任务有扫描记录就可以直接提交；如果不允许部分执行，任务数量和提交数量不一致给出提示
 				this.detailSource.forEach(detail=>{
 					detail.Items.forEach(item=>{
 						if(this.jobContent.allowPartialComplete=="FALSE"){
-							if(item.taskQty!=item.totalQty){
-								str += `物料号【${item.itemCode}】任务数量【${item.taskQty}】与实际提交数量【${item.totalQty}】不一致\n`
+							if(item.taskQty!=item.handleQty){
+								str += `物料号【${item.itemCode}】实际提交数量【${item.handleQty}】与任务数量【${item.taskQty}】不一致\n`
 							}
 						}else {
 							//允许部分提交，提交的数量和任务数量不一致，提示
-							if(item.taskQty!=item.totalQty){
-								commitHint += `物料号【${item.itemCode}】任务数量【${item.taskQty}】与实际提交数量【${item.totalQty}】不一致,是否提交\n`
+							if(item.taskQty!=item.handleQty){
+								commitHint += `物料号【${item.itemCode}】实际提交数量【${item.handleQty}】与任务数量【${item.taskQty}】不一致,是否提交?\n`
 							}
 						}
 					})