From ca3e4977395bc02c5d147dffdff7381333fdfbca Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 09 四月 2026 14:39:37 +0800
Subject: [PATCH] 空箱跨区域移库
---
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/Pallet.vue | 1310 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 910 insertions(+), 400 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/Pallet.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/Pallet.vue"
index d401f8b..1fe40a9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/Pallet.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/Pallet.vue"
@@ -1,15 +1,42 @@
<template>
- <vol-box v-model="show" :title="'缁勭洏鎿嶄綔 - 鍗曟嵁鍙凤細' + orderNo" :height="1000" :width="1100" :padding="20" :modal="true">
+ <vol-box
+ v-model="show"
+ :title="'缁勭洏鎿嶄綔 - 鍗曟嵁鍙凤細' + orderNo"
+ :height="1000"
+ :width="1100"
+ :padding="20"
+ :modal="true"
+ >
<div class="barcode-scanner-container">
-
<!-- 浠撳簱閫夋嫨 - 绱у噾甯冨眬 -->
<div class="location-section compact">
- <el-form :model="form" :rules="rules" ref="locationForm" class="compact-form">
- <el-form-item label="鍏ュ簱浠撳簱" prop="warehouseType" class="location-select compact-item">
- <el-select v-model="form.warehouseType" placeholder="璇烽�夋嫨浠撳簱" clearable filterable
- @change="handleWarehouseChange" style="width: 100%" :loading="warehouseLoading" size="medium">
- <el-option v-for="item in warehouseTypes" :key="item.warehouseType" :label="item.warehouseTypeDesc"
- :value="item.warehouseType" />
+ <el-form
+ :model="form"
+ :rules="rules"
+ ref="locationForm"
+ class="compact-form"
+ >
+ <el-form-item
+ label="鍏ュ簱浠撳簱"
+ prop="warehouseType"
+ class="location-select compact-item"
+ >
+ <el-select
+ v-model="form.warehouseType"
+ placeholder="璇烽�夋嫨浠撳簱"
+ clearable
+ filterable
+ @change="handleWarehouseChange"
+ style="width: 100%"
+ :loading="warehouseLoading"
+ size="medium"
+ >
+ <el-option
+ v-for="item in warehouseTypes"
+ :key="item.warehouseType"
+ :label="item.warehouseTypeDesc"
+ :value="item.warehouseType"
+ />
</el-select>
</el-form-item>
</el-form>
@@ -17,12 +44,34 @@
<!-- 浠撳簱鍖哄煙閫夋嫨 - 绱у噾甯冨眬 -->
<div class="location-section compact">
- <el-form :model="form" :rules="rules" ref="locationForm" class="compact-form">
- <el-form-item label="浠撳簱鍖哄煙" prop="locationType" class="location-select compact-item">
- <el-select v-model="form.locationType" placeholder="璇峰厛閫夋嫨浠撳簱" clearable filterable
- @change="handleLocationChange" style="width: 100%" :loading="locationLoading" size="medium">
- <el-option v-for="item in locationTypes" :key="item.locationType" :label="item.locationTypeDesc"
- :value="item.locationType" />
+ <el-form
+ :model="form"
+ :rules="rules"
+ ref="locationForm"
+ class="compact-form"
+ >
+ <el-form-item
+ label="浠撳簱鍖哄煙"
+ prop="locationType"
+ class="location-select compact-item"
+ >
+ <el-select
+ v-model="form.locationType"
+ placeholder="鑷姩鑾峰彇浠撳簱鍖哄煙"
+ clearable
+ filterable
+ @change="handleLocationChange"
+ style="width: 100%"
+ :loading="locationLoading"
+ size="medium"
+ :disabled="true"
+ >
+ <el-option
+ v-for="item in locationTypes"
+ :key="item.locationType"
+ :label="item.locationTypeDesc"
+ :value="item.locationType"
+ />
</el-select>
</el-form-item>
</el-form>
@@ -46,19 +95,39 @@
<span><i class="el-icon-scanner"></i> 鎵爜鍖哄煙</span>
<span class="scan-status">
<span class="scan-indicator"></span>
- {{ form.locationType && form.warehouseType ? '鎵爜灏辩华' : '璇峰厛閫夋嫨浠撳簱鍜屼粨搴撳尯鍩�' }}
+ {{
+ form.locationType && form.warehouseType
+ ? "鎵爜灏辩华"
+ : "璇峰厛閫夋嫨浠撳簱鍜屼粨搴撳尯鍩�"
+ }}
</span>
</div>
<!-- 鎵樼洏鏉＄爜杈撳叆 -->
<div class="input-wrapper custom-input-group compact-input">
<div class="input-label">鎵樼洏鏉＄爜</div>
- <el-input ref="trayInput" v-model="trayBarcode" placeholder="璇锋壂鎻忔垨杈撳叆鏂欑鐮佸悗鎸夊洖杞﹂敭" clearable
- :disabled="!form.locationType || !form.warehouseType" @keyup.enter.native="handleTraySubmit"
- @clear="handleTrayClear" @input="handleTrayInput" class="custom-input" size="medium">
+ <el-input
+ ref="trayInput"
+ v-model="trayBarcode"
+ placeholder="璇锋壂鎻忔垨杈撳叆鏂欑鐮佸悗鎸夊洖杞﹂敭"
+ clearable
+ :disabled="!form.locationType || !form.warehouseType"
+ @keyup.enter.native="handleTraySubmit"
+ @clear="handleTrayClear"
+ @input="handleTrayInput"
+ class="custom-input"
+ size="medium"
+ >
<template slot="append">
- <el-button @click="handleTraySubmit" type="primary" icon="el-icon-position"
- :disabled="!form.locationType || !trayBarcode || !form.warehouseType" size="medium">
+ <el-button
+ @click="handleTraySubmit"
+ type="primary"
+ icon="el-icon-position"
+ :disabled="
+ !form.locationType || !trayBarcode || !form.warehouseType
+ "
+ size="medium"
+ >
纭
</el-button>
</template>
@@ -68,14 +137,35 @@
<!-- 鐗╂枡鏉＄爜杈撳叆 -->
<div class="input-wrapper custom-input-group compact-input">
<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"
- class="custom-input" size="medium">
+ <el-input
+ ref="barcodeInput"
+ v-model="barcode"
+ placeholder="璇锋壂鎻忔垨杈撳叆鐗╂枡鏉＄爜鍚庢寜鍥炶溅閿�"
+ clearable
+ :disabled="
+ !form.locationType || !trayBarcode || !form.warehouseType
+ "
+ @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">
- {{ loading ? '鏌ヨ涓�...' : '鏌ヨ' }}
+ <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>
</el-input>
@@ -83,11 +173,22 @@
<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 && !trayBarcode" class="warning-text">鈿狅笍 璇峰厛杈撳叆鏂欑鐮�</p>
+ <p v-if="!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>
-
</el-card>
</div>
@@ -99,7 +200,13 @@
<!-- 閿欒鎻愮ず -->
<div v-if="error" class="error-message compact">
- <el-alert :title="error" type="error" show-icon closable @close="error = ''" />
+ <el-alert
+ :title="error"
+ type="error"
+ show-icon
+ closable
+ @close="error = ''"
+ />
</div>
<!-- 鏈粍鐩樺垪琛� -->
@@ -108,25 +215,66 @@
<div slot="header" class="compact-header">
<span><i class="el-icon-tickets"></i> 鏈粍鐩樻潯鐮�</span>
<span class="list-actions">
- <el-tag type="primary" size="small">鏈粍鐩� {{ totalStockCount }}</el-tag>
+ <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"
- v-loading="unpalletBarcodesLoading">
- <el-table-column type="index" label="搴忓彿" width="60" align="center"></el-table-column>
- <el-table-column prop="barcode" label="鏉＄爜" min-width="140" show-overflow-tooltip></el-table-column>
- <el-table-column prop="materielCode" label="鐗╂枡缂栫爜" min-width="150" show-overflow-tooltip></el-table-column>
- <el-table-column prop="batchNo" label="鎵规" min-width="150" show-overflow-tooltip></el-table-column>
- <el-table-column prop="orderQuantity" label="鏁伴噺" min-width="130" align="right"></el-table-column>
- <el-table-column prop="unit" label="鍗曚綅" width="80" align="center"></el-table-column>
- <el-table-column prop="supplyCode" label="渚涘簲鍟�" min-width="130" show-overflow-tooltip></el-table-column>
+ <el-table
+ :data="unpalletMaterials"
+ stripe
+ style="width: 100%"
+ height="100%"
+ size="small"
+ v-loading="unpalletBarcodesLoading"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="60"
+ align="center"
+ ></el-table-column>
+ <el-table-column
+ prop="barcode"
+ label="鏉＄爜"
+ min-width="140"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column
+ prop="materielCode"
+ label="鐗╂枡缂栫爜"
+ min-width="150"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column
+ prop="batchNo"
+ label="鎵规"
+ min-width="150"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column
+ prop="orderQuantity"
+ label="鏁伴噺"
+ min-width="130"
+ align="right"
+ ></el-table-column>
+ <el-table-column
+ prop="unit"
+ label="鍗曚綅"
+ width="80"
+ align="center"
+ ></el-table-column>
+ <el-table-column
+ prop="supplyCode"
+ label="渚涘簲鍟�"
+ min-width="130"
+ show-overflow-tooltip
+ ></el-table-column>
</el-table>
</div>
</el-card>
-
</div>
<!-- 鐗╂枡鍒楄〃 - 鍥哄畾楂樺害甯︽粴鍔ㄦ潯 -->
@@ -135,45 +283,119 @@
<div slot="header" class="compact-header">
<span><i class="el-icon-tickets"></i> 缁勭洏鏁版嵁</span>
<span class="list-actions">
- <el-tag type="primary" size="small">鍏� {{ materials.length }} 鏉�</el-tag>
- <el-tag type="primary" size="small">鏈叆搴撴暟閲� {{ totalStockSum }}{{ uniqueUnit }}</el-tag>
- <el-tag v-if="trayBarcode" type="success" size="small">鎵樼洏: {{ trayBarcode }}</el-tag>
- <el-tag v-if="form.warehouseType" type="info" size="small">浠撳簱: {{ currentWarehouseName }}</el-tag>
- <el-tag v-if="form.locationType" type="info" size="small">鍖哄煙: {{ currentLocationDesc }}</el-tag>
+ <el-tag type="primary" size="small"
+ >鍏� {{ materials.length }} 鏉�</el-tag
+ >
+ <el-tag type="primary" size="small"
+ >鏈叆搴撴暟閲� {{ totalStockSum }}{{ uniqueUnit }}</el-tag
+ >
+ <el-tag v-if="trayBarcode" type="success" size="small"
+ >鎵樼洏: {{ trayBarcode }}</el-tag
+ >
+ <el-tag v-if="form.warehouseType" type="info" size="small"
+ >浠撳簱: {{ currentWarehouseName }}</el-tag
+ >
+ <el-tag v-if="form.locationType" type="info" size="small"
+ >鍖哄煙: {{ currentLocationDesc }}</el-tag
+ >
</span>
</div>
<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>
<div class="table-container" v-else>
- <el-table :data="materials" stripe style="width: 100%" height="100%" size="small">
- <el-table-column type="index" label="搴忓彿" width="60" align="center"></el-table-column>
- <el-table-column prop="barcode" label="鏉＄爜" min-width="140" show-overflow-tooltip></el-table-column>
- <el-table-column prop="materielCode" label="鐗╂枡缂栫爜" min-width="150" show-overflow-tooltip></el-table-column>
- <el-table-column prop="batchNo" label="鎵规" min-width="150" show-overflow-tooltip></el-table-column>
- <el-table-column prop="stockQuantity" label="鏁伴噺" min-width="130" align="right"></el-table-column>
- <el-table-column prop="unit" label="鍗曚綅" width="80" align="center"></el-table-column>
- <el-table-column prop="supplyCode" label="渚涘簲鍟�" min-width="130" show-overflow-tooltip></el-table-column>
- <el-table-column prop="warehouseType" label="浠撳簱" min-width="120" show-overflow-tooltip></el-table-column>
+ <el-table
+ :data="materials"
+ stripe
+ style="width: 100%"
+ height="100%"
+ size="small"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="60"
+ align="center"
+ ></el-table-column>
+ <el-table-column
+ prop="barcode"
+ label="鏉＄爜"
+ min-width="140"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column
+ prop="materielCode"
+ label="鐗╂枡缂栫爜"
+ min-width="150"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column
+ prop="batchNo"
+ label="鎵规"
+ min-width="150"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column
+ prop="stockQuantity"
+ label="鏁伴噺"
+ min-width="130"
+ align="right"
+ ></el-table-column>
+ <el-table-column
+ prop="unit"
+ label="鍗曚綅"
+ width="80"
+ align="center"
+ ></el-table-column>
+ <el-table-column
+ prop="supplyCode"
+ label="渚涘簲鍟�"
+ min-width="130"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column
+ prop="warehouseType"
+ label="浠撳簱"
+ min-width="120"
+ show-overflow-tooltip
+ ></el-table-column>
</el-table>
</div>
</el-card>
</div>
</div>
<template #footer>
- <el-button type="danger" size="small" @click="handleDialogClose()">鍏抽棴</el-button>
+ <el-button type="danger" size="small" @click="handleDialogClose()"
+ >鍏抽棴</el-button
+ >
</template>
</vol-box>
</template>
+
<script>
-import http from '@/api/http.js';
-import VolBox from '@/components/basic/VolBox.vue';
+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 },
@@ -183,86 +405,123 @@
orderNo: "",
palletVisible: this.visible,
trayBarcodeReg: /^[A-Z]\d{9}$/,
- trayBarcode: '',
- barcode: '',
+ trayBarcode: "",
+ barcode: "",
materials: [],
loading: false,
- error: '',
+ error: "",
debugMode: false,
- currentFocus: 'warehouse',
+ currentFocus: "warehouse",
unpalletBarcodes: [],
unpalletBarcodesLoading: false,
- unpalletMaterials: [], // 鏈粍鐩樿缁嗘暟鎹垪琛�
+ unpalletMaterials: [],
- // 鎵爜鏋浉鍏冲彉閲�
- scanCode: '',
+ scanCode: "",
lastKeyTime: null,
isManualInput: false,
isScanning: false,
scanTimer: null,
manualInputTimer: null,
- scanTarget: 'tray', // 褰撳墠鎵爜鐩爣: tray 鎴� material
+ scanTarget: "tray",
+ isSubmitting: false,
+ palletGroupedBarcodes: {},
- // 搴撳瓨缁熻鐩稿叧鍙橀噺
+ audioConfig: {
+ successPath: require("@/assets/audio/success.mp3"),
+ errorPath: require("@/assets/audio/error.mp3"),
+ },
+ // 缂撳瓨闊抽瀹炰緥锛岄伩鍏嶉噸澶嶅垱寤�
+ successAudio: null,
+ errorAudio: null,
+
totalStockSum: 0,
totalStockCount: 0,
- uniqueUnit: '',
+ uniqueUnit: "",
sumLoading: false,
- sumError: '',
- // 浠撳簱鐩稿叧鍙橀噺
+ sumError: "",
warehouseTypes: [],
warehouseLoading: false,
- // 浠撳簱鍖哄煙鐩稿叧鍙橀噺
locationTypes: [],
locationLoading: false,
form: {
warehouseType: null,
- locationType: null
+ locationType: null,
},
rules: {
locationType: [
{
validator: this.validateLocationType,
- trigger: 'change'
- }
+ trigger: "change",
+ },
],
trayBarcode: [
{
pattern: this.trayBarcodeReg,
- message: '鎵樼洏鍙锋牸寮忛敊璇紙闇�涓�1涓ぇ鍐欏瓧姣�+9涓暟瀛楋紝濡侫000008024锛�',
- trigger: 'blur'
- }
+ message: "鎵樼洏鍙锋牸寮忛敊璇紙闇�涓�1涓ぇ鍐欏瓧姣�+9涓暟瀛楋紝濡侫000008024锛�",
+ trigger: "blur",
+ },
],
warehouseType: [
{
- message: '璇烽�夋嫨浠撳簱',
- trigger: 'change'
- }
- ]
- }
- }
+ message: "璇烽�夋嫨浠撳簱",
+ trigger: "change",
+ },
+ ],
+ },
+
+ // 鏂板锛氶敭鐩樹簨浠剁洃鍚爣璁�
+ keyPressListenerAdded: false,
+ isDialogClosing: false,
+ };
},
computed: {
- // 褰撳墠閫夋嫨鐨勪粨搴撳悕绉�
currentWarehouseName() {
- const warehouse = this.warehouseTypes.find(item => item.warehouseType === this.form.warehouseType);
- return warehouse ? warehouse.warehouseTypeDesc : '';
+ 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 : ''
- }
+ 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('寮规鎵撳紑锛岄噸缃暟鎹�');
+ console.log("寮规鎵撳紑锛岄噸缃暟鎹�");
this.resetData();
this.$nextTick(() => {
setTimeout(() => {
@@ -271,32 +530,130 @@
});
}
- // 褰撲粠 true 鍙樹负 false 鏃讹紝琛ㄧず寮规鍏抽棴
if (newVal === false && oldVal === true) {
- console.log('寮规鍏抽棴锛岄噸缃暟鎹�');
+ console.log("寮规鍏抽棴锛岄噸缃暟鎹�");
this.resetData();
}
},
+
palletVisible(newVal) {
- this.$emit('update:visible', newVal);
+ this.$emit("update:visible", newVal);
},
+
docNo(newVal) {
if (newVal) {
- this.palletForm = { palletCode: '', barcode: '' };
+ this.palletForm = { palletCode: "", barcode: "" };
this.backData = [];
this.$refs.palletForm?.reset();
this.fetchUnpalletMaterialDetails();
}
- }
+ },
},
+
mounted() {
- document.addEventListener('keypress', this.handleKeyPress);
+ // 涓嶅湪mounted鏃舵坊鍔犵洃鍚紝鍦ㄥ脊绐楁墦寮�鏃舵坊鍔�
},
+
beforeDestroy() {
- document.removeEventListener('keypress', this.handleKeyPress);
+ // 纭繚缁勪欢閿�姣佹椂绉婚櫎鐩戝惉
+ this.removeKeyPressListener();
this.clearAllTimers();
+
+ this.removeKeyPressListener();
+ this.clearAllTimers();
+
+ //閿�姣侀煶棰戝疄渚�
+ this.successAudio = null;
+ this.errorAudio = null;
},
+
methods: {
+ /**
+ * 鍒濆鍖栭煶棰戝疄渚嬶紙鎳掑姞杞斤紝鍙垱寤轰竴娆★級
+ * @param {String} type - 闊抽绫诲瀷锛歴uccess/error
+ * @returns {Audio} 闊抽瀹炰緥
+ */
+ initAudioInstance(type) {
+ if (type === "success" && this.successAudio) {
+ return this.successAudio;
+ }
+ if (type === "error" && this.errorAudio) {
+ return this.errorAudio;
+ }
+
+ const audioPath =
+ type === "success"
+ ? this.audioConfig.successPath
+ : this.audioConfig.errorPath;
+
+ const audioInstance = new Audio(audioPath);
+
+ // 缂撳瓨闊抽瀹炰緥
+ if (type === "success") {
+ this.successAudio = audioInstance;
+ } else {
+ this.errorAudio = audioInstance;
+ }
+
+ // 闊抽鍔犺浇澶辫触鍥炶皟锛堝彲閫夛紝鐢ㄤ簬璋冭瘯锛�
+ audioInstance.onerror = (err) => {
+ console.error(`銆�${type} 闊抽銆戝姞杞藉け璐, err);
+ };
+
+ return audioInstance;
+ },
+
+ /**
+ * 鎾斁闊抽
+ * @param {String} type - 闊抽绫诲瀷锛歴uccess/error
+ */
+ playAudio(type) {
+ try {
+ const audioInstance = this.initAudioInstance(type);
+
+ // 閲嶇疆鎾斁杩涘害锛堥伩鍏嶉噸澶嶆挱鏀炬椂闊抽鏈粨鏉燂級
+ audioInstance.currentTime = 0;
+
+ // 鎾斁闊抽锛堣繑鍥� Promise 澶勭悊鎾斁缁撴灉锛屽吋瀹归儴鍒嗘祻瑙堝櫒闄愬埗锛�
+ audioInstance.play().catch((err) => {
+ console.warn("闊抽鎾斁澶辫触锛堝彲鑳芥槸娴忚鍣ㄨ嚜鍔ㄦ挱鏀剧瓥鐣ラ檺鍒讹級", err);
+ });
+ } catch (err) {
+ console.error("鎾斁闊抽鏃跺彂鐢熷紓甯�", err);
+ }
+ },
+
+ /**
+ * 鎾斁鎴愬姛闊抽
+ */
+ playSuccessAudio() {
+ this.playAudio("success");
+ },
+
+ /**
+ * 鎾斁澶辫触闊抽
+ */
+ playErrorAudio() {
+ this.playAudio("error");
+ },
+ // 娣诲姞閿洏浜嬩欢鐩戝惉
+ 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,161 +661,237 @@
this.initLocationTypes();
this.initwarehouseTypes();
this.fetchUnpalletMaterialDetails();
+
+ // 寮圭獥鎵撳紑鏃舵坊鍔犻敭鐩樹簨浠剁洃鍚�
+ this.$nextTick(() => {
+ setTimeout(() => {
+ this.addKeyPressListener();
+ }, 100);
+ });
},
+
validateLocationType(rule, value, callback) {
if (!this.form.warehouseType) {
- callback(new Error('璇峰厛閫夋嫨浠撳簱'));
- } else if (value === null || value === undefined || value === '') {
- callback(new Error('璇烽�夋嫨浠撳簱鍖哄煙'));
+ callback(new Error("璇峰厛閫夋嫨浠撳簱"));
+ } else if (value === null || value === undefined || value === "") {
+ callback(new Error("璇烽�夋嫨浠撳簱鍖哄煙"));
} else {
callback();
}
},
- // 鏍规嵁鏉＄爜鍒楄〃鑾峰彇璇︾粏鏁版嵁
- 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: '-'
- }));
- }
- },
- async initLocationTypes() {
- try {
- const { data } = await this.http.post("api/LocationInfo/GetLocationTypes")
- this.locationTypes = data
- } catch (e) {
- this.$message.error('鑾峰彇鍖哄煙绫诲瀷澶辫触')
- }
- },
- async initwarehouseTypes() {
- try {
- const { data } = await this.http.post("api/Warehouse/GetwarehouseTypes")
- this.warehouseTypes = data
- } catch (e) {
- this.$message.error('鑾峰彇鍖哄煙绫诲瀷澶辫触')
- }
+ // 鑾峰彇鏈粍鐩樼墿鏂欒鎯�
+ 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 fetchStockStatistics(orderNo) {
- // 鍗曟嵁鍙蜂负绌烘椂涓嶆煡璇�
- if (!orderNo) {
- this.sumError = '鍗曟嵁鍙蜂负绌猴紝鏃犳硶缁熻';
+ // 鍒濆鍖栦粨搴撳尯鍩熺被鍨�
+ 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;
+ });
+ },
+
+ // 鍒濆鍖栦粨搴撶被鍨�
+ 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;
+ });
+ },
+
+ fetchLocationByWarehouse(warehouseCode) {
+ if (!warehouseCode) {
+ this.form.locationType = null;
return;
+ }
+ this.locationLoading = true;
+ http.post(`/api/InboundOrder/GetLocationType?code=${warehouseCode}`)
+ .then(({ data }) => {
+ if (data) {
+ this.form.locationType = data.locationType || data;
+ if (!this.locationTypes.find(item => item.locationType === this.form.locationType)) {
+ this.locationTypes.push({
+ locationType: this.form.locationType,
+ locationTypeDesc: this.form.locationType
+ });
+ }
+ }
+ })
+ .catch((err) => {
+ console.error("鑾峰彇浠撳簱鍖哄煙澶辫触:", err);
+ this.$message.error("鑾峰彇浠撳簱鍖哄煙澶辫触锛岃閲嶈瘯");
+ this.form.locationType = null;
+ })
+ .finally(() => {
+ this.locationLoading = false;
+ });
+ },
+ // 鑾峰彇搴撳瓨缁熻
+ fetchStockStatistics(orderNo) {
+ if (!orderNo) {
+ this.sumError = "鍗曟嵁鍙蜂负绌猴紝鏃犳硶缁熻";
+ 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;
- }
+ this.sumError = "";
+
+ 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 = '琛ㄥ崟鏈垵濮嬪寲';
- this.$message.warning('璇峰厛閫夋嫨浠撳簱鍖哄煙');
+ this.error = "琛ㄥ崟鏈垵濮嬪寲";
+ this.$message.warning("璇峰厛閫夋嫨浠撳簱鍖哄煙");
resolve(false);
return;
}
this.$refs.locationForm.validate((valid) => {
if (valid) {
- this.error = '';
+ this.error = "";
resolve(true);
} else {
- if (!this.from.warehouseType) {
- this.error = '璇峰厛閫夋嫨浠撳簱';
- }
- else if (this.form.locationType === null || this.form.locationType === undefined || this.form.locationType === '') {
- this.error = '璇峰厛閫夋嫨浠撳簱鍖哄煙';
+ if (!this.form.warehouseType) {
+ this.error = "璇峰厛閫夋嫨浠撳簱";
+ } else if (!this.form.locationType) {
+ this.error = "璇峰厛閫夋嫨浠撳簱鍖哄煙";
} else {
- this.error = '璇锋鏌ヨ〃鍗曞～鍐欐槸鍚︽纭�';
+ this.error = "璇锋鏌ヨ〃鍗曞～鍐欐槸鍚︽纭�";
}
resolve(false);
}
});
});
},
- // 鑱氱劍鍒版墭鐩樿緭鍏ユ
+
focusTrayInput() {
if (this.$refs.trayInput && this.$refs.trayInput.$el) {
- const inputEl = this.$refs.trayInput.$el.querySelector('input');
+ const inputEl = this.$refs.trayInput.$el.querySelector("input");
if (inputEl) {
inputEl.focus();
- this.currentFocus = 'tray';
- this.scanTarget = 'tray';
+ this.currentFocus = "tray";
+ this.scanTarget = "tray";
inputEl.select();
}
}
},
- // 鑱氱劍鍒扮墿鏂欒緭鍏ユ
focusBarcodeInput() {
if (this.$refs.barcodeInput && this.$refs.barcodeInput.$el) {
- const inputEl = this.$refs.barcodeInput.$el.querySelector('input');
+ const inputEl = this.$refs.barcodeInput.$el.querySelector("input");
if (inputEl) {
inputEl.focus();
- this.currentFocus = 'material';
- this.scanTarget = 'material';
+ this.currentFocus = "material";
+ this.scanTarget = "material";
inputEl.select();
}
}
},
- // 閲嶇疆鎵�鏈夋暟鎹�
+
resetData() {
- this.trayBarcode = '';
- this.barcode = '';
+ this.palletGroupedBarcodes = {};
+ this.isSubmitting = false;
+ this.trayBarcode = "";
+ this.barcode = "";
this.materials = [];
this.unpalletBarcodes = [];
this.unpalletMaterials = [];
this.loading = false;
- this.error = '';
- this.scanCode = '';
+ this.error = "";
+ this.scanCode = "";
this.lastKeyTime = null;
this.isManualInput = false;
this.isScanning = false;
- this.currentFocus = 'warehouse';
- this.scanTarget = 'tray';
+ this.currentFocus = "warehouse";
+ this.scanTarget = "tray";
this.clearAllTimers();
this.totalStockSum = 0;
this.totalStockCount = 0;
this.sumLoading = false;
- this.sumError = '';
+ this.sumError = "";
this.form = {
warehouseType: null,
- locationType: null
- }
+ locationType: null,
+ };
this.warehouseTypes = [];
this.locationTypes = [];
- // 娓呴櫎琛ㄥ崟楠岃瘉鐘舵��
+
this.$nextTick(() => {
if (this.$refs.locationForm) {
this.$refs.locationForm.clearValidate();
@@ -466,7 +899,6 @@
});
},
- // 娓呴櫎鎵�鏈夎鏃跺櫒
clearAllTimers() {
if (this.manualInputTimer) {
clearTimeout(this.manualInputTimer);
@@ -477,276 +909,337 @@
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.trayBarcode) {
+ this.trayBarcode = this.trayBarcode.replace(/\s+/g, "");
+ }
+
if (this.manualInputTimer) {
clearTimeout(this.manualInputTimer);
}
- // 璁剧疆璁℃椂鍣紝濡傛灉涓�娈垫椂闂村唴娌℃湁杈撳叆锛屽垯閲嶇疆涓烘壂鐮佹ā寮�
this.manualInputTimer = setTimeout(() => {
this.isManualInput = false;
}, 1000);
},
- // 澶勭悊鐗╂枡杈撳叆
handleBarcodeInput() {
- // 鏍囪涓烘墜鍔ㄨ緭鍏ユā寮�
this.isManualInput = true;
this.isScanning = false;
- // 娓呴櫎涔嬪墠鐨勮鏃跺櫒
+ if (this.barcode) {
+ this.barcode = this.barcode.replace(/\s+/g, "");
+ }
+
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 = '璇峰厛閫夋嫨浠撳簱';
+ this.error = "璇峰厛閫夋嫨浠撳簱";
return;
}
if (!this.form.locationType) {
- this.error = '璇峰厛閫夋嫨浠撳簱鍖哄煙';
- //this.$message.warning('璇峰厛閫夋嫨浠撳簱鍖哄煙');
+ this.error = "璇峰厛閫夋嫨浠撳簱鍖哄煙";
return;
}
- // 鐒跺悗鍐嶈繘琛屽畬鏁寸殑琛ㄥ崟楠岃瘉
- if (!await this.validateForm()) return;
+ this.validateForm().then((valid) => {
+ if (!valid) return;
- const currentTrayBarcode = this.trayBarcode.trim();
+ let currentTrayBarcode = (this.trayBarcode || "").replace(/\s+/g, "").trim();
+
+ this.trayBarcode = currentTrayBarcode;
- if (!currentTrayBarcode) {
- this.error = '璇疯緭鍏ユ垨鎵弿鎵樼洏鏉＄爜';
- return;
- }
+ if (!currentTrayBarcode) {
+ this.error = "璇疯緭鍏ユ垨鎵弿鎵樼洏鏉＄爜";
+ return;
+ }
- this.error = '';
+ this.error = "";
- if (!this.trayBarcodeReg.test(currentTrayBarcode)) {
- // ElMessage.warning({
- // message: '鎵樼洏鍙锋牸寮忛敊璇�',
- // type: 'warning',
- // duration: 3000
- // })
- this.$message("鎵樼洏鍙锋牸寮忛敊璇�");
- this.focusTrayInput();
- return;
- }
+ if (!this.trayBarcodeReg.test(currentTrayBarcode)) {
+ this.$message("鎵樼洏鍙锋牸寮忛敊璇�");
+ this.focusTrayInput();
+ return;
+ }
- // 璁剧疆鎵樼洏鏉＄爜鍚庯紝鑷姩鑱氱劍鍒扮墿鏂欒緭鍏ユ
- this.focusBarcodeInput();
-
- // this.$message({
- // message: `鎵樼洏鏉＄爜宸茶缃�: ${currentTrayBarcode}`,
- // type: 'success',
- // duration: 2000
- // });
- this.$message.success(`鎵樼洏鏉＄爜宸茶缃�: ${currentTrayBarcode}`);
- },
-
- // 娓呴櫎鎵樼洏
- clearTray() {
- this.trayBarcode = '';
- this.materials = [];
- this.focusTrayInput();
- this.$message({
- message: '鎵樼洏鏉＄爜宸叉竻闄�',
- type: 'info',
- duration: 2000
+ this.focusBarcodeInput();
+ this.$message.success(`鎵樼洏鏉＄爜宸茶缃�: ${currentTrayBarcode}`);
});
},
- // 娓呯┖鎵樼洏杈撳叆
- handleTrayClear() {
- this.error = '';
+ clearTray() {
+ this.trayBarcode = "";
+ this.materials = [];
+ this.focusTrayInput();
+ this.$message({
+ message: "鎵樼洏鏉＄爜宸叉竻闄�",
+ type: "info",
+ duration: 2000,
+ });
},
- // 娓呯┖杈撳叆
+ handleTrayClear() {
+ this.error = "";
+ },
+
handleClear() {
- this.error = '';
- this.scanCode = '';
+ this.error = "";
+ this.scanCode = "";
this.isManualInput = false;
this.isScanning = false;
},
-
// 澶勭悊鐗╂枡鏉＄爜鎻愪氦
- async handleBarcodeSubmit() {
- if (!await this.validateForm()) return;
+ handleBarcodeSubmit() {
+ if (this.isSubmitting) {
+ this.$message.warning("姝ｅ湪澶勭悊涓紝璇风◢鍊�");
+ return;
+ }
+
const currentBarcode = this.barcode.trim();
+ const currentTrayGrouped =
+ this.palletGroupedBarcodes[this.trayBarcode] || [];
- 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();
- // 娓呯┖鐗╂枡杈撳叆妗嗗苟淇濇寔鑱氱劍
- this.barcode = '';
- this.scanCode = ''; // 娓呯┖鎵爜缂撳瓨
- this.isScanning = false;
-
- setTimeout(() => {
- this.focusBarcodeInput();
- }, 100);
- } catch (err) {
- this.error = err.message || '鏌ヨ鏉＄爜淇℃伅澶辫触锛岃閲嶈瘯';
+ if (currentTrayGrouped.includes(currentBarcode)) {
+ this.error = `鏉＄爜 ${currentBarcode} 宸茶褰撳墠鎵樼洏缁勭洏锛岃鍕块噸澶嶆搷浣渀;
+ this.barcode = "";
this.focusBarcodeInput();
- setTimeout(() => {
- // 閫変腑杈撳叆妗嗗唴鐨勯敊璇唴瀹癸紙纭繚focus瀹屾垚鍚庢墽琛岋級
- const inputEl = this.$refs.barcodeInput?.$el?.querySelector('input');
- if (inputEl) inputEl.select();
- }, 100);
- } finally {
- this.loading = false;
+ this.playErrorAudio();
+ 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璇锋眰
+ fetchMaterialData(barcode) {
+ return http
+ .post("/api/Inbound/GroupPallet", {
+ 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);
+ this.playErrorAudio(); // 瑙ｆ瀽澶辫触鎾斁閿欒闊�
+ throw new Error("鍝嶅簲鏁版嵁鏍煎紡閿欒");
+ }
+ } 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 || "鏌ヨ鏉＄爜淇℃伅澶辫触锛岃閲嶈瘯";
+ this.playErrorAudio(); // 鎺ュ彛杩斿洖澶辫触鎾斁閿欒闊�
+ return [];
}
- } else {
- materialData = response.data;
- }
- if (!response.status) {
- this.error = response.message || '鏌ヨ鏉＄爜淇℃伅澶辫触锛岃閲嶈瘯';
- }
- return materialData;
-
- } catch (error) {
- console.error('API璋冪敤澶辫触:', error);
- }
+ this.playSuccessAudio(); // 鎺ュ彛杩斿洖鎴愬姛鎾斁鎴愬姛闊�
+ return materialData || [];
+ })
+ .catch((error) => {
+ console.error("API璋冪敤澶辫触:", error);
+ this.$message.error("鎺ュ彛璇锋眰澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ this.playErrorAudio(); // 璇锋眰寮傚父鎾斁閿欒闊�
+ 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') {
+ 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') {
+ if (this.scanTarget === "tray") {
this.trayBarcode = this.scanCode;
this.handleTraySubmit();
- } else if (this.scanTarget === 'material') {
+ } else if (this.scanTarget === "material") {
this.barcode = this.scanCode;
this.handleBarcodeSubmit();
}
}
- this.scanCode = '';
+ this.scanCode = "";
this.lastKeyTime = null;
return;
}
- // 鏋勫缓鎵爜鍐呭锛堝揩閫熻繛缁緭鍏ヨ涓烘壂鐮侊級
if (this.lastKeyTime && currentTime - this.lastKeyTime < 50) {
this.scanCode += key;
this.isScanning = true;
@@ -755,7 +1248,6 @@
this.isScanning = true;
}
- // 璁剧疆璁℃椂鍣紝濡傛灉涓�娈垫椂闂村唴娌℃湁杈撳叆锛屽垯閲嶇疆鎵弿鐘舵��
if (this.scanTimer) {
clearTimeout(this.scanTimer);
}
@@ -769,16 +1261,34 @@
// 鏍煎紡鍖栨椂闂�
formatTime(date) {
const year = date.getFullYear();
- const month = String(date.getMonth() + 1).padStart(2, '0');
- const day = String(date.getDate()).padStart(2, '0');
- const hours = String(date.getHours()).padStart(2, '0');
- const minutes = String(date.getMinutes()).padStart(2, '0');
- const seconds = String(date.getSeconds()).padStart(2, '0');
+ const month = String(date.getMonth() + 1).padStart(2, "0");
+ const day = String(date.getDate()).padStart(2, "0");
+ const hours = String(date.getHours()).padStart(2, "0");
+ const minutes = String(date.getMinutes()).padStart(2, "0");
+ 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 = "";
+ this.fetchLocationByWarehouse(this.form.warehouseType);
+ },
+
+ // 鍖哄煙鍒囨崲浜嬩欢
+ handleLocationChange() {
+ this.trayBarcode = "";
+ this.barcode = "";
+ this.materials = [];
+ this.error = "";
+ },
+ },
+};
</script>
<style scoped>
@@ -809,7 +1319,7 @@
margin-bottom: 0;
}
-.compact-card>>>.el-card__body {
+.compact-card >>> .el-card__body {
padding: 12px;
}
@@ -820,7 +1330,7 @@
padding: 0 !important;
}
-.compact-header>>>.el-card__header {
+.compact-header >>> .el-card__header {
padding: 8px 12px;
}
@@ -838,7 +1348,7 @@
margin-bottom: 8px;
}
-.location-section.compact>>>.el-form-item {
+.location-section.compact >>> .el-form-item {
margin-bottom: 0;
}
@@ -864,13 +1374,13 @@
flex-direction: column;
}
-.material-list.compact>>>.el-card {
+.material-list.compact >>> .el-card {
display: flex;
flex-direction: column;
height: 100%;
}
-.material-list.compact>>>.el-card__body {
+.material-list.compact >>> .el-card__body {
flex: 1;
display: flex;
flex-direction: column;
@@ -884,11 +1394,11 @@
overflow: hidden;
}
-.material-list.compact>>>.el-table {
+.material-list.compact >>> .el-table {
flex: 1;
}
-.material-list.compact>>>.el-table__body-wrapper {
+.material-list.compact >>> .el-table__body-wrapper {
overflow-y: auto;
}
@@ -919,7 +1429,7 @@
.scan-status {
font-size: 12px;
- color: #67C23A;
+ color: #67c23a;
}
.scan-indicator {
@@ -927,7 +1437,7 @@
width: 8px;
height: 8px;
border-radius: 50%;
- background-color: #67C23A;
+ background-color: #67c23a;
margin-right: 5px;
animation: pulse 1.5s infinite;
}
@@ -956,7 +1466,7 @@
}
.warning-text {
- color: #E6A23C;
+ color: #e6a23c;
font-weight: bold;
}
@@ -968,7 +1478,7 @@
.loading.compact p {
margin-top: 5px;
- color: #409EFF;
+ color: #409eff;
font-size: 12px;
}
@@ -976,7 +1486,7 @@
margin: 5px 0;
}
-.error-message.compact>>>.el-alert {
+.error-message.compact >>> .el-alert {
padding: 6px 12px;
}
@@ -986,7 +1496,7 @@
gap: 4px;
}
-.list-actions>>>.el-tag {
+.list-actions >>> .el-tag {
height: 24px;
line-height: 22px;
padding: 0 6px;
@@ -997,9 +1507,9 @@
}
.material-code {
- font-family: 'Courier New', monospace;
+ font-family: "Courier New", monospace;
font-weight: bold;
- color: #409EFF;
+ color: #409eff;
}
.location-info {
@@ -1027,7 +1537,7 @@
align-items: center;
width: 100%;
margin: 8px 0;
- border: 1px solid #DCDFE6;
+ border: 1px solid #dcdfe6;
border-radius: 4px;
overflow: hidden;
background: #fff;
@@ -1035,8 +1545,8 @@
.input-label {
padding: 0 12px;
- background: #F5F7FA;
- border-right: 1px solid #DCDFE6;
+ background: #f5f7fa;
+ border-right: 1px solid #dcdfe6;
color: #606266;
font-size: 13px;
white-space: nowrap;
@@ -1057,7 +1567,7 @@
flex: 1;
}
-.custom-input>>>.el-input__inner {
+.custom-input >>> .el-input__inner {
border: none;
border-radius: 0;
height: 36px;
@@ -1079,13 +1589,13 @@
.input-label {
width: 100%;
border-right: none;
- border-bottom: 1px solid #DCDFE6;
+ border-bottom: 1px solid #dcdfe6;
margin-bottom: 5px;
}
.input-container {
width: 100%;
- border: 1px solid #DCDFE6;
+ border: 1px solid #dcdfe6;
border-radius: 4px;
}
@@ -1107,7 +1617,7 @@
overflow-y: auto;
}
- .unpallet-barcode-list>>>.el-tag {
+ .unpallet-barcode-list >>> .el-tag {
cursor: pointer;
max-width: calc(33.333% - 4px);
overflow: hidden;
@@ -1116,7 +1626,7 @@
}
@media (max-width: 768px) {
- .unpallet-barcode-list>>>.el-tag {
+ .unpallet-barcode-list >>> .el-tag {
max-width: calc(50% - 4px);
}
}
--
Gitblit v1.9.3