From f8fe9753b7216856074049e637cc857bd86929a6 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 23 Aug 2024 09:26:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E4=BB=BB=E5=8A=A1=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E7=89=A9=E6=96=99=E5=8F=91=E8=B4=A7=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=BF=85=E9=A1=BB=E4=B8=80=E8=87=B4=E6=89=8D=E8=83=BD=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliver/coms/comDeliverDetailCard.vue     |  6 +-
 src/pages/deliver/coms/comScanDeliverPack.vue |  1 +
 src/pages/deliver/job/deliverDetail.vue       | 77 ++++++++++++++++---
 3 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/src/pages/deliver/coms/comDeliverDetailCard.vue b/src/pages/deliver/coms/comDeliverDetailCard.vue
index 31da1f5c..301bf83e 100644
--- a/src/pages/deliver/coms/comDeliverDetailCard.vue
+++ b/src/pages/deliver/coms/comDeliverDetailCard.vue
@@ -22,10 +22,10 @@
 									:isShowLocation="false" :isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
 								</recommend-balance>
 								<view class="uni-flex uni-row" v-if='batch.Records.length>0'>
-									<view class="center " style=" width: 20px; color: #0CC2B6; margin-left: 40px;">
-										实际
+									<view class="center " style=" width: 20px;background-color: #0CC2B6; color: #fff; margin-left: 40px;padding: 0px 2px;">
+										扫描
 									</view>
-									<view class="uni-flex uni-column" style="width: 100%;">
+									<view class="uni-flex uni-column scan_view" style="width: 100%;">
 										<view v-for="(record,index) in batch.Records">
 											<uni-swipe-action ref="swipeAction">
 												<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue
index c635ba8b..b5ad7bfb 100644
--- a/src/pages/deliver/coms/comScanDeliverPack.vue
+++ b/src/pages/deliver/coms/comScanDeliverPack.vue
@@ -434,6 +434,7 @@
 				balance.packQty = packageInfo.packQty
 				balance.packUnit = packageInfo.packUnit
 				let record = {
+					scaned: true,
 					itemCode: label.itemCode,
 					packingNumber: label.packingNumber,
 					batch: label.batch,
diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue
index 85ce1e01..91249a41 100644
--- a/src/pages/deliver/job/deliverDetail.vue
+++ b/src/pages/deliver/job/deliverDetail.vue
@@ -27,7 +27,7 @@
 		</view>
 
 		<view class="page-main">
-			<scroll-view scroll-y="true" class="">
+			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view v-for="(toLocation, index) in detailSource">
 					<comDeliverDetailCard ref='comIssueDetailCard'
 					 :dataContent="toLocation" 
@@ -37,14 +37,18 @@
 				</view>
 			</scroll-view>
 		</view>
-
-		<div class="btn_bottom">
-			<view class="" style="display: flex;flex-direction: row;">
+		
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
 				</view>
 			</view>
-		</div>
+		</view>
+
 		<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
 		<comScanDeliverPack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
 		</comScanDeliverPack>
@@ -244,6 +248,58 @@
 					});
 				}
 			},
+			
+			checkCount(){
+				let str=""
+				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(item.taskQty!=item.totalQty){
+							str += `物料号【${item.itemCode}】提交数量【${item.totalQty}】与任务物料数量【${item.taskQty}】不一致\n`
+						}
+					})
+				})
+				
+				if(str){
+					str = '任务明细未全部完成,请全部扫描后提交\n' + str
+					this.showErrorMessage(str)
+				}
+				
+				return str?false:true
+				
+			},
 
 			submitJob() {
 				var params = this.setParams()
@@ -254,6 +310,12 @@
 					this.$refs.comMessage.showConfirmMessageModal('请扫描箱码')
 					return
 				}
+				
+				if(!this.checkCount()){
+					uni.hideLoading()
+					return ;
+				}
+				
 				deliverJobSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
@@ -417,9 +479,6 @@
 				this.scanPopupGetFocus();
 			},
 
-			showScanMessage(message) {
-				this.$refs.comMessage.showScanMessage(message);
-			},
 
 			closeScanMessage() {
 				this.scanPopupGetFocus();