From 4f09432e37e3e2385dea7e43fc60a453050bc9bf Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 13 Dec 2023 09:02:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/unPlanned/job/receiptJobDetail.vue | 43 ++++++++++++------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/pages/unPlanned/job/receiptJobDetail.vue b/pages/unPlanned/job/receiptJobDetail.vue
index e95ec319..43ae3769 100644
--- a/pages/unPlanned/job/receiptJobDetail.vue
+++ b/pages/unPlanned/job/receiptJobDetail.vue
@@ -104,15 +104,14 @@
 			this.id = option.id;
 			if (this.id != undefined) {
 				// 	//新建的任务自动接收
-				// if (option.status == "JOB_PENDING") {
-				// 	this.receive((callback => {
-				// 		this.received = true;
-				// 		this.getDetail();
-				// 	}));
-				// } else {
-				// 	this.getDetail();
-				// }
-				this.getDetail();
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.received = true;
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
 			}
 		},
 		//返回首页
@@ -278,7 +277,7 @@
 			checkLocation() {
 				var isPass = true;
 				if (this.toLocationCode == "" || this.toLocationCode == null) {
-					this.showMessageHint('请扫描收货库位', callback => {
+					this.showMessageHint('请扫描目标库位', callback => {
 						this.$refs.comScanLocation.showLocation();
 					})
 			
@@ -311,17 +310,18 @@
 						this.managementList = res.list;
 						var params = this.setParams()
 						console.log("提交参数", JSON.stringify(params));
-						// unPlannedReceiptJobSubmit(params).then(res => {
-						// 	if (res.data) {
-						// 		this.showCommitSuccessMessage("提交成功<br>生成计划外入库记录<br>" + res.data)
-						// 	} else {
-						// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-						// 	}
-						// 	uni.hideLoading()
-						// }).catch(error => {
-						// 	uni.hideLoading()
-						// 	this.showErrorMessage(error)
-						// })
+						unPlannedReceiptJobSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成计划外入库记录<br>" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+							
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
 					} else {
 						uni.hideLoading();
 						this.showErrorMessage(res.message);
@@ -340,6 +340,7 @@
 								detail.packingNumber, detail.batch);
 							detail.toPackingNumber = info.packingNumber;
 							detail.toBatch = info.batch;
+							detail.toLocationCode = this.toLocationCode
 							detail.toContainerNumber = '';
 							subList.push(detail)
 						}