From 956c72e8c8f13dbfe068d861ac3ecccf855b142d Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 12 Jun 2024 10:15:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/mycomponents/coms/comDeliverBoardDetail.vue | 5 ++++-
 fe/PDA/mycomponents/coms/comUnPacking.vue          | 7 ++++---
 fe/PDA/pages/task/deliverBoard_detail.vue          | 6 +++++-
 fe/PDA/pages/task/deliverJis_detail.vue            | 6 +++++-
 fe/PDA/pages/task/issue_detail.vue                 | 7 ++++++-
 fe/PDA/pages/task/receipt_detail.vue               | 6 +++++-
 6 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/fe/PDA/mycomponents/coms/comDeliverBoardDetail.vue b/fe/PDA/mycomponents/coms/comDeliverBoardDetail.vue
index 6c44e9839..ef82be731 100644
--- a/fe/PDA/mycomponents/coms/comDeliverBoardDetail.vue
+++ b/fe/PDA/mycomponents/coms/comDeliverBoardDetail.vue
@@ -64,7 +64,7 @@
 			</view>
 		</view>
 		<comUnPacking ref='comUnPacking'
-			@getvalue="getUnPackingCount" title="拆箱">
+			@getvalue="getUnPackingCount" title="拆箱" @update="update">
 		</comUnPacking>
 		<com-message ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()'
 			@afterCloseScanMessage='closeScanMessage'></com-message>
@@ -98,6 +98,9 @@
 			},
 		},
 		methods: {
+			update(newCode){
+				this.showMessage("生成新的箱码【"+newCode+"】请到PC端打印标签");
+			},
 			unPacking(item) {
 				this.$refs.comUnPacking.openPopup3(item,item.handledQty,item.recommendQty,false);
 			},
diff --git a/fe/PDA/mycomponents/coms/comUnPacking.vue b/fe/PDA/mycomponents/coms/comUnPacking.vue
index 566acbab9..4dd4528f8 100644
--- a/fe/PDA/mycomponents/coms/comUnPacking.vue
+++ b/fe/PDA/mycomponents/coms/comUnPacking.vue
@@ -230,7 +230,7 @@
 						mask:true
 					})
 					var labelData = await getInventoryLabel(this.dataContent.recommendPackingCode)
-					if(!newPackingCodeParam){
+					if(!labelData){
 						uni.hideLoading()
 						this.showMessage("箱码["+this.dataContent.recommendPackingCode+"]在标签表中不存在")
 						return;
@@ -247,8 +247,9 @@
 					    var unPackingData = await unPackingByPurchase(unPackingParamsPur,this.dataContent.number,this.dataContent.recommendPackingCode,this.dataContent.recommendQty,newPackingCodeData[0].code,qty)
 					}
 					uni.hideLoading()
-					this.showMessage("生成新的箱码【"+newPackingCodeData[0].code+"】请到PC端打印标签")
-					this.$emit("update")
+					// this.showMessage("生成新的箱码【"+newPackingCodeData[0].code+"】请到PC端打印标签")
+					this.$emit("update",newPackingCodeData[0].code)
+					this.cancle();
 				}catch(error){
 					uni.hideLoading()
 					this.showMessage(error)
diff --git a/fe/PDA/pages/task/deliverBoard_detail.vue b/fe/PDA/pages/task/deliverBoard_detail.vue
index c7317b527..11e083bf9 100644
--- a/fe/PDA/pages/task/deliverBoard_detail.vue
+++ b/fe/PDA/pages/task/deliverBoard_detail.vue
@@ -81,7 +81,7 @@
 			<winScanByContainer ref="scanPopup" @getScanResult='getScanResult'></winScanByContainer>
 		<com-balance ref="balanceItems" @selectedItem='selectedBalanceItem'></com-balance>
 		<comUnPacking ref='comUnPacking'
-			@getvalue="getUnPackingCount" title="拆箱">
+			@getvalue="getUnPackingCount" title="拆箱" @update="update">
 		</comUnPacking>
 		<comMessage ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()'></comMessage>
 	</view>
@@ -184,6 +184,10 @@
 			})
 		},
 		methods: {
+			update(newCode){
+				this.showMessage("生成新的箱码【"+newCode+"】请到PC端打印标签");
+				this.getDetail()
+			},
 			openScanPopup() {
 				this.$refs.scanPopup.openScanPopup();
 			},
diff --git a/fe/PDA/pages/task/deliverJis_detail.vue b/fe/PDA/pages/task/deliverJis_detail.vue
index 7cb590848..187a9d195 100644
--- a/fe/PDA/pages/task/deliverJis_detail.vue
+++ b/fe/PDA/pages/task/deliverJis_detail.vue
@@ -82,7 +82,7 @@
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		<winScanByContainer ref="scanPopup" @getScanResult='getScanResult'></winScanByContainer>
 		<comUnPacking ref='comUnPacking'
-			@getvalue="getUnPackingCount" title="拆箱">
+			@getvalue="getUnPackingCount" title="拆箱" @update="update">
 		</comUnPacking>
 		<com-message ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()'
 			@afterCloseScanMessage='closeScanMessage'></com-message>
@@ -189,6 +189,10 @@
 			})
 		},
 		methods: {
+			update(newCode){
+				this.showMessage("生成新的箱码【"+newCode+"】请到PC端打印标签");
+				this.getDetail()
+			},
 			openScanPopup() {
 				this.$refs.scanPopup.openScanPopup();
 			},
diff --git a/fe/PDA/pages/task/issue_detail.vue b/fe/PDA/pages/task/issue_detail.vue
index 1c9e496d6..5f86ad98b 100644
--- a/fe/PDA/pages/task/issue_detail.vue
+++ b/fe/PDA/pages/task/issue_detail.vue
@@ -104,7 +104,7 @@
 		<win-scan-by-pack ref="scanPopup" @getScanResult='getScanResult'></win-scan-by-pack>
 
 		<comUnPacking ref='comUnPacking'
-			@getvalue="getUnPackingCount" title="拆箱" @update="getDetail">
+			@getvalue="getUnPackingCount" title="拆箱" @update="update">
 		</comUnPacking>
 		<com-message ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()'
 			@afterCloseScanMessage='closeScanMessage'></com-message>
@@ -228,6 +228,11 @@
 			})
 		},
 		methods: {
+			update(newCode){
+				this.showMessage("生成新的箱码【"+newCode+"】请到PC端打印标签");
+				this.getDetail()
+			},
+			
 			openScanPopup() {
 				// if (this.allCount === this.scanCount) {
 				// 	this.showMessage("零件已经全部扫描完成");
diff --git a/fe/PDA/pages/task/receipt_detail.vue b/fe/PDA/pages/task/receipt_detail.vue
index 15cf8c3f9..3cc7bd86a 100644
--- a/fe/PDA/pages/task/receipt_detail.vue
+++ b/fe/PDA/pages/task/receipt_detail.vue
@@ -80,7 +80,7 @@
 			@getReceiptResult='getPhotoResult'>
 		</receipt-check>
 		<comUnPacking ref='comUnPacking' 
-			@getvalue="getUnPackingCount" title="拆箱" @update="getDetail">
+			@getvalue="getUnPackingCount" title="拆箱" @update="update">
 		</comUnPacking>
 		<com-message ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()' @afterCloseScanMessage='closeScanMessage'></com-message>
 	</view>
@@ -204,6 +204,10 @@
 			})
 		},
 		methods: {
+			update(newCode){
+				this.showMessage("生成新的箱码【"+newCode+"】请到PC端打印标签");
+				this.getDetail()
+			},
 			//接收
 			receive(callback) {
 				if (this.id != null) {