From 340c92cd05a7092f2dbcda797e99c3eaf86a8231 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 28 Oct 2024 14:01:23 +0800
Subject: [PATCH] =?UTF-8?q?YT-508=E5=90=88=E6=A0=BC=E8=BD=AC=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=9F=E8=BF=98=E6=98=AF=E6=8C=89=E5=8D=95=E7=AE=B1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A0=A1=E9=AA=8C=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=EF=BC=9B=E6=8F=90=E4=BA=A4=E5=90=8E=E7=94=9F=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BA=8B=E5=8A=A1=E4=B8=AD=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E4=B8=BA0=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=AF=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E6=89=AB=E6=8F=8F=E7=9A=84=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventoryMove/job/inventoryMoveDetail.vue | 99 ++++++++++++-------
 1 file changed, 65 insertions(+), 34 deletions(-)

diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index 1b3324c1..c17ae97c 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -389,22 +389,41 @@
 			},
 
 
-			commit() {
+			async commit() {
 				this.scanCount = getScanCount(this.subList);
 				if (this.scanCount == 0) {
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
 				}
-
+//查询管理模式
+				this.managementList = [];
+				var precisionStrategParams = this.setPrecisionStrategParams()
+				await getPrecisionStrategyList(precisionStrategParams, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						this.managementType = this.managementList&& this.managementList[0]&& this.managementList[0].ManagementPrecision ? this.managementList[0].ManagementPrecision : 'BY_PACKAGING'
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				})
 				//允许部分提交
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
-					this.checkCount();
+					if(this.managementType == 'BY_BATCH'){
+						this.checkCount();
+					}else{
+						this.checkCountBatch();
+					}
 				} else if (this.scanCount < this.subList.length) {
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
-						this.checkCount();
+						if(this.managementType == 'BY_BATCH' || this.managementType == 'BY_QUANTITY' ){
+							this.checkCountBatch();
+						}else{
+							this.checkCount();
+						}
 					} else {
 						//不允许部分提交，提示
 						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
@@ -443,44 +462,56 @@
 					this.submitJob()
 				}
 			},
-
+			checkCountBatch(){
+				// 提交的数量和任务数量不一致提示
+				let str = ''
+				this.detailSource.forEach((item) => {
+					item.subList.forEach(cur => {
+						if (cur.qty != cur.handleQty) {
+							var tempHandleQty = 0
+							if (cur.handleQty) {
+								tempHandleQty = cur.handleQty
+							} else {
+								tempHandleQty = 0
+							}
+							str +=
+								`提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n`
+						}
+					})
+				})
+				if (str) {
+					str = '任务明细未全部完成,是否提交?\n' + str
+					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
+						if (res) {
+							this.submitJob()
+						}
+					});
+				} else {
+					this.submitJob()
+				}
+			},
 			submitJob() {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
 				});
-
-				//查询管理模式
-				this.managementList = [];
-				var precisionStrategParams = this.setPrecisionStrategParams()
-				getPrecisionStrategyList(precisionStrategParams, res => {
-					if (res.success) {
-						this.managementList = res.list;
-
-						var params = this.setParams()
-						console.log("提交" + JSON.stringify(params))
-						inventoryMoveSubmit(params).then(res => {
-							uni.hideLoading()
-							if (res.data) {
-								let showTitle = this.title
-								if (this.title.indexOf('任务') == this.title.length - 2) {
-									showTitle = this.title.replace('任务', '')
-								}
-								this.showCommitSuccessMessage("提交成功\n生成" + showTitle + "记录\n" + res.data)
-							} else {
-								this.showErrorMessage("提交失败[" + res.msg + "]")
-							}
-						}).catch(error => {
-							uni.hideLoading()
-							this.showErrorMessage(error)
-						})
+				var params = this.setParams()
+				console.log("提交" + JSON.stringify(params))
+				inventoryMoveSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						let showTitle = this.title
+						if (this.title.indexOf('任务') == this.title.length - 2) {
+							showTitle = this.title.replace('任务', '')
+						}
+						this.showCommitSuccessMessage("提交成功\n生成" + showTitle + "记录\n" + res.data)
 					} else {
-						uni.hideLoading();
-						this.showErrorMessage(res.message);
+						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}
-
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
 				})
-
 			},
 
 			setPrecisionStrategParams() {