From e0a1c1f6925a70f377abc855659b527e18454e95 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期五, 12 十二月 2025 13:56:13 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/PickingRetuenPallet.vue | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/PickingRetuenPallet.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/PickingRetuenPallet.vue"
index 7cf5a0d..4aa4e57 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/PickingRetuenPallet.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/PickingRetuenPallet.vue"
@@ -169,6 +169,7 @@
data() {
return {
palletVisible: this.visible,
+ trayBarcodeReg: /^[A-Z]\d{9}$/,
trayBarcode: '',
barcode: '',
materials: [],
@@ -209,6 +210,13 @@
trigger: 'change'
}
],
+ trayBarcode: [
+ {
+ pattern: /^[A-Z]\d{9}$/,
+ message: '鎵樼洏鍙锋牸寮忛敊璇�',
+ trigger: 'blur'
+ }
+ ],
warehouseType: [
{
massage: '璇烽�夋嫨浠撳簱',
@@ -516,6 +524,7 @@
inputEl.focus();
this.currentFocus = 'tray';
this.scanTarget = 'tray';
+ inputEl.select();
}
}
},
@@ -705,6 +714,12 @@
this.error = '';
+ if (!this.trayBarcodeReg.test(currentTrayBarcode)) {
+ ElMessage.error('鎵樼洏鏉＄爜鏍煎紡閿欒');
+ this.focusTrayInput();
+ return;
+ }
+
// 璁剧疆鎵樼洏鏉＄爜鍚庯紝鑷姩鑱氱劍鍒扮墿鏂欒緭鍏ユ
this.focusBarcodeInput();
@@ -834,7 +849,8 @@
barcodes: barcode,
locationTypeDesc: this.currentLocationDesc,
locationType: this.form.locationType, // 娣诲姞浠撳簱鍖哄煙淇℃伅
- warehouseType: this.form.warehouseType
+ warehouseType: this.form.warehouseType,
+ orderTypes: 116
}
);
--
Gitblit v1.9.3