From 295bf43faba9aad26ad70de205887d80a5540144 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 09 四月 2024 22:26:59 +0800
Subject: [PATCH] #

---
 pages/phyz/order/orderCar.vue |   62 ++++++++++---------------------
 1 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/pages/phyz/order/orderCar.vue b/pages/phyz/order/orderCar.vue
index 0d87d96..bad5d50 100644
--- a/pages/phyz/order/orderCar.vue
+++ b/pages/phyz/order/orderCar.vue
@@ -66,15 +66,8 @@
 				orderCarList: [],
 				count: 0,
 				index: 0,
-				barcode: '',
-				agvDevp: '',
-				combMat: {
-					orderNo: '',
-					barcode: '',
-					locNo: '',
-					combMat: null
-				},
-				combMats: []
+				barcode: '100997',
+				agvDevp: 'DI_01F2',
 			}
 		},
 		onShow() {
@@ -141,45 +134,30 @@
 						return;
 					} 
 				}
+				let combMat = { orderNo:'', barcode: '', locNo: '', combMats: [] }
+				let combMats = []
 				for (let item of _this.orderCarList) {
-					_this.combMat.orderNo = item.orderNo
-					_this.combMat.barcode = _this.barcode
-					_this.combMat.locNo = _this.agvDevp
-					_this.combMat.combMat = item
-					_this.combMats.push(_this.combMat)
+					let orderNo = item.orderNo
+					combMat.orderNo = orderNo
+					combMat.barcode = _this.barcode
+					combMat.locNo = _this.agvDevp
+					combMat.combMats = []
+					let combM = {csocode: item.threeCode,isoseq: item.deadTime,matnr: item.matnr,batch: item.batch,anfme: item.pakinQty,maktx: item.maktx,specs: item.specs}
+					combMat.combMats.push(combM)
+					combMats.push(combMat)
 				}
-				this.comb()
+				this.comb(combMats)
 				
 			},
-			startPakin() {
-				let _this = this
-				let params = []
-				let param = { devNo: this.agvDevp, containerCode: this.barcode, }
-				params.push(param)
-				uni.request({
-					url: _this.baseUrl + '/agvMobile/pakin/empty/auth',
-					data: {pad: params},
-					method: 'POST',
-					header: {'token': uni.getStorageSync('token')},
-					success(result) {
-						var res = result.data
-						if (res.code === 200) {
-						} else if (res.code == 403) {
-							setTimeout(() => {
-								uni.reLaunch({
-									url: '../login/login'
-								});
-							}, 1000);
-						} else {
-						}
-					}
-				});
-			},
-			comb(e) {
+			comb(combMats) {
 				let _this = this;
 				uni.request({
-					url: _this.baseUrl + '/agvMobile/comb/auth',
-					data: _this.combMats,
+					url: _this.baseUrl + '/agvMobile/start/pakin/auth',
+					data: JSON.stringify({
+						barcode: _this.barcode,
+						devNo: _this.agvDevp,
+						combParams: combMats
+					}),
 					method: 'POST',
 					header: {
 						'token': uni.getStorageSync('token')

--
Gitblit v1.9.1