From 36fc4fa64ba5a7fd9f23b33c94c918d4b3ca70e3 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 24 八月 2022 12:17:37 +0800
Subject: [PATCH] Merge branch 'jkwms' of http://47.97.1.152:5880/r/~whycq/wms-app into jkwms

---
 pages/basics/checkout.vue |   39 +++++++++++++++------------------------
 1 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/pages/basics/checkout.vue b/pages/basics/checkout.vue
index 90c67b3..c2a8ef5 100644
--- a/pages/basics/checkout.vue
+++ b/pages/basics/checkout.vue
@@ -265,32 +265,23 @@
 					success(result) {
 						var res = result.data;
 						if(res.code === 200 ) {
-							if(res.data) {
-								if (that.matList.length == 0) {
-									that.matList.push(res.data)
+							var add = true
+							if(res.data) { 
+								console.log(that.matnr);
+								for(let i = 0;i < that.matList.length; i++) {
+									var matnr = that.matList[i].matnr + '-' +  that.matList[i].batch
+									console.log(matnr);
+									if (matnr === that.matnr) {
+										that.messageToggle('warn');
+										that.messageText = '璇ュ晢鍝佸凡娣诲姞';
+										that.foucss();
+										add = false
+									}
+								}
+								if (add) {
+									that.matList.unshift(res.data);
 									that.listLen = that.matList.length;
 									that.foucss();
-									return;
-								}
-								for(let i = 0;i<that.matList.length;i++) {
-									if (that.matList.length < that.matCount){
-										if(JSON.stringify(that.matList[i]) === JSON.stringify(res.data)) {
-											that.messageToggle('warn');
-											that.messageText = '璇ュ晢鍝佸凡娣诲姞';
-											that.foucss();
-											return;
-										} else {
-											that.matList.unshift(res.data);
-											that.listLen = that.matList.length;
-											that.foucss();
-											return;
-										}
-									} else {
-										that.messageToggle('warn');
-										that.messageText = '宸插嚭鍏ㄩ儴鍟嗗搧锛岃纭鍑哄簱';
-										that.foucss();
-										return;
-									}
 								}
 							}
 						} else if (res.code == 403) {

--
Gitblit v1.9.1