From 4dd24c39a6c0e598b72c1a22eebec3ef6f66bbef Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 10 一月 2025 11:49:03 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

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

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue"
index 49cb269..cc69b87 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue"
@@ -198,6 +198,8 @@
 				this.Testlabel = "鏁伴噺:";
 				this.Testplaceholder = "璇疯緭鍏ユ暟閲�";
 				this.Initiallife = 16;
+			} else if (this.warehouseId == 5) { //杈呮枡浠撳簱鍖篒D
+				this.address = "8005";
 			}
 			this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
 			this.getData();
@@ -348,7 +350,7 @@
 			},
 			snInput() {
 				this.$nextTick(() => {
-					if (this.warehouseId == 6) {
+					if (this.warehouseId == 6 || this.warehouseId == 2) {
 						if (this.sns.length > 0) {
 							this.sns = [];
 						}
@@ -363,7 +365,7 @@
 							this.Testcheck = false;
 							if (res.status) {
 								this.sns.push(res.data.serialNumber);
-								if (this.warehouseId == 6) {
+								if (this.warehouseId == 6 || this.warehouseId == 2) {
 									if (this.matInfos.length > 0) {
 										this.matInfos = [];
 									}
@@ -419,11 +421,14 @@
 				}
 				this.$u.post('/api/Task/RequestInboundTask', postData).then(res => {
 					if (res.status) {
-						uni.$showMsg(res.message);
 						this.inboundBarcode = "";
-						this.address = "";
+						if (this.warehouseId != 5) this.address = "";
 						setTimeout(() => {
 							this.addressFocus = false;
+							this.$refs.uToast.show({
+								title: "鎴愬姛",
+								type: "success"
+							})
 						}, 200);
 					} else {
 						this.$refs.uToast.show({
@@ -484,12 +489,10 @@
 				}
 				if (this.warehouseId == 2) { //娌瑰ⅷ浠撳簱鍖篒D
 					this.sn = this.sns[0];
-					debugger
 					for (var i = 0; i < this.Initiallife - 1; i++) {
 						this.sns.push(this.sn);
 					}
 				}
-				debugger
 				let url = 'palletCode=' + this.barcode + '&initiallife=' + this.Initiallife + '&warehouseId=' + this
 					.warehouseId;
 

--
Gitblit v1.9.3