From cd51b20703a0ec51b05b714e40538fa22ed7729a Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 7 Mar 2024 10:21:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E6=8B=86?=
 =?UTF-8?q?=E7=AE=B1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/api/index.js                       | 12 ++++++++++++
 fe/PDA/mycomponents/coms/comUnPacking.vue | 22 ++++++++++++++++------
 fe/PDA/pages/task/issue_detail.vue        |  2 +-
 fe/PDA/pages/task/receipt_detail.vue      |  2 +-
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js
index f7ee992d6..bab601259 100644
--- a/fe/PDA/api/index.js
+++ b/fe/PDA/api/index.js
@@ -1340,6 +1340,18 @@ export const unPacking = (params) => request(
 		data: params,
 		method: "post"
 	})
+	
+export const unPackingByPurchase = (params,number,fromPackingCode,fromQty,toPackingCode,toQty) => request(
+	devUrl + "/api/pda/store/transfer-note/split-packing-purchase-receipt?Number="+number+"&FromPackingCode="+fromPackingCode+"&FromQty="+fromQty+"&ToPackingCode="+toPackingCode+"&ToQty="+toQty, { //
+		data: params,
+		method: "post"
+	})
+	
+export const unPackingByIssue = (params,number,fromPackingCode,fromQty,toPackingCode,toQty) => request(
+	devUrl + "/api/pda/store/transfer-note/split-packing-issue?Number="+number+"&FromPackingCode="+fromPackingCode+"&FromQty="+fromQty+"&ToPackingCode="+toPackingCode+"&ToQty="+toQty, { //
+		data: params,
+		method: "post"
+	})
 
 //直接发料
 export const issueDirect = (params) => request(
diff --git a/fe/PDA/mycomponents/coms/comUnPacking.vue b/fe/PDA/mycomponents/coms/comUnPacking.vue
index 3787a018f..c1cdc774c 100644
--- a/fe/PDA/mycomponents/coms/comUnPacking.vue
+++ b/fe/PDA/mycomponents/coms/comUnPacking.vue
@@ -24,7 +24,7 @@
 
 				</view>
 			</view>
-			<comMessage ref="comMessage"></comMessage>
+			<comMessage ref="comMessage" @afterClose="cancle()"></comMessage>
 		</uni-popup>
 	</view>
 </template>
@@ -37,7 +37,9 @@
 	import {
 		generateNewPacking,
 		unPacking,
-		getInventoryLabel
+		getInventoryLabel,
+		unPackingByPurchase,
+		unPackingByIssue
 	} from '@/api/index.js';
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import comNumberBox from '@/mycomponents/common/comNumberBox.vue'
@@ -221,19 +223,27 @@
 			
 			async getDataInfo(qty){
 				try{
+					uni.showLoading({
+						title:"正在加载中...",
+						mask:true
+					})
 					var labelData = await getInventoryLabel(this.dataContent.recommendPackingCode)
 					
 					var newPackingCodeParam = this.setNewPackingCodeParam(labelData,qty)
 					var newPackingCodeData = await generateNewPacking(1,newPackingCodeParam);
+					var unPackingParams;
 					if(this.jobType==6){
-						var unPackingParams= this.setUnPackingParamsByIssue(labelData,qty,newPackingCodeData[0].code)
+						var unPackingParamsIssue= this.setUnPackingParamsByIssue(labelData,qty,newPackingCodeData[0].code)
+					    var unPackingData = await unPackingByIssue(unPackingParamsIssue,this.dataContent.number,this.dataContent.recommendPackingCode,this.dataContent.recommendQty,newPackingCodeData[0].code,qty)
 					}else{
-						var unPackingParams= this.setUnPackingParamsByReceipt(labelData,qty,newPackingCodeData[0].code)
+						var unPackingParamsPur= this.setUnPackingParamsByReceipt(labelData,qty,newPackingCodeData[0].code)
+					    var unPackingData = await unPackingByPurchase(unPackingParamsPur,this.dataContent.number,this.dataContent.recommendPackingCode,this.dataContent.recommendQty,newPackingCodeData[0].code,qty)
 					}
-					
-					var unPackingData = await unPacking(unPackingParams)
+					uni.hideLoading()
 					this.showMessage("生成新的箱码【"+newPackingCodeData[0].code+"】请到PC端打印标签")
+					this.$emit("update")
 				}catch(error){
+					uni.hideLoading()
 					this.showMessage(error)
 				}
 			},
diff --git a/fe/PDA/pages/task/issue_detail.vue b/fe/PDA/pages/task/issue_detail.vue
index c0bc926b2..986cda610 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="拆箱">
+			@getvalue="getUnPackingCount" title="拆箱" @update="getDetail">
 		</comUnPacking>
 		<com-message ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()'
 			@afterCloseScanMessage='closeScanMessage'></com-message>
diff --git a/fe/PDA/pages/task/receipt_detail.vue b/fe/PDA/pages/task/receipt_detail.vue
index 437b507ff..13fc8da70 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="拆箱">
+			@getvalue="getUnPackingCount" title="拆箱" @update="getDetail">
 		</comUnPacking>
 		<com-message ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()' @afterCloseScanMessage='closeScanMessage'></com-message>
 	</view>