From 07b8cc40782b144bcbff69546e368b9930b6a51a Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 5 Jan 2024 11:00:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=93=8D=E4=BD=9C=E8=B4=9F=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/scan/winScanPackAndLocation.vue | 35 +++++++++++---------
 pages/count/job/countDetail.vue              |  5 ++-
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue
index e7c2a9b9..89f8387c 100644
--- a/mycomponents/scan/winScanPackAndLocation.vue
+++ b/mycomponents/scan/winScanPackAndLocation.vue
@@ -267,14 +267,15 @@
 					this.packCallBack(balance);
 
 					//因为盘点时有负库存，暂时去掉判断  2023年12月28日
-					if (balance.qty > 0) {
-						this.packCallBack(balance);
-					} else {
-						this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],<br>不可以进行操作",
-							res => {
-								this.packGetFocus();
-							})
-					}
+					
+					// if (balance.qty > 0) {
+					// 	this.packCallBack(balance);
+					// } else {
+					// 	this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],<br>不可以进行操作",
+					// 		res => {
+					// 			this.packGetFocus();
+					// 		})
+					// }
 				} else {
 					this.showBalanceSelect(datas);
 				}
@@ -285,14 +286,16 @@
 			},
 
 			selectBalanceItem(balance) {
-				if (balance.qty > 0) {
-					this.packCallBack(balance);
-				} else {
-					this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],不可以进行操作",
-						res => {
-							this.packGetFocus();
-						})
-				}
+				this.packCallBack(balance);
+				//因为盘点时有负库存，暂时去掉判断  2023年12月28日
+				// if (balance.qty > 0) {
+				// 	this.packCallBack(balance);
+				// } else {
+				// 	this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],不可以进行操作",
+				// 		res => {
+				// 			this.packGetFocus();
+				// 		})
+				// }
 			},
 
 			packCallBack(item) {
diff --git a/pages/count/job/countDetail.vue b/pages/count/job/countDetail.vue
index 75d50c9c..804f99f3 100644
--- a/pages/count/job/countDetail.vue
+++ b/pages/count/job/countDetail.vue
@@ -23,7 +23,6 @@
 		</view>
 		<u-line color="#D8D8D8" style="margin-bottom: 15rpx;"></u-line>
 		<view class="page-main">
-			{{detailSource[0].qty}}
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
@@ -204,6 +203,7 @@
 						item.subList.push(newDetail);
 						items.push(item)
 					} else {
+						console.log("数量",item.qty)
 						item.qty = calc.add(item.qty,detail.qty)
 						let newDetail = this.createDetailInfo(detail); //
 						item.subList.push(newDetail);
@@ -252,8 +252,7 @@
 					item.handleQty = 0;
 					for (let detail of item.subList) {
 						if (detail != undefined && detail.scaned) {
-							console.log("数量",Number(detail.qty))
-							item.handleQty += Number(detail.qty)
+								item.handleQty = calc.add(item.handleQty,detail.qty)
 						}
 					}
 				}