From b132c5f8902a5d4859c857239a4f0f3cd596baf7 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 23 May 2024 15:37:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1bug+?=
 =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/deliver/record/deliverRecord.vue |  5 +++-
 src/pages/issue/coms/comScanIssuePack.vue  | 18 +++++++++-----
 src/pages/issue/job/issueDetail.vue        | 28 ++++++++++++----------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/pages/deliver/record/deliverRecord.vue b/src/pages/deliver/record/deliverRecord.vue
index 9e58789d..a17cdd40 100644
--- a/src/pages/deliver/record/deliverRecord.vue
+++ b/src/pages/deliver/record/deliverRecord.vue
@@ -114,10 +114,12 @@
 				customerText: "",
 				customerCode : "",
 				dataContent:{},
-				managementList:[]
+				managementList:[],
+				deliverType:''//发货类型：寄售库CUST，三方库THIRD_PARTY
 			};
 		},
 		onLoad(option) {
+			this.deliverType = option.deliverType
 
 			var typeCode = "Deliver"
 			getBusinessType(typeCode, res => {
@@ -375,6 +377,7 @@
 				this.dataContent.customerCode = this.customerCode;
 				this.dataContent.fromWarehouseCode = this.detailSource[0].subList[0].warehouseCode;
 				this.dataContent.toWarehouseCode = this.toWarehouseCode;
+				this.dataContent.deliverType = this.deliverType;
 				return this.dataContent;
 			},
 
diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue
index 8d06bfb4..6ba5d072 100644
--- a/src/pages/issue/coms/comScanIssuePack.vue
+++ b/src/pages/issue/coms/comScanIssuePack.vue
@@ -436,6 +436,9 @@
 
 			addRecord(batch, label, balance, packageInfo) {
 				let record = this.creatRecord(label, balance, packageInfo);
+				if(!batch.packingNumber){//解决发料任务删除的bug-wyf
+					batch.packingNumber = label.packingNumber
+				}
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				this.calcBatchHandleQty(batch);
@@ -487,14 +490,17 @@
 							this.issueRecord.splice(index, 1)
 
 							let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode);
+							
 							if (item != undefined) {
+								
 								item.Locations.forEach(l => {
-									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
-										.batch == record.batch);
-									let rIndex = batch.Records.findIndex(r => r.packingNumber == record
-										.packingNumber && r
-										.batch == record.batch);
-									batch.Records.splice(rIndex, 1);
+									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b.batch == record.batch);
+									
+									if(batch&&batch.Records&&batch.Records.length>0){
+										let rIndex = batch.Records.findIndex(r => r.packingNumber == record.packingNumber && r.batch == record.batch);
+										batch.Records.splice(rIndex, 1);
+									}
+									
 								})
 							}
 							this.$emit('updateData', item);
diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index 97e4b57b..052b6f7a 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -243,11 +243,7 @@
 			// },
 
 			submit() {
-				let params = this.setParams()
-				if(!params.subList||params.subList.length==0){
-					this.showErrorMessage("请扫描您需要提交的发料任务")
-					return
-				}
+				
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
@@ -264,13 +260,13 @@
 
 				//使用在途库，不查询管理模式
 				if (this.jobContent.useOnTheWayLocation == 'TRUE') {
-					// this.submitJob();
+					this.submitJob();
 				} else {
 					//获取管理模式，封装参数
 					getManagementPrecisions(itemCodes, locationCode, res => {
 						if (res.success) {
 							this.managementList = res.list;
-							// this.submitJob();
+							this.submitJob();
 						} else {
 							uni.hideLoading();
 							this.showErrorMessage(res.message);
@@ -281,6 +277,11 @@
 
 			submitJob() {
 				var params = this.setParams()
+				if(!params.subList||params.subList.length==0){
+					uni.hideLoading()
+					this.showErrorMessage("请扫描您需要提交的发料任务")
+					return
+				}
 				console.log("提交参数", JSON.stringify(params));
 
 				issueJobSubmit(params).then(res => {
@@ -342,8 +343,8 @@
 											// 		.packingNumber;
 											// 	record.toBatch = r.batch;
 											// } else {
-												var info =
-													getPackingNumberAndBatch(
+												debugger
+												var info = getPackingNumberAndBatch(
 														this.managementList, r
 														.itemCode,
 														r.packingNumber, r
@@ -399,15 +400,18 @@
 			},
 
 			updateData(record) {
+				console.log('updateData',record)
+				console.log('this.detailSource',this.detailSource)
+				
 				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
 				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
 				let itemHandleQty = 0;
+				
 				if (item != undefined) {
 					item.Locations.forEach(l => {
-						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
-								.packingNumber == null || b.packingNumber == '') && b.batch ==
-							record.batch);
+						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b.packingNumber == null || b.packingNumber == '') && b.batch == record.batch);
 						let handleQty = 0;
+						
 						if (batch != undefined) {
 							batch.Records.forEach(res => {
 								handleQty = calc.add(handleQty,res.qty)