From 7e7f17c08a0f18d83eb379ddff1689597fecefde Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 06 六月 2025 12:16:55 +0800
Subject: [PATCH] 修改AGV站点、PDA功能优化

---
 代码管理/ZhongHePDA/pages/materielGroup/Inorderboxing.vue |   37 +++++++++++++++++++++----------------
 1 files changed, 21 insertions(+), 16 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/pages/materielGroup/Inorderboxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/pages/materielGroup/Inorderboxing.vue"
index 4669881..7912ef6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/pages/materielGroup/Inorderboxing.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/pages/materielGroup/Inorderboxing.vue"
@@ -325,11 +325,11 @@
 							var matObj = {
 								matCode: matInfo[1],
 								matProductionDate: matInfo[3],
-								matQty: matInfo[5],
-								orderNo: matInfo[6],
+								matQty: matInfo[4],
+								orderNo: matInfo[5],
 								sn: matSn
 							}
-							var temp = this.matInfos.find(x => x.orderNo == matObj.orderNo);
+							var temp = this.matInfos.find(x => x.sn == matObj.sn);
 							if (!temp) {
 								var tmp = this.matTotal.find(x => x.matCode == matObj.matCode);
 								if (!tmp) {
@@ -371,14 +371,16 @@
 			},
 			inbound() {
 				var postData = {
-					MainData: {
-						"barcode": this.inboundBarcode,
-						"startPoint": this.address
-					}
+					// MainData: {
+					// 	"barcode": this.inboundBarcode,
+					// 	"startPoint": this.address
+					// }
 				}
-				this.$u.post('/api/Inbound/RequestInbound', postData).then(res => {
+				this.$u.post('/api/Task/GenerateInboundTask?stationCode=' + this.address + '&inboundType=200&palletCode=' +
+					this.inboundBarcode, {}).then(res => {
 					if (res.status) {
-						uni.$showMsg(res.message);
+						// uni.$showMsg(res.message);
+						uni.$showMsg("鎴愬姛");
 						this.inboundBarcode = "";
 						this.address = "";
 						setTimeout(() => {
@@ -440,13 +442,16 @@
 					})
 					return;
 				}
-				this.$u.post('/api/Bill_group_stock/PDA_ScanInStock', {
-					MainData: {
-						"pallet_barcode": this.barcode,
-						"orderNo": this.orderNo,
-						"isFull": this.check
-					},
-					DelKeys: this.sns
+				this.$u.post('/api/PDA/MaterielGroup', {
+					"PalletCode": this.barcode,
+					"OrderNo": this.orderNo,
+					"SerialNumbers": this.sns
+					// MainData: {
+					// 	"pallet_barcode": this.barcode,
+					// 	"orderNo": this.orderNo,
+					// 	"isFull": this.check
+					// },
+					// DelKeys: this.sns
 				}).then(res => {
 					if (res.status) {
 						this.$refs.uToast.show({

--
Gitblit v1.9.3