ZhongRui/ALDbanyunxiangmu.git

			@@ -203,6 +203,8 @@
			scanTimer: null,
			manualInputTimer: null,
			scanTarget: 'tray', // å½åæ«ç ç®æ : tray æ material
			isSubmitting: false, // æ°å¢ï¼æäº¤éå®ï¼é²æ¢éå¤è¯·æ±
			groupedBarcodes: [],

			// åºåç»è®¡ç¸å³åé
			totalStockSum: 0,
			@@ -266,7 +268,6 @@
			this.resetData();
			this.$nextTick(() => {
			setTimeout(() => {
			this.fetchStockStatistics(); // å è½½ç»è®¡æ°æ®
			this.fetchUnpalletMaterialDetails();
			}, 300);
			});
			@@ -286,18 +287,12 @@
			this.palletForm = { palletCode: '', barcode: '' };
			this.backData = [];
			this.$refs.palletForm?.reset();
			this.fetchStockStatistics(); // åæ®å·åäºï¼å·æ°ç»è®¡
			this.fetchUnpalletMaterialDetails();
			}
			}
			},
			mounted() {

			document.addEventListener('keypress', this.handleKeyPress);

			setTimeout(() => {
			this.focusLocationSelect();
			}, 300);
			},
			beforeDestroy() {
			document.removeEventListener('keypress', this.handleKeyPress);
			@@ -306,9 +301,10 @@
			methods: {
			open() {
			this.show = true;
			this.orderNo = "";
			this.resetData();
			this.initLocationTypes();
			this.initwarehouseTypes();
			this.fetchStockStatistics();
			this.fetchUnpalletMaterialDetails();
			},
			validateLocationType(rule, value, callback) {
			@@ -324,7 +320,7 @@
			// æ ¹æ®æ¡ç åè¡¨è·åè¯¦ç»æ°æ®
			async fetchUnpalletMaterialDetails() {
			try {
			const response = await http.post('/api/InboundOrder/UnPalletGroupBarcode?orderNo=' + this.docNo, {});
			const response = await http.post('/api/InboundOrder/UnPalletGroupBarcode?orderNo=' + this.orderNo, {});
			if (response.status && Array.isArray(response.data)) {
			this.unpalletMaterials = response.data;
			this.unpalletBarcodes = response.data.map(item => item.barcode \|\| '');
			@@ -361,9 +357,9 @@
			}
			},

			async fetchStockStatistics() {
			async fetchStockStatistics(orderNo) {
			// åæ®å·ä¸ºç©ºæ¶ä¸æ¥è¯¢
			if (!this.docNo) {
			if (!orderNo) {
			this.sumError = 'åæ®å·ä¸ºç©ºï¼æ æ³ç»è®¡';
			return;
			}
			@@ -371,7 +367,7 @@
			this.sumLoading = true;
			this.sumError = '';
			try {
			const response = await http.post('/api/InboundOrder/UnPalletQuantity?orderNo=' + this.orderNo, {});
			const response = await http.post('/api/InboundOrder/UnPalletQuantity?orderNo=' + orderNo, {});
			if (response.data) {
			this.totalStockSum = response.data.stockSumQuantity \|\| 0;
			this.totalStockCount = response.data.stockCount \|\| 0;
			@@ -440,7 +436,8 @@
			},
			// éç½®æææ°æ®
			resetData() {
			console.log('éç½®å¼¹æ¡æ°æ®');
			this.groupedBarcodes = []; // æ¸ç©ºå·²ç»çæ¡ç
			this.isSubmitting = false; // éç½®æäº¤é
			this.trayBarcode = '';
			this.barcode = '';
			this.materials = [];
			@@ -626,6 +623,10 @@

			// å¤çç©ææ¡ç æäº¤
			async handleBarcodeSubmit() {
			if (this.isSubmitting) {
			this.$message.warning('æ£å¨å¤çä¸ï¼è¯·ç¨å');
			return;
			}
			if (!await this.validateForm()) return;
			const currentBarcode = this.barcode.trim();

			@@ -643,8 +644,8 @@
			this.focusBarcodeInput();
			this.error = '';
			this.loading = true;
			this.isSubmitting = true; // å¼å¯æäº¤é

			console.log(currentBarcode);
			try {
			// è°ç¨APIæ¥è¯¢ç©æä¿¡æ¯
			const materialData = await this.fetchMaterialData(currentBarcode);
			@@ -653,6 +654,7 @@
			}

			this.materials = [];
			const newBarcodes = []; // ä¸´æ¶åå¨æ¬æ¬¡æ°å¢çæ¡ç
			materialData.forEach(item => {
			this.materials.push({
			...item,
			@@ -661,10 +663,14 @@
			locationDesc: this.currentLocationDesc,
			scanTime: this.formatTime(new Date())
			});
			newBarcodes.push(item.barcode); // æ¶éæ¬æ¬¡ç»ççæ¡ç
			});
			this.orderNo = materialData[0].orderNo;
			// å°æ¬æ¬¡ç»ççæ¡ç å å¥å·²ç»çåè¡¨
			this.groupedBarcodes = [...new Set([...this.groupedBarcodes, ...newBarcodes])];

			this.fetchStockStatistics();
			this.orderNo = materialData[0].orderNo;
			await this.fetchStockStatistics(materialData[0].orderNo);
			await this.fetchUnpalletMaterialDetails();
			// æ¸ç©ºç©æè¾å¥æ¡å¹¶ä¿æèç¦
			this.barcode = '';
			this.scanCode = ''; // æ¸ç©ºæ«ç ç¼å
			@@ -683,6 +689,7 @@
			}, 100);
			} finally {
			this.loading = false;
			this.isSubmitting = false; // å³éæäº¤é
			}
			},

			@@ -724,7 +731,7 @@
			// å¤çæ«ç æªè¾å¥
			handleKeyPress(event) {
			// å¦ææ¯æå¨è¾å¥æ¨¡å¼ï¼ä¸å¤çæ«ç æªé»è¾
			if (this.isManualInput) {
			if (this.isManualInput \|\| this.isSubmitting) {
			return;
			}

			@@ -733,6 +740,7 @@

			// å¿½ç¥ç´æ¥æä¸çåè½¦é®ï¼ç±handleBarcodeSubmitå¤çï¼
			if (key === 'Enter') {
			event.preventDefault(); // å¼ºå¶é»æ¢é»è®¤è¡ä¸ºï¼é¿åéå¤è§¦å
			if (this.scanCode.length > 0) {
			// é»æ¢é»è®¤åè½¦è¡ä¸ºï¼é¿åè¡¨åæäº¤
			event.preventDefault();
			@@ -772,44 +780,6 @@
			}, 100);

			this.lastKeyTime = currentTime;
			},

			// å é¤ç©æ
			removeMaterial(index) {
			this.$confirm('ç¡®å®è¦å é¤è¿æ¡ç©æè®°å½å?', 'æç¤º', {
			confirmButtonText: 'ç¡®å®',
			cancelButtonText: 'åæ¶',
			type: 'warning'
			}).then(() => {
			this.materials.splice(index, 1);
			this.$message({
			type: 'success',
			message: 'å é¤æå!'
			});
			this.fetchStockStatistics();

			}).catch(() => {
			// åæ¶å é¤
			});
			},

			// æ¸ç©ºææç©æ
			clearAllMaterials() {
			if (this.materials.length === 0) return;

			this.$confirm('ç¡®å®è¦æ¸ç©ºææç©æè®°å½å?', 'æç¤º', {
			confirmButtonText: 'ç¡®å®',
			cancelButtonText: 'åæ¶',
			type: 'warning'
			}).then(() => {
			this.materials = [];
			this.$message({
			type: 'success',
			message: 'å·²æ¸ç©ºææè®°å½!'
			});
			}).catch(() => {
			// åæ¶æ¸ç©º
			});
			},

			// æ ¼å¼åæ¶é´