From f0620cb8c555243bc3b75850c169bdd5c0c92b79 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 09 一月 2025 17:33:36 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/淮安PDA/pages/stash/pickingMat.vue |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/pickingMat.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/pickingMat.vue"
index 22087ea..322af18 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/pickingMat.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/pickingMat.vue"
@@ -113,7 +113,11 @@
 		onLoad(res) {
 			this.barcodefocus = false;
 			this.warehouseId = res.warehouseId;
+			if (this.warehouseId == 5) {
+				this.address = "8005"
+			}
 			this.istrue = false;
+			this.addressFocus = false;
 		},
 		methods: {
 			onClickItem(e) {
@@ -185,10 +189,10 @@
 				}
 				this.$u.post('/api/OutStockLockInfo/MaterialPick?palletCode=' + this.barcode, {}).then(res => {
 					if (res.status) {
-						if(this.warehouseId==5){
-							this.Finish("8005");
-						}
-						
+						// if(this.warehouseId==5){
+						// 	this.Finish("8005");
+						// }
+
 						uni.$showMsg('鎷i�夋垚鍔�!')
 						this.barcode = "";
 						this.matInfos = [];
@@ -200,7 +204,7 @@
 					}
 				})
 			},
-			Finish(code){
+			Finish(code) {
 				this.$u.post('http://127.0.0.1:9291/api/CTU_AGV/PutFinish?&code=' + code).then(
 					res => {
 						if (res.status) {

--
Gitblit v1.9.3