From edbd0076951445342a913531e2c66ea82f797ece Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 27 六月 2024 13:29:26 +0800
Subject: [PATCH] #

---
 pages/mat/matSelected.vue |    9 ++++++---
 pages/pakin/bomPakin.vue  |    7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index 8b35956..a625ec9 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -64,11 +64,14 @@
 			eventChannel.on('mat', function(data) {
 				that.mat = data.data
 				console.log(data.data);
-				if (data.data.maxNum) {
+				if (data.data.maxNum > 0) {
 					that.mat.anfme = data.data.maxNum
-				} else {
+					that.max = data.data.maxNum
+				} else if (data.data.maxNum == 0) {
+					uni.showToast({title: '褰撳墠鐗╂枡鏈�澶у彲鍏ユ暟閲忎负 0', icon: "none", position: 'top'});
 					that.mat.anfme = 0
-				}
+					that.max = data.data.maxNum
+				} 
 				
 			})
 			
diff --git a/pages/pakin/bomPakin.vue b/pages/pakin/bomPakin.vue
index 426c5fb..5a03768 100644
--- a/pages/pakin/bomPakin.vue
+++ b/pages/pakin/bomPakin.vue
@@ -287,8 +287,10 @@
 							that.matData = result.data
 							that.matnr = ''
 							that.matData['batch'] = ''
-							if (that.maxAnfme) {
+							if (that.maxAnfme > 0) {
 								that.matData['maxNum'] = that.maxAnfme
+							} else if (that.maxAnfme == 0){
+								that.matData['maxNum'] = 0
 							}
 							uni.navigateTo({
 								url: "../mat/matSelected",
@@ -470,8 +472,9 @@
 					}
 				}
 				uni.request({
-					url: that.baseUrl + '/mobile/comb/auth',
+					url: that.baseUrl + '/mobile/comb/auth2',
 					data: JSON.stringify({
+						bomCode: that.bomCode,
 						barcode: that.barcode,
 						combMats: that.dataList
 					}),

--
Gitblit v1.9.1