From 1d37a83b02215208c03f27c7918c0fa9be2e66bf Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 30 Oct 2024 09:55:01 +0800
Subject: [PATCH] =?UTF-8?q?YT-565=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E6=89=93=E5=8D=B0=E5=BA=93=E5=AD=98=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=EF=BC=8C=E6=89=AB=E6=8F=8F=E6=8F=90=E7=A4=BA=E5=B8=A6=E5=8C=85?=
 =?UTF-8?q?=E8=A3=85HPQ;V1.0;UKG;E;L;O;Sdefault;LB017020;B20241029;A;Q5.00?=
 =?UTF-8?q?0000;IQPLP1-20200-00;PPN20241029-0000000002;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/issue/coms/comScanIssuePack.vue | 25 +++++++++++++++--------
 src/pages/issue/job/issueDetail.vue       |  7 ++++---
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue
index e4e88005..ecf674cf 100644
--- a/src/pages/issue/coms/comScanIssuePack.vue
+++ b/src/pages/issue/coms/comScanIssuePack.vue
@@ -55,7 +55,7 @@
 					<view class="">
 						<view class="">
 							<win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true"
-								headerType="HPQ,HMQ" :isShowHistory="false">
+								headerType="HPQ,HMQ" :isShowHistory="false" :locationCode='locationCode'>
 							</win-com-scan>
 
 							<view style="width: 100%;">
@@ -152,6 +152,10 @@
 				type: String,
 				default: ''
 			},
+			locationCode:{
+				type: String,
+				default: ''
+			}
 		},
 		data() {
 			return {
@@ -179,7 +183,7 @@
 					fontSize: "100rpx"
 				},
 				bussinessCode: 'Issue',
-				toLocationAreaTypeList: []
+				toLocationAreaTypeList: [],
 			}
 		},
 		created() {
@@ -270,7 +274,7 @@
 				}
 			},
 
-			queryBalance(result) {
+			queryBalance(result , managementType ) {
 				try {
 					let that = this;
 					// if (that.fromLocationCode == '') {
@@ -281,7 +285,12 @@
 					// }
 					let packageInfo = result.package;
 					let itemCode = result.label.itemCode;
-					let packingCode = result.label.packingNumber;
+					let packingCode = '';
+					if(managementType == 'BY_BATCH' || managementType == 'BY_QUANTITY'){
+						packingCode = ''
+					}	 else{
+						packingCode =  result.label.packingNumber;
+					}
 					let lot = result.label.batch;
 					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
 					if (item == undefined) {
@@ -401,7 +410,7 @@
 			},
 
 
-			onScan(result) {
+			onScan(result, managementType) {
 				if (!result.package) {
 					this.showErrorMessage('扫描数据错误[' + result.label.code + "]",
 						res => {
@@ -427,12 +436,12 @@
 						this.getToLocationBalance(result)
 					}
 				}else{
-					this.queryBalance(result)
+					this.queryBalance(result, managementType)
 				}
 			},
 
 			//查询到目标库位的库存余额
-			getToLocationBalance(result) {
+			getToLocationBalance(result, managementType) {
 				uni.showLoading({
 					title: '查询中',
 					mask: true
@@ -470,7 +479,7 @@
 				// 	value: this.toLocationAreaTypeList.join(',')
 				// })
 
-				this.queryBalance(result);
+				this.queryBalance(result, managementType);
 				// var params = {
 				// 	filters: filters,
 				// 	pageNo: 1,
diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index 06d17c2f..e171f0ed 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -46,7 +46,7 @@
 
 		<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
 		<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'
-			@afterScan='afterScan'>
+			@afterScan='afterScan' :locationCode='fromLocationCode'>
 		</com-scan-issue-pack>
 		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
 		<comMessage ref="comMessage"></comMessage>
@@ -115,7 +115,8 @@
 				jobStatus: "",
 				scanMessage: '',
 				managementList: [],
-				managementType: ""
+				managementType: "",
+				fromLocationCode:''
 			};
 		},
 
@@ -300,7 +301,7 @@
 					this.showErrorMessage("请扫描您需要提交的发料任务")
 					return
 				}
-				console.log("提交参数", JSON.stringify(params));
+				console.log("提交参数", params);
 				issueJobSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {