From 1378fc4cd7abc24ed3a982e09437c2c8a74e9f2f Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期二, 27 一月 2026 19:06:32 +0800
Subject: [PATCH] 代码优化
---
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/AllcatedPallet.vue | 644 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 402 insertions(+), 242 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/AllcatedPallet.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/AllcatedPallet.vue"
index d401f8b..fe15c2e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/AllcatedPallet.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/AllcatedPallet.vue"
@@ -70,11 +70,11 @@
<div class="input-label">鐗╂枡鏉＄爜</div>
<el-input ref="barcodeInput" v-model="barcode" placeholder="璇锋壂鎻忔垨杈撳叆鐗╂枡鏉＄爜鍚庢寜鍥炶溅閿�" clearable
:disabled="!form.locationType || !trayBarcode || !form.warehouseType"
- @keyup.enter.native="handleBarcodeSubmit" @clear="handleClear" @input="handleBarcodeInput"
+ @keyup.enter.native="debounceHandleBarcodeSubmit" @clear="handleClear" @input="handleBarcodeInput"
class="custom-input" size="medium">
<template slot="append">
- <el-button :loading="loading" @click="handleBarcodeSubmit" type="primary" icon="el-icon-search"
- :disabled="!form.locationType || !trayBarcode || !barcode || !from.warehouseType" size="medium">
+ <el-button :loading="loading" @click="debounceHandleBarcodeSubmit" type="primary" icon="el-icon-search"
+ :disabled="!form.locationType || !trayBarcode || !barcode || !form.warehouseType" size="medium">
{{ loading ? '鏌ヨ涓�...' : '鏌ヨ' }}
</el-button>
</template>
@@ -84,7 +84,7 @@
<div class="input-tips compact-tips">
<p>鎻愮ず锛氳鍏堥�夋嫨浠撳簱 鈫� 閫夋嫨浠撳簱鍖哄煙 鈫� 杈撳叆鏂欑鐮� 鈫� 杈撳叆鐗╂枡鏉＄爜</p>
<p v-if="!form.warehouseType" class="warning-text">鈿狅笍 璇峰厛閫夋嫨浠撳簱</p>
- <p v-if="!form.locationType && !form.warehouseType" class="warning-text">鈿狅笍 璇峰厛閫夋嫨浠撳簱鍖哄煙</p>
+ <p v-if="form.warehouseType && !form.locationType" class="warning-text">鈿狅笍 璇峰厛閫夋嫨浠撳簱鍖哄煙</p>
<p v-if="form.warehouseType && form.locationType && !trayBarcode" class="warning-text">鈿狅笍 璇峰厛杈撳叆鏂欑鐮�</p>
</div>
@@ -111,7 +111,6 @@
<el-tag type="primary" size="small">鏈粍鐩� {{ totalStockCount }}</el-tag>
</span>
</div>
-
<div class="table-container">
<el-table :data="unpalletMaterials" stripe style="width: 100%" height="100%" size="small"
@@ -146,7 +145,7 @@
<div v-if="materials.length === 0" class="empty-state compact">
<i class="el-icon-document"></i>
<p v-if="!form.warehouseType">璇峰厛閫夋嫨浠撳簱</p>
- <p v-if="!form.locationType">璇峰厛閫夋嫨浠撳簱鍖哄煙</p>
+ <p v-if="form.warehouseType && !form.locationType">璇峰厛閫夋嫨浠撳簱鍖哄煙</p>
<p v-else-if="!trayBarcode">璇峰厛杈撳叆鏂欑鏉＄爜</p>
<p v-else>鏆傛棤鐗╂枡鏁版嵁锛岃鎵弿鎴栬緭鍏ョ墿鏂欐潯鐮�</p>
</div>
@@ -171,9 +170,23 @@
</template>
</vol-box>
</template>
+
<script>
import http from '@/api/http.js';
import VolBox from '@/components/basic/VolBox.vue';
+
+// 闃叉姈鍑芥暟
+function debounce(func, wait) {
+ let timeout;
+ return function () {
+ const context = this;
+ const args = arguments;
+ clearTimeout(timeout);
+ timeout = setTimeout(() => {
+ func.apply(context, args);
+ }, wait);
+ };
+}
export default {
components: { VolBox },
@@ -193,27 +206,25 @@
unpalletBarcodes: [],
unpalletBarcodesLoading: false,
- unpalletMaterials: [], // 鏈粍鐩樿缁嗘暟鎹垪琛�
+ unpalletMaterials: [],
- // 鎵爜鏋浉鍏冲彉閲�
scanCode: '',
lastKeyTime: null,
isManualInput: false,
isScanning: false,
scanTimer: null,
manualInputTimer: null,
- scanTarget: 'tray', // 褰撳墠鎵爜鐩爣: tray 鎴� material
+ scanTarget: 'tray',
+ isSubmitting: false,
+ palletGroupedBarcodes: {},
- // 搴撳瓨缁熻鐩稿叧鍙橀噺
totalStockSum: 0,
totalStockCount: 0,
uniqueUnit: '',
sumLoading: false,
sumError: '',
- // 浠撳簱鐩稿叧鍙橀噺
warehouseTypes: [],
warehouseLoading: false,
- // 浠撳簱鍖哄煙鐩稿叧鍙橀噺
locationTypes: [],
locationLoading: false,
form: {
@@ -240,27 +251,54 @@
trigger: 'change'
}
]
- }
+ },
+
+ // 鏂板锛氶敭鐩樹簨浠剁洃鍚爣璁�
+ keyPressListenerAdded: false,
+ isDialogClosing: false
}
},
computed: {
- // 褰撳墠閫夋嫨鐨勪粨搴撳悕绉�
currentWarehouseName() {
const warehouse = this.warehouseTypes.find(item => item.warehouseType === this.form.warehouseType);
return warehouse ? warehouse.warehouseTypeDesc : '';
},
- // 褰撳墠閫夋嫨鐨勪粨搴撳尯鍩熸弿杩�
+
currentLocationDesc() {
const location = this.locationTypes.find(item => item.locationType === this.form.locationType)
return location ? location.locationTypeDesc : ''
+ },
+
+ debounceHandleBarcodeSubmit() {
+ return debounce(this.handleBarcodeSubmit, 500);
}
},
+
watch: {
+ // 鐩戝惉show鍙橀噺鍙樺寲
+ show(newVal) {
+ if (newVal === true) {
+ console.log('寮规鎵撳紑锛岄噸缃暟鎹�');
+ this.isDialogClosing = false;
+ this.resetData();
+ this.$nextTick(() => {
+ setTimeout(() => {
+ this.fetchUnpalletMaterialDetails();
+ this.addKeyPressListener(); // 娣诲姞閿洏浜嬩欢鐩戝惉
+ }, 300);
+ });
+ } else if (newVal === false && !this.isDialogClosing) {
+ console.log('寮规鍏抽棴锛岀Щ闄や簨浠剁洃鍚�');
+ this.isDialogClosing = true;
+ this.removeKeyPressListener(); // 绉婚櫎閿洏浜嬩欢鐩戝惉
+ this.resetData();
+ }
+ },
+
visible(newVal, oldVal) {
this.palletVisible = newVal;
- // 褰撲粠 false 鍙樹负 true 鏃讹紝琛ㄧず寮规鎵撳紑
if (newVal === true && oldVal === false) {
console.log('寮规鎵撳紑锛岄噸缃暟鎹�');
this.resetData();
@@ -271,15 +309,16 @@
});
}
- // 褰撲粠 true 鍙樹负 false 鏃讹紝琛ㄧず寮规鍏抽棴
if (newVal === false && oldVal === true) {
console.log('寮规鍏抽棴锛岄噸缃暟鎹�');
this.resetData();
}
},
+
palletVisible(newVal) {
this.$emit('update:visible', newVal);
},
+
docNo(newVal) {
if (newVal) {
this.palletForm = { palletCode: '', barcode: '' };
@@ -289,14 +328,36 @@
}
}
},
+
mounted() {
- document.addEventListener('keypress', this.handleKeyPress);
+ // 涓嶅湪mounted鏃舵坊鍔犵洃鍚紝鍦ㄥ脊绐楁墦寮�鏃舵坊鍔�
},
+
beforeDestroy() {
- document.removeEventListener('keypress', this.handleKeyPress);
+ // 纭繚缁勪欢閿�姣佹椂绉婚櫎鐩戝惉
+ this.removeKeyPressListener();
this.clearAllTimers();
},
+
methods: {
+ // 娣诲姞閿洏浜嬩欢鐩戝惉
+ addKeyPressListener() {
+ if (!this.keyPressListenerAdded) {
+ document.addEventListener('keypress', this.handleKeyPress);
+ this.keyPressListenerAdded = true;
+ console.log('閿洏浜嬩欢鐩戝惉宸叉坊鍔�');
+ }
+ },
+
+ // 绉婚櫎閿洏浜嬩欢鐩戝惉
+ removeKeyPressListener() {
+ if (this.keyPressListenerAdded) {
+ document.removeEventListener('keypress', this.handleKeyPress);
+ this.keyPressListenerAdded = false;
+ console.log('閿洏浜嬩欢鐩戝惉宸茬Щ闄�');
+ }
+ },
+
open() {
this.show = true;
this.orderNo = "";
@@ -304,7 +365,15 @@
this.initLocationTypes();
this.initwarehouseTypes();
this.fetchUnpalletMaterialDetails();
+
+ // 寮圭獥鎵撳紑鏃舵坊鍔犻敭鐩樹簨浠剁洃鍚�
+ this.$nextTick(() => {
+ setTimeout(() => {
+ this.addKeyPressListener();
+ }, 100);
+ });
},
+
validateLocationType(rule, value, callback) {
if (!this.form.warehouseType) {
callback(new Error('璇峰厛閫夋嫨浠撳簱'));
@@ -315,72 +384,104 @@
}
},
- // 鏍规嵁鏉＄爜鍒楄〃鑾峰彇璇︾粏鏁版嵁
- async fetchUnpalletMaterialDetails() {
- try {
- 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 || '');
- this.totalStockCount = response.data.length;
- } else {
- this.unpalletMaterials = [];
- }
- } catch (err) {
- this.unpalletMaterials = this.unpalletBarcodes.map(barcode => ({
- barcode: barcode,
- materielCode: '-',
- batchNo: '-',
- stockQuantity: '-',
- unit: '-',
- supplyCode: '-',
- warehouseType: '-'
- }));
- }
+ // 鑾峰彇鏈粍鐩樼墿鏂欒鎯�
+ fetchUnpalletMaterialDetails() {
+ this.unpalletBarcodesLoading = true;
+
+ http.post('/api/InboundOrder/UnPalletGroupBarcode?orderNo=' + this.orderNo, {})
+ .then(response => {
+ if (response.status && Array.isArray(response.data)) {
+ this.unpalletMaterials = response.data;
+ this.unpalletBarcodes = response.data.map(item => item.barcode || '');
+ this.totalStockCount = response.data.length;
+ } else {
+ this.unpalletMaterials = [];
+ }
+ })
+ .catch(err => {
+ console.error('鑾峰彇鏈粍鐩樼墿鏂欏け璐�:', err);
+ this.unpalletMaterials = this.unpalletBarcodes.map(barcode => ({
+ barcode: barcode,
+ materielCode: '-',
+ batchNo: '-',
+ stockQuantity: '-',
+ unit: '-',
+ supplyCode: '-',
+ warehouseType: '-'
+ }));
+ })
+ .finally(() => {
+ this.unpalletBarcodesLoading = false;
+ });
},
- async initLocationTypes() {
- try {
- const { data } = await this.http.post("api/LocationInfo/GetLocationTypes")
- this.locationTypes = data
- } catch (e) {
- this.$message.error('鑾峰彇鍖哄煙绫诲瀷澶辫触')
- }
+
+ // 鍒濆鍖栦粨搴撳尯鍩熺被鍨�
+ initLocationTypes() {
+ this.locationLoading = true;
+
+ this.http.post("api/LocationInfo/GetLocationTypes")
+ .then(({ data }) => {
+ this.locationTypes = data;
+ })
+ .catch(e => {
+ console.error('鑾峰彇鍖哄煙绫诲瀷澶辫触:', e);
+ this.$message.error('鑾峰彇鍖哄煙绫诲瀷澶辫触');
+ })
+ .finally(() => {
+ this.locationLoading = false;
+ });
},
- async initwarehouseTypes() {
- try {
- const { data } = await this.http.post("api/Warehouse/GetwarehouseTypes")
- this.warehouseTypes = data
- } catch (e) {
- this.$message.error('鑾峰彇鍖哄煙绫诲瀷澶辫触')
- }
+
+ // 鍒濆鍖栦粨搴撶被鍨�
+ initwarehouseTypes() {
+ this.warehouseLoading = true;
+
+ this.http.post("api/Warehouse/GetwarehouseTypes")
+ .then(({ data }) => {
+ this.warehouseTypes = data;
+ })
+ .catch(e => {
+ console.error('鑾峰彇浠撳簱绫诲瀷澶辫触:', e);
+ this.$message.error('鑾峰彇浠撳簱绫诲瀷澶辫触');
+ })
+ .finally(() => {
+ this.warehouseLoading = false;
+ });
},
- async fetchStockStatistics(orderNo) {
- // 鍗曟嵁鍙蜂负绌烘椂涓嶆煡璇�
+ // 鑾峰彇搴撳瓨缁熻
+ fetchStockStatistics(orderNo) {
if (!orderNo) {
this.sumError = '鍗曟嵁鍙蜂负绌猴紝鏃犳硶缁熻';
- return;
+ return Promise.resolve(null);
}
this.sumLoading = true;
this.sumError = '';
- try {
- 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;
- this.uniqueUnit = response.data.uniqueUnit || '';
- }
- } catch (err) {
- this.sumError = '缁熻鍔犺浇澶辫触';
- this.totalStockSum = 0;
- this.totalStockCount = 0;
- } finally {
- this.sumLoading = false;
- }
+
+ return http.post('/api/InboundOrder/UnPalletQuantity?orderNo=' + orderNo, {})
+ .then(response => {
+ if (response.data) {
+ this.totalStockSum = response.data.stockSumQuantity || 0;
+ this.totalStockCount = response.data.stockCount || 0;
+ this.uniqueUnit = response.data.uniqueUnit || '';
+ }
+ return response.data;
+ })
+ .catch(err => {
+ console.error('缁熻鍔犺浇澶辫触:', err);
+ this.sumError = '缁熻鍔犺浇澶辫触';
+ this.totalStockSum = 0;
+ this.totalStockCount = 0;
+ throw err;
+ })
+ .finally(() => {
+ this.sumLoading = false;
+ });
},
- async validateForm() {
+ // 琛ㄥ崟楠岃瘉
+ validateForm() {
return new Promise((resolve) => {
if (!this.$refs.locationForm) {
this.error = '琛ㄥ崟鏈垵濮嬪寲';
@@ -394,10 +495,9 @@
this.error = '';
resolve(true);
} else {
- if (!this.from.warehouseType) {
+ if (!this.form.warehouseType) {
this.error = '璇峰厛閫夋嫨浠撳簱';
- }
- else if (this.form.locationType === null || this.form.locationType === undefined || this.form.locationType === '') {
+ } else if (!this.form.locationType) {
this.error = '璇峰厛閫夋嫨浠撳簱鍖哄煙';
} else {
this.error = '璇锋鏌ヨ〃鍗曞～鍐欐槸鍚︽纭�';
@@ -407,7 +507,7 @@
});
});
},
- // 鑱氱劍鍒版墭鐩樿緭鍏ユ
+
focusTrayInput() {
if (this.$refs.trayInput && this.$refs.trayInput.$el) {
const inputEl = this.$refs.trayInput.$el.querySelector('input');
@@ -420,7 +520,6 @@
}
},
- // 鑱氱劍鍒扮墿鏂欒緭鍏ユ
focusBarcodeInput() {
if (this.$refs.barcodeInput && this.$refs.barcodeInput.$el) {
const inputEl = this.$refs.barcodeInput.$el.querySelector('input');
@@ -432,8 +531,13 @@
}
}
},
- // 閲嶇疆鎵�鏈夋暟鎹�
+
resetData() {
+ // 鍏堢Щ闄ら敭鐩樹簨浠剁洃鍚�
+ this.removeKeyPressListener();
+
+ this.palletGroupedBarcodes = {};
+ this.isSubmitting = false;
this.trayBarcode = '';
this.barcode = '';
this.materials = [];
@@ -455,10 +559,12 @@
this.form = {
warehouseType: null,
locationType: null
- }
+ };
this.warehouseTypes = [];
this.locationTypes = [];
- // 娓呴櫎琛ㄥ崟楠岃瘉鐘舵��
+ this.isDialogClosing = false;
+ this.keyPressListenerAdded = false;
+
this.$nextTick(() => {
if (this.$refs.locationForm) {
this.$refs.locationForm.clearValidate();
@@ -466,7 +572,6 @@
});
},
- // 娓呴櫎鎵�鏈夎鏃跺櫒
clearAllTimers() {
if (this.manualInputTimer) {
clearTimeout(this.manualInputTimer);
@@ -477,121 +582,110 @@
this.scanTimer = null;
}
},
+
handleDialogClose() {
+ // 鍏堢Щ闄ら敭鐩樹簨浠剁洃鍚�
+ this.removeKeyPressListener();
this.show = false;
this.resetData();
},
// 纭鎸夐挳
- async handleConfirm() {
- if (!await this.validateForm()) return;
+ handleConfirm() {
+ this.validateForm()
+ .then(valid => {
+ if (!valid) return;
+
+ if (this.materials.length === 0) {
+ this.$message.warning('璇疯嚦灏戞坊鍔犱竴涓墿鏂�');
+ return;
+ }
- if (this.materials.length === 0) {
- this.$message.warning('璇疯嚦灏戞坊鍔犱竴涓墿鏂�');
- return;
- }
+ if (!this.trayBarcode) {
+ this.$message.warning('璇疯緭鍏ユ墭鐩樻潯鐮�');
+ return;
+ }
- if (!this.trayBarcode) {
- this.$message.warning('璇疯緭鍏ユ墭鐩樻潯鐮�');
- return;
- }
+ const result = {
+ warehouseType: this.form.warehouseType,
+ warehouseName: this.currentWarehouseName,
+ locationType: this.form.locationType,
+ locationDesc: this.currentLocationDesc,
+ trayBarcode: this.trayBarcode,
+ materials: this.materials,
+ docNo: this.docNo
+ };
- const result = {
- warehouseType: this.form.warehouseType,
- warehouseName: this.currentWarehouseName,
- locationType: this.form.locationType,
- locationDesc: this.currentLocationDesc,
- trayBarcode: this.trayBarcode,
- materials: this.materials,
- docNo: this.docNo
- };
-
- // 瑙﹀彂鐖剁粍浠剁殑 back-success 浜嬩欢
- this.$emit('back-success', result);
- this.palletVisible = false;
+ this.$emit('back-success', result);
+ this.palletVisible = false;
+ });
},
- // 澶勭悊鎵樼洏杈撳叆
+
handleTrayInput() {
- // 鏍囪涓烘墜鍔ㄨ緭鍏ユā寮�
this.isManualInput = true;
this.isScanning = false;
- // 娓呴櫎涔嬪墠鐨勮鏃跺櫒
if (this.manualInputTimer) {
clearTimeout(this.manualInputTimer);
}
- // 璁剧疆璁℃椂鍣紝濡傛灉涓�娈垫椂闂村唴娌℃湁杈撳叆锛屽垯閲嶇疆涓烘壂鐮佹ā寮�
this.manualInputTimer = setTimeout(() => {
this.isManualInput = false;
}, 1000);
},
- // 澶勭悊鐗╂枡杈撳叆
handleBarcodeInput() {
- // 鏍囪涓烘墜鍔ㄨ緭鍏ユā寮�
this.isManualInput = true;
this.isScanning = false;
- // 娓呴櫎涔嬪墠鐨勮鏃跺櫒
if (this.manualInputTimer) {
clearTimeout(this.manualInputTimer);
}
- // 璁剧疆璁℃椂鍣紝濡傛灉涓�娈垫椂闂村唴娌℃湁杈撳叆锛屽垯閲嶇疆涓烘壂鐮佹ā寮�
this.manualInputTimer = setTimeout(() => {
this.isManualInput = false;
}, 1000);
},
// 澶勭悊鎵樼洏鏉＄爜鎻愪氦
- async handleTraySubmit() {
- // 鍏堢洿鎺ユ鏌ocationType锛岄伩鍏嶈〃鍗曢獙璇佺殑寮傛闂
+ handleTraySubmit() {
+ this.barcode = '';
+ this.materials = [];
+ this.error = '';
+
if (!this.form.warehouseType) {
this.error = '璇峰厛閫夋嫨浠撳簱';
return;
}
if (!this.form.locationType) {
this.error = '璇峰厛閫夋嫨浠撳簱鍖哄煙';
- //this.$message.warning('璇峰厛閫夋嫨浠撳簱鍖哄煙');
return;
}
- // 鐒跺悗鍐嶈繘琛屽畬鏁寸殑琛ㄥ崟楠岃瘉
- if (!await this.validateForm()) return;
+ this.validateForm()
+ .then(valid => {
+ if (!valid) return;
+
+ const currentTrayBarcode = this.trayBarcode.trim();
- const currentTrayBarcode = this.trayBarcode.trim();
+ if (!currentTrayBarcode) {
+ this.error = '璇疯緭鍏ユ垨鎵弿鎵樼洏鏉＄爜';
+ return;
+ }
- if (!currentTrayBarcode) {
- this.error = '璇疯緭鍏ユ垨鎵弿鎵樼洏鏉＄爜';
- return;
- }
+ this.error = '';
- this.error = '';
+ if (!this.trayBarcodeReg.test(currentTrayBarcode)) {
+ this.$message("鎵樼洏鍙锋牸寮忛敊璇�");
+ this.focusTrayInput();
+ return;
+ }
- if (!this.trayBarcodeReg.test(currentTrayBarcode)) {
- // ElMessage.warning({
- // message: '鎵樼洏鍙锋牸寮忛敊璇�',
- // type: 'warning',
- // duration: 3000
- // })
- this.$message("鎵樼洏鍙锋牸寮忛敊璇�");
- this.focusTrayInput();
- return;
- }
-
- // 璁剧疆鎵樼洏鏉＄爜鍚庯紝鑷姩鑱氱劍鍒扮墿鏂欒緭鍏ユ
- this.focusBarcodeInput();
-
- // this.$message({
- // message: `鎵樼洏鏉＄爜宸茶缃�: ${currentTrayBarcode}`,
- // type: 'success',
- // duration: 2000
- // });
- this.$message.success(`鎵樼洏鏉＄爜宸茶缃�: ${currentTrayBarcode}`);
+ this.focusBarcodeInput();
+ this.$message.success(`鎵樼洏鏉＄爜宸茶缃�: ${currentTrayBarcode}`);
+ });
},
- // 娓呴櫎鎵樼洏
clearTray() {
this.trayBarcode = '';
this.materials = [];
@@ -603,12 +697,10 @@
});
},
- // 娓呯┖鎵樼洏杈撳叆
handleTrayClear() {
this.error = '';
},
- // 娓呯┖杈撳叆
handleClear() {
this.error = '';
this.scanCode = '';
@@ -616,123 +708,176 @@
this.isScanning = false;
},
-
// 澶勭悊鐗╂枡鏉＄爜鎻愪氦
- async handleBarcodeSubmit() {
- if (!await this.validateForm()) return;
+ handleBarcodeSubmit() {
+ if (this.isSubmitting) {
+ this.$message.warning('姝ｅ湪澶勭悊涓紝璇风◢鍊�');
+ return;
+ }
+
const currentBarcode = this.barcode.trim();
-
- if (!this.trayBarcode) {
- this.error = '璇峰厛杈撳叆鎵樼洏鏉＄爜';
- this.focusTrayInput();
- return;
- }
-
- if (!currentBarcode) {
- this.error = '璇疯緭鍏ユ垨鎵弿鐗╂枡鏉＄爜';
- return;
- }
-
- this.focusBarcodeInput();
- this.error = '';
- this.loading = true;
-
- try {
- // 璋冪敤API鏌ヨ鐗╂枡淇℃伅
- const materialData = await this.fetchMaterialData(currentBarcode);
- if (!materialData || materialData.length === 0) {
- return;
- }
-
- this.materials = [];
- materialData.forEach(item => {
- this.materials.push({
- ...item,
- trayCode: this.trayBarcode,
- locationType: this.form.locationType,
- locationDesc: this.currentLocationDesc,
- scanTime: this.formatTime(new Date())
- });
- });
- this.orderNo = materialData[0].orderNo;
- await this.fetchStockStatistics(materialData[0].orderNo);
- await this.fetchUnpalletMaterialDetails();
- // 娓呯┖鐗╂枡杈撳叆妗嗗苟淇濇寔鑱氱劍
+ const currentTrayGrouped = this.palletGroupedBarcodes[this.trayBarcode] || [];
+
+ if (currentTrayGrouped.includes(currentBarcode)) {
+ this.error = `鏉＄爜 ${currentBarcode} 宸茶褰撳墠鎵樼洏缁勭洏锛岃鍕块噸澶嶆搷浣渀;
this.barcode = '';
- this.scanCode = ''; // 娓呯┖鎵爜缂撳瓨
- this.isScanning = false;
-
- setTimeout(() => {
- this.focusBarcodeInput();
- }, 100);
- } catch (err) {
- this.error = err.message || '鏌ヨ鏉＄爜淇℃伅澶辫触锛岃閲嶈瘯';
this.focusBarcodeInput();
- setTimeout(() => {
- // 閫変腑杈撳叆妗嗗唴鐨勯敊璇唴瀹癸紙纭繚focus瀹屾垚鍚庢墽琛岋級
- const inputEl = this.$refs.barcodeInput?.$el?.querySelector('input');
- if (inputEl) inputEl.select();
- }, 100);
- } finally {
- this.loading = false;
+ return;
}
+
+ this.isSubmitting = true;
+
+ this.validateForm()
+ .then(valid => {
+ if (!valid) {
+ this.isSubmitting = false;
+ return;
+ }
+
+ if (!this.trayBarcode) {
+ this.error = '璇峰厛杈撳叆鎵樼洏鏉＄爜';
+ this.focusTrayInput();
+ this.isSubmitting = false;
+ return;
+ }
+
+ if (!currentBarcode) {
+ this.error = '璇疯緭鍏ユ垨鎵弿鐗╂枡鏉＄爜';
+ this.isSubmitting = false;
+ return;
+ }
+
+ this.focusBarcodeInput();
+ this.error = '';
+ this.loading = true;
+
+ console.log('缁勭洏璇锋眰鍙傛暟:', {
+ palletCode: this.trayBarcode,
+ barcode: currentBarcode,
+ locationTypeDesc: this.currentLocationDesc,
+ locationType: this.form.locationType,
+ warehouseType: this.form.warehouseType
+ });
+
+ return this.fetchMaterialData(currentBarcode);
+ })
+ .then(materialData => {
+ if (!materialData || materialData.length === 0) {
+ return;
+ }
+
+ this.materials = [];
+ const newBarcodes = [];
+
+ materialData.forEach(item => {
+ this.materials.push({
+ ...item,
+ trayCode: this.trayBarcode,
+ locationType: this.form.locationType,
+ locationDesc: this.currentLocationDesc,
+ scanTime: this.formatTime(new Date())
+ });
+ newBarcodes.push(item.barcode);
+ });
+
+ if (!this.palletGroupedBarcodes[this.trayBarcode]) {
+ this.palletGroupedBarcodes[this.trayBarcode] = [];
+ }
+ this.palletGroupedBarcodes[this.trayBarcode] = [...new Set([...this.palletGroupedBarcodes[this.trayBarcode], ...newBarcodes])];
+
+ this.orderNo = materialData[0].orderNo;
+
+ return Promise.all([
+ this.fetchStockStatistics(materialData[0].orderNo),
+ this.fetchUnpalletMaterialDetails()
+ ]);
+ })
+ .then(() => {
+ this.barcode = '';
+ this.scanCode = '';
+ this.isScanning = false;
+
+ setTimeout(() => {
+ this.focusBarcodeInput();
+ }, 100);
+ })
+ .catch(err => {
+ console.error('澶勭悊鐗╂枡鏉＄爜澶辫触:', err);
+ this.error = err.message || '鏌ヨ鏉＄爜淇℃伅澶辫触锛岃閲嶈瘯';
+ this.focusBarcodeInput();
+ setTimeout(() => {
+ const inputEl = this.$refs.barcodeInput?.$el?.querySelector('input');
+ if (inputEl) inputEl.select();
+ }, 100);
+ })
+ .finally(() => {
+ this.loading = false;
+ this.isSubmitting = false;
+ });
},
- // API璇锋眰 - 鏇挎崲涓哄疄闄呯殑API璋冪敤
- async fetchMaterialData(barcode) {
- try {
- const response = await http.post('/api/Inbound/GroupPallet',
- {
- palletCode: this.trayBarcode,
- barcode: barcode,
- locationTypeDesc: this.currentLocationDesc,
- locationType: this.form.locationType, // 娣诲姞浠撳簱鍖哄煙淇℃伅
- warehouseType: this.form.warehouseType
+ // API璇锋眰 - 娉ㄦ剰杩欓噷淇敼浜咥PI鍦板潃涓�/AllGroupPallet
+ fetchMaterialData(barcode) {
+ return http.post('/api/Inbound/AllGroupPallet', {
+ palletCode: this.trayBarcode,
+ barcode: barcode,
+ locationTypeDesc: this.currentLocationDesc,
+ locationType: this.form.locationType,
+ warehouseType: this.form.warehouseType
+ })
+ .then(response => {
+ let materialData;
+
+ if (typeof response.data === 'string') {
+ try {
+ materialData = JSON.parse(response.data);
+ } catch (e) {
+ console.error('瑙ｆ瀽鍝嶅簲鏁版嵁澶辫触:', e);
+ }
+ } else {
+ materialData = response.data;
}
- );
- let materialData;
-
- if (typeof response.data === 'string') {
-
- try {
- materialData = JSON.parse(response.data);
- } catch (e) {
-
+
+ if (!response.status) {
+ this.error = response.message || '鏌ヨ鏉＄爜淇℃伅澶辫触锛岃閲嶈瘯';
+ return [];
}
- } else {
- materialData = response.data;
- }
- if (!response.status) {
- this.error = response.message || '鏌ヨ鏉＄爜淇℃伅澶辫触锛岃閲嶈瘯';
- }
-
- return materialData;
-
- } catch (error) {
- console.error('API璋冪敤澶辫触:', error);
- }
+
+ return materialData || [];
+ })
+ .catch(error => {
+ console.error('API璋冪敤澶辫触:', error);
+ this.$message.error('鎺ュ彛璇锋眰澶辫触锛岃鑱旂郴绠＄悊鍛�');
+ throw error;
+ });
},
// 澶勭悊鎵爜鏋緭鍏�
handleKeyPress(event) {
- // 濡傛灉鏄墜鍔ㄨ緭鍏ユā寮忥紝涓嶅鐞嗘壂鐮佹灙閫昏緫
- if (this.isManualInput) {
+ // 妫�鏌ュ脊绐楁槸鍚︽樉绀�
+ if (!this.show || this.isDialogClosing) {
+ return;
+ }
+
+ if (this.isManualInput || this.isSubmitting) {
return;
}
const key = event.key;
const currentTime = new Date().getTime();
- // 蹇界暐鐩存帴鎸変笅鐨勫洖杞﹂敭锛堢敱handleBarcodeSubmit澶勭悊锛�
if (key === 'Enter') {
+ event.preventDefault();
if (this.scanCode.length > 0) {
- // 闃绘榛樿鍥炶溅琛屼负锛岄伩鍏嶈〃鍗曟彁浜�
- event.preventDefault();
+ if (this.scanTarget === 'material' && !this.trayBarcode) {
+ this.$message.warning('璇峰厛璁剧疆鎵樼洏鏉＄爜');
+ this.scanCode = '';
+ this.lastKeyTime = null;
+ return;
+ }
- // 鎵爜瀹屾垚锛岃嚜鍔ㄨЕ鍙戞煡璇�
this.isScanning = false;
- // 鏍规嵁褰撳墠鎵爜鐩爣璁剧疆鐩稿簲鐨勮緭鍏ユ鍊�
if (this.scanTarget === 'tray') {
this.trayBarcode = this.scanCode;
this.handleTraySubmit();
@@ -746,7 +891,6 @@
return;
}
- // 鏋勫缓鎵爜鍐呭锛堝揩閫熻繛缁緭鍏ヨ涓烘壂鐮侊級
if (this.lastKeyTime && currentTime - this.lastKeyTime < 50) {
this.scanCode += key;
this.isScanning = true;
@@ -755,7 +899,6 @@
this.isScanning = true;
}
- // 璁剧疆璁℃椂鍣紝濡傛灉涓�娈垫椂闂村唴娌℃湁杈撳叆锛屽垯閲嶇疆鎵弿鐘舵��
if (this.scanTimer) {
clearTimeout(this.scanTimer);
}
@@ -776,6 +919,23 @@
const seconds = String(date.getSeconds()).padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ },
+
+ // 浠撳簱鍒囨崲浜嬩欢
+ handleWarehouseChange() {
+ this.form.locationType = null;
+ this.trayBarcode = '';
+ this.barcode = '';
+ this.materials = [];
+ this.error = '';
+ },
+
+ // 鍖哄煙鍒囨崲浜嬩欢
+ handleLocationChange() {
+ this.trayBarcode = '';
+ this.barcode = '';
+ this.materials = [];
+ this.error = '';
}
}
}
--
Gitblit v1.9.3