From 47867c8eb83154430c088a1fa355225b8a1a07b9 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 28 Nov 2023 15:52:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B0=E8=B4=A7=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/inspect/job/inspectDetail.vue    | 45 +++++++++++++-------------
 pages/inspect/job/inspectResult.vue    |  8 +++--
 pages/putaway/record/putawayRecord.vue |  4 +--
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue
index 071da10b..5cc879dc 100644
--- a/pages/inspect/job/inspectDetail.vue
+++ b/pages/inspect/job/inspectDetail.vue
@@ -31,7 +31,6 @@
 </template>
 
 <script>
-
 	import {
 		takeInspectJob,
 		cancleTakeInspectJob,
@@ -105,7 +104,7 @@
 				// }
 				this.getDetail();
 			}
-			
+
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
@@ -181,9 +180,9 @@
 								res.crackQty = 0;
 								res.sampleQty = 0;
 								res.notPassedQty = 0;
-								res.failedReason ="";
+								res.failedReason = "";
 								res.photos = ""
-								res.inspectResult =""
+								res.inspectResult = ""
 							})
 							that.detailSource = getDataSource(that.subList);
 						} else {
@@ -265,9 +264,8 @@
 						this.showMessage("物料号【" + itemCode + "】不在列表中")
 					} else {
 						var itemDetail = detail.subList.find(r => {
-							return r.packingNumber == packingNumber
-							&&
-							r.batch == batch
+							return r.packingNumber == packingNumber &&
+								r.batch == batch
 						})
 						if (itemDetail == undefined) {
 							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
@@ -282,7 +280,8 @@
 										']不一致,是否继续上架?', res => {
 											if (res) {
 												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty)>Number(result.balance.qty)?Number(result.balance.qty):Number(result.label.qty);
+												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
+													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
 												this.calcHandleQty();
 											} else {
 												this.scanPopupGetFocus();
@@ -290,7 +289,8 @@
 										});
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty)>Number(result.balance.qty)?Number(result.balance.qty):Number(result.label.qty);
+									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance.qty) ? Number(
+										result.balance.qty) : Number(result.label.qty);
 									this.calcHandleQty();
 								}
 							}
@@ -302,12 +302,12 @@
 				}
 			},
 
-			 commit() {
-				 this.scanCount = getScanCount(this.subList);
-				 if( this.scanCount==0){
-					 this.showErrorMessage("扫描数为0,请先扫描")
-					 return;
-				 }
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
 					this.submitJob();
@@ -342,7 +342,7 @@
 					if (res.data) {
 						this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data, )
 					} else {
-						this.showErrorMessage("提交失败"+res.msg)
+						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}
 				}).catch(error => {
 					uni.hideLoading();
@@ -417,7 +417,7 @@
 							detail.notPassedQty = detail.notPassedQty;
 							detail.goodQty = detail.qty - detail.failedQty - detail.crackQty;
 							detail.inspectUser = this.$store.state.user.id
-							
+
 							//合格数==样品数，全部合格
 							if (detail.goodQty == detail.qty) {
 								detail.toInventoryStatus = "OK"
@@ -435,18 +435,17 @@
 					})
 				})
 				this.jobContent.subList = list
+				this.jobContent.nextAction = "PARTIAL_OK";
 				return this.jobContent;
 			},
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					setTimeout(() => {
-						uni.navigateTo({
-							url: './inspectJob'
-						})
-					}, 3000)
+					uni.navigateTo({
+						url: './inspectJob'
+					})
 				})
-				
+
 			},
 
 		}
diff --git a/pages/inspect/job/inspectResult.vue b/pages/inspect/job/inspectResult.vue
index 4e6656a8..becbe193 100644
--- a/pages/inspect/job/inspectResult.vue
+++ b/pages/inspect/job/inspectResult.vue
@@ -355,6 +355,8 @@
 						res.inspectResult =""
 						res.inspectUser =this.$store.state.user.id
 					})
+					
+					this.jobContent.nextAction = this.nextAction;
 					this.submitJob(this.jobContent)
 					
 				} else {
@@ -379,6 +381,7 @@
 							res.inspectResult =""
 							re.inspectUser =this.$store.state.user.id
 						})
+						this.jobContent.nextAction = this.nextAction;
 						this.submitJob(this.jobContent)
 					//部分合格
 					} else if (this.nextAction == "PARTIAL_OK") {
@@ -401,6 +404,7 @@
 							res.inspectResult =""
 							res.inspectUser =this.$store.state.user.id
 						})
+						this.jobContent.nextAction = this.nextAction;
 						this.submitJob(this.jobContent)
 					}
 				}
@@ -415,7 +419,7 @@
 					if (res.data) {
 						this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data, )
 					} else {
-						this.showErrorMessage("提交失败"+res.msg)
+						this.showErrorMessage("提交失败["+res.msg+"]")
 					}
 					
 				}).catch(error=>{
@@ -425,11 +429,9 @@
 			},
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					setTimeout(() => {
 						uni.navigateTo({
 							url: './inspectJob'
 						})
-					}, 3000)
 				})
 			},
 
diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue
index 49a5ea04..d30cc4ca 100644
--- a/pages/putaway/record/putawayRecord.vue
+++ b/pages/putaway/record/putawayRecord.vue
@@ -254,12 +254,11 @@
 					this.showMessage("请先选择目标库位")
 					return;
 				}
-				//允许部分提交
+				
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
 				});
-
 				
 				if(this.fromType=="requestType"){
 					var params = this.setParams(false)
@@ -276,6 +275,7 @@
 					// 	this.showErrorMessage(error)
 					// })
 				}else {
+					//记录有目标库位，需要查询管理模式
 					var itemCodes = []
 					this.detailSource.forEach(item => {
 						itemCodes.push(item.itemCode)