From 813d7b03c626f038296800425ea11592efa12a38 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 29 Nov 2024 14:56:51 +0800
Subject: [PATCH] =?UTF-8?q?YT-1350da=E6=88=90=E5=93=81=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=EF=BC=8C=E6=89=AB=E6=8F=8F=E7=AE=B1=E7=A0=81=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=EF=BC=8C=E6=9C=89=E5=8C=85?=
 =?UTF-8?q?=E8=A3=85=E5=8F=B7=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E4=B8=8D=E8=B6=B3=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/deliver/job/deliverDetailBatch.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/pages/deliver/job/deliverDetailBatch.vue b/src/pages/deliver/job/deliverDetailBatch.vue
index 526e8e00..3c8d6fde 100644
--- a/src/pages/deliver/job/deliverDetailBatch.vue
+++ b/src/pages/deliver/job/deliverDetailBatch.vue
@@ -547,7 +547,7 @@
 							detail.totalQty =calc.add(detail.totalQty,item.handleQty)
 							if(item.scaned){
 								if(item.handleQty>item.balance.qty){
-									str2 +=	`批次【${item.batch}】提交数量【${item.handleQty}】不可以大于库存数量【${item.balance.qty}】`
+									str2 +=	`物料号【${detail.itemCode}】批次【${item.batch}】提交数量【${item.handleQty}】不可以大于库存数量【${item.balance.qty}】`
 								}
 							}
 					})
@@ -561,25 +561,30 @@
 						}
 					}
 				})
-			
+			// this.jobContent.allowSmallerQty = "FALSE"
+			// this.jobContent.allowBiggerQty = "FALSE"
 				if (this.jobContent.allowSmallerQty == "FALSE") {
 					if (str) {
 						str = '不允许提交\n' + str
 						this.showErrorMessage(str)
+						return false
 					}
 				}
 				if (this.allowBiggerQty == 'FALSE') {
 					if (str1) {
 						str1 = '不允许提交\n' + str1
 						this.showErrorMessage(str1)
+						return false
 					}
 				}
 				
 				if (str2) {
 					str2 = '不允许提交\n' + str2
 					this.showErrorMessage(str2)
+					return false
 				}
-				return str || str1 || str2 ? false : true
+				
+				return true
 			
 			},