From 6d36ca4061e34d19dee70d6a317e3ca34415387d Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 9 Aug 2024 09:28:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E4=BB=BB=E5=8A=A1=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=89=AB=E6=8F=8F=EF=BC=8C=E6=95=B0=E9=87=8F=E4=B8=BA?=
 =?UTF-8?q?0=E6=97=B6=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/package/job/overPackageJobDetail.vue | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 24b8f1d0..433b0635 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -329,6 +329,10 @@
 				var tempHandleQty = this.detailSource[0].Items[0].Locations[0].Batchs[0].handleQty
 				var tempQty = this.detailSource[0].Items[0].Locations[0].Batchs[0].qty
 				var toPackQty = this.detailSource[0].Items[0].Locations[0].Batchs[0].toPackQty
+				if (tempHandleQty == 0) {
+					this.showErrorMessage("实际数量为0,请先扫描数据")
+					return
+				}
 				if (tempHandleQty > tempQty) {
 					//大于需求数量
 					this.showCommitMessage("实际数量【" + tempHandleQty + "】大于需求数量" + "【" + tempQty + "】, 是否提交?", tempHandleQty,
@@ -550,11 +554,18 @@
 
 			scanPopupGetFocus() {
 				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.getfocus();
+					this.$refs.scanPopup.packGetFocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.packLoseFocus();
 				}
 			},
 
 			showMessage(message) {
+				this.scanPopupLoseFocus()
 				this.$refs.comMessage.showMessage(message, res => {
 					if (res) {
 						this.afterCloseMessage()
@@ -562,6 +573,7 @@
 				});
 			},
 			showErrorMessage(message) {
+				this.scanPopupLoseFocus()
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
 						this.afterCloseMessage()
@@ -576,9 +588,6 @@
 				});
 			},
 
-			showScanMessage(message) {
-				this.$refs.comMessage.showScanMessage(message);
-			},
 
 			showCommitSuccess() {
 				this.$refs.comMessage.showCommitSuccess();