From 2f5159e93f42609d22d0c565ad730560ee5ee21f Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 03 一月 2025 16:39:16 +0800
Subject: [PATCH] 更新PDA

---
 代码管理/淮安PDA/pages/stash/boxing.vue |   67 +++++++++++++++++++++++----------
 1 files changed, 47 insertions(+), 20 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 78e84ea..49cb269 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"
@@ -14,8 +14,9 @@
 							<uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="focus"
 								v-model="materSn" @input="snInput" />
 						</uni-forms-item>
-						<uni-forms-item label="鍒濆瀵垮懡:" v-if="Test">
-							<uni-easyinput type="text" placeholder="璇疯緭鍏ュ垵濮嬪鍛�" ref='midInput' v-model="Initiallife" />
+						<uni-forms-item :label="Testlabel" v-if="Test">
+							<uni-easyinput type="text" :placeholder="Testplaceholder" ref='midInput'
+								v-model="Initiallife" />
 						</uni-forms-item>
 						<!-- <uni-forms-item>
 							<checkbox checked="check">鏄惁婊$洏</checkbox>
@@ -166,6 +167,7 @@
 				materSn: "",
 				Initiallife: 1000,
 				sns: [],
+				sn: "",
 				addressFocus: false,
 				inboundBarcode: "",
 				address: "",
@@ -176,6 +178,8 @@
 				matTotals: [],
 				warehouseId: "",
 				Test: false,
+				Testlabel: "",
+				Testplaceholder: "",
 				Testcheck: false,
 			}
 		},
@@ -185,7 +189,16 @@
 			this.addressFocus = false;
 			this.orderNo = res.orderNo;
 			this.warehouseId = res.warehouseId;
-			this.Test = this.warehouseId == 6; //娴嬭瘯鏋朵粨搴撳尯ID
+			if (this.warehouseId == 6) { //娴嬭瘯鏋朵粨搴撳尯ID
+				this.Test = true;
+				this.Testlabel = "鍒濆瀵垮懡:";
+				this.Testplaceholder = "璇疯緭鍏ュ垵濮嬪鍛�";
+			} else if (this.warehouseId == 2) { //娌瑰ⅷ浠撳簱鍖篒D
+				this.Test = true;
+				this.Testlabel = "鏁伴噺:";
+				this.Testplaceholder = "璇疯緭鍏ユ暟閲�";
+				this.Initiallife = 16;
+			}
 			this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
 			this.getData();
 		},
@@ -335,6 +348,11 @@
 			},
 			snInput() {
 				this.$nextTick(() => {
+					if (this.warehouseId == 6) {
+						if (this.sns.length > 0) {
+							this.sns = [];
+						}
+					}
 					if (this.materSn != "") {
 						this.focus = false;
 						var matSn = this.materSn;
@@ -344,37 +362,31 @@
 						this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
 							this.Testcheck = false;
 							if (res.status) {
-								// debugger
-								// this.matTotal.push({
-								// 	matCode: res.data.materielCode,
-								// 	matQuantity: parseInt(res.data.quantity)
-								// });
 								this.sns.push(res.data.serialNumber);
-
-								// this.matInfos.splice(0, this.matInfos.length);
+								if (this.warehouseId == 6) {
+									if (this.matInfos.length > 0) {
+										this.matInfos = [];
+									}
+								}
 								this.matInfos.push(res.data);
 								if (res.message) {
 									this.$refs.uToast.show({
 										title: res.message,
 										type: "error"
 									})
-									// setTimeout(this.updateFocus,200);
 									setTimeout(() => {
 										this.voiceSpeech('../../static/fail.mp3');
 									}, 100);
 									return;
 								}
-								// setTimeout(this.updateFocus,200);
 								setTimeout(() => {
 									this.voiceSpeech('../../static/success.mp3');
 								}, 100);
 							} else {
-								// this.innerCode = "";
 								this.$refs.uToast.show({
 									title: res.message,
 									type: "error"
 								})
-								// setTimeout(this.updateFocus,200);
 								setTimeout(() => {
 									this.voiceSpeech('../../static/fail.mp3');
 								}, 100);
@@ -456,16 +468,31 @@
 				if (this.Test) {
 					if (!this.Testcheck) {
 						this.Testcheck = true;
-						this.$refs.uToast.show({
-							title: "璇风‘璁ゅ垵濮嬪鍛�",
-							type: 'error'
-						})
+						if (this.warehouseId == 2) {
+							this.$refs.uToast.show({
+								title: "璇风‘璁ゆ暟閲�",
+								type: 'error'
+							})
+						} else if (this.warehouseId == 6) {
+							this.$refs.uToast.show({
+								title: "璇风‘璁ゅ垵濮嬪鍛�",
+								type: 'error'
+							})
+						}
 						return;
 					}
 				}
+				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;
 
-				let url = 'palletCode=' + this.barcode + '&initiallife=' + this.Initiallife + '&warehouseId=' + this.warehouseId;
-				
 				this.$u.post('/api/InboundOrder/ManualMaterielGroup?' + url, this.sns).then(res => {
 					this.Testcheck = false;
 					if (res.status) {

--
Gitblit v1.9.3