From fe46075f59ba775f3d772ea35da41cb3475d2de1 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 13 十一月 2023 15:43:11 +0800
Subject: [PATCH] AGV扫码

---
 pages/tzsk/AGV/AGVPakin.vue |   51 +++++++++++++++++++++++++++++++--------------------
 1 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/pages/tzsk/AGV/AGVPakin.vue b/pages/tzsk/AGV/AGVPakin.vue
index 4fd6b47..0358ff6 100644
--- a/pages/tzsk/AGV/AGVPakin.vue
+++ b/pages/tzsk/AGV/AGVPakin.vue
@@ -233,6 +233,7 @@
 					},
 					success(res) {
 						res = res.data
+						console.log(res);
 						if (res.code === 200) {
 							if(res.data && res.data[0].combMats) {
 								for (let i = 0; i < res.data[0].combMats.length; i++) {
@@ -243,11 +244,11 @@
 									that.barcodeFocus = true
 								}, 10);
 							} else {
-								uni.showToast({
-									title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝g‘',
-									icon: "none",
-									position: 'top'
-								})
+								// uni.showToast({
+								// 	title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝g‘',
+								// 	icon: "none",
+								// 	position: 'top'
+								// })
 							}
 						} else if (res.code == 403) {
 							uni.showToast({
@@ -284,7 +285,10 @@
 			},
 			barcodeInput() {
 				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
-				this.barcode = this.barcode.split('_')[1]
+				if (this.barcode.split('_')[1]) {
+					this.barcode = this.barcode.split('_')[1]
+				} 
+				// this.barcode = this.barcode.split('_')[1]
 				setTimeout(() => {
 					let len = this.barcode.length
 					if (len != 10) {
@@ -320,12 +324,12 @@
 			findMat() {
 				let that = this
 				// 鍒ゆ柇鐗╂枡闀垮害鏄惁涓�1
-				if (that.dataList.length >= 1) {
-					this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
-					this.messageToggle('warn')
-					that.matnr = ''
-					return
-				}
+				// if (that.dataList.length >= 1) {
+				// 	this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
+				// 	this.messageToggle('warn')
+				// 	that.matnr = ''
+				// 	return
+				// }
 				uni.request({
 					url: that.baseUrl + '/mat/auth',
 					data: { matnr: that.matnr },
@@ -342,12 +346,14 @@
 								success: function(res) {
 									res.eventChannel.emit('mat', {
 										data: result.data,
-										tempOrderInfo: that.tempOrderInfo
+										// tempOrderInfo: that.tempOrderInfo
 									})
 								},
 								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 								events: {
 									matList: function(data) {
+										data.data['csocode'] = ''
+										data.data['isoseq'] = ''
 										that.checkMat(data.data)
 										that.focuss()
 									},
@@ -497,11 +503,11 @@
 					this.messageToggle('error')
 					return;
 				}
-				if (that.dataList.length > 1) {
-					this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
-					this.messageToggle('error')
-					return;
-				}
+				// if (that.dataList.length > 1) {
+				// 	this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
+				// 	this.messageToggle('error')
+				// 	return;
+				// }
 				for (var i = 0; i < that.dataList.length; i++) {
 					if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
 						this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
@@ -509,7 +515,9 @@
 						return;
 					}
 				}
-				// console.log(that.dataList);
+				console.log(that.dataList);
+				console.log(that.barcode);
+				console.log(that.orderNo);
 				// return
 				uni.request({
 					url: that.baseUrl + '/agvMobile/comb/auth',
@@ -525,7 +533,10 @@
 					success(result) {
 						var res = result.data
 						if (res.code === 200) {
-							that.resst();
+							that.dataList = []
+							that.findOrder()
+							// that.resst();
+							that.barcode = ''
 							that.messageText = "缁勬墭鎴愬姛"
 							that.messageToggle('success')
 							const innerAudioContext = uni.createInnerAudioContext();

--
Gitblit v1.9.1