From 870e18d7cd8efc6616bfc84f3e8212ae1fd23966 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期三, 14 一月 2026 15:58:34 +0800
Subject: [PATCH] 修改了AGV订单入库的逻辑

---
 pages/order/orderPakin3.vue |   75 ++-----------------------------------
 1 files changed, 5 insertions(+), 70 deletions(-)

diff --git a/pages/order/orderPakin3.vue b/pages/order/orderPakin3.vue
index f281a0e..08c3709 100644
--- a/pages/order/orderPakin3.vue
+++ b/pages/order/orderPakin3.vue
@@ -75,7 +75,7 @@
 		</scroll-view>
 
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
-		<view class="buttom">銆�
+		<view class="buttom">
 			<button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
 			<button size="mini" @click="reset()">閲嶇疆</button>
 <!-- 			<button size="mini" type="primary" @click="combConfirmAndFillEmptyPallets('warn')">缁勬墭骞惰ˉ绌烘墭鐩�</button> -->
@@ -188,7 +188,6 @@
 			}
 		},
 		onLoad() {
-
 		},
 		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
@@ -480,70 +479,6 @@
 					this.dataList.unshift(mat)
 				}
 			},
-			
-			//缁勬墭骞惰ˉ绌烘墭鐩�
-			combAndFillEmptyPallets() {
-				uni.vibrateShort();
-				let that = this;
-				if (that.barcode === '') {
-					this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
-					this.messageToggle('error')
-					return;
-				}
-				if (that.dataList.length === 0) {
-					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
-					this.messageToggle('error')
-					return;
-				}
-				if (that.floor === '') {
-					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'
-						this.messageToggle('error')
-						return;
-					}
-				}
-				uni.request({
-					url: that.baseUrl + '/mobile/comb/auth',
-					data: JSON.stringify({
-						beBatch : 1,
-						barcodeSize : this.fullPlt,
-						rsta: that.rsta,
-						barcode: that.barcode,
-						combMats: that.dataList
-					}),
-					method: 'POST',
-					header: {
-						'token': uni.getStorageSync('token')
-					},
-					success(result) {
-						var res = result.data
-						if (res.code === 200) {
-							that.resst();
-							that.messageText = "缁勬墭鎴愬姛"
-							that.messageToggle('success')
-							const innerAudioContext = uni.createInnerAudioContext();
-							innerAudioContext.src = '/static/music/pakinOk.mp3';
-							innerAudioContext.play()
-						} else if (res.code == 403) {
-							that.messageText = res.msg
-							that.messageToggle('error')
-							setTimeout(() => {
-								uni.reLaunch({
-									url: '../login/login'
-								});
-							}, 1000);
-						} else {
-							that.messageText = res.msg
-							that.messageToggle('error')
-						}
-					}
-				});
-			},
 			// 淇敼鎵瑰彿
 			revise(item, i) {
 				this.matnr = this.dataList[i].matnr
@@ -608,8 +543,8 @@
 			comb() {
 				uni.vibrateShort();
 				let that = this;
-				if (that.orderNo === '') {
-					this.messageText = "璇疯緭鍏ヨ鍗曟潯鐮�"
+				if (that.floor  === '') {
+					this.messageText = "璇疯緭鍏ュ叆搴撳崟"
 					this.messageToggle('error')
 					return;
 				}
@@ -621,7 +556,7 @@
 				if (that.dataList.length === 0) {
 					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
 					this.messageToggle('error')
-					return;
+					return;	
 				}
 				for (var i = 0; i < that.dataList.length; i++) {
 					if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
@@ -636,7 +571,7 @@
 				uni.request({
 					url: that.baseUrl + '/mobile/comb/auth',
 					data: JSON.stringify({
-						orderNo: that.orderNo,
+						orderNo: that.floor,
 						barcode: that.barcode,
 						combMats: that.dataList,
 						ck: that.floor,

--
Gitblit v1.9.1