From ab7f9e10b46b6319546183116c94634f4c848b8e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 29 Nov 2024 09:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=8F=91=E8=B4=A7=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/deliver/job/deliverDetailBatch.vue | 13 ++++++++-----
 src/pages/deliver/job/deliverJob.vue         |  5 ++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/pages/deliver/job/deliverDetailBatch.vue b/src/pages/deliver/job/deliverDetailBatch.vue
index b12a32c9..9ad35d8c 100644
--- a/src/pages/deliver/job/deliverDetailBatch.vue
+++ b/src/pages/deliver/job/deliverDetailBatch.vue
@@ -551,11 +551,14 @@
 								}
 							}
 					})
-					if(detail.handleQty < detail.taskQty){
-						str +=	`物料号【${detail.itemCode}】数量【${detail.handleQty}】不允许小于任务数量【${detail.taskQty}】\n`
-					}
-					if(detail.handleQty > detail.taskQty){
-						str1 +=	`物料号【${detail.itemCode}】数量【${detail.handleQty}】不允许大于任务数量【${detail.taskQty}】\n`
+					const isScaned  = detail.subList.some(cur=>cur.scaned)
+					if(isScaned){
+						if(detail.handleQty < detail.taskQty){
+							str +=	`物料号【${detail.itemCode}】数量【${detail.handleQty}】不允许小于任务数量【${detail.taskQty}】\n`
+						}
+						if(detail.handleQty > detail.taskQty){
+							str1 +=	`物料号【${detail.itemCode}】数量【${detail.handleQty}】不允许大于任务数量【${detail.taskQty}】\n`
+						}
 					}
 				})
 			
diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue
index 6aeda18c..7d33ce40 100644
--- a/src/pages/deliver/job/deliverJob.vue
+++ b/src/pages/deliver/job/deliverJob.vue
@@ -199,9 +199,8 @@
 				getManagementPrecisions([item.itemCode], item.fromLocationCode, ret => {
 					if (ret.success) {
 						this.managementList = ret.list;
-						this.managementType = this.managementList.some(cur => cur.ManagementPrecision == 'BY_BATCH') ?
-							'BY_BATCH' : ''
-						if (this.managementType == 'BY_BATCH') {
+						this.managementType = this.managementList&&this.managementList[0]&&this.managementList[0].ManagementPrecision
+						if (this.managementType == 'BY_BATCH' || this.managementType == 'BY_QUANTITY') {
 							uni.navigateTo({
 								url: './deliverDetailBatch?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
 							});