From 376a40cfd99ac5d5ca1ebe7a3305de59c672c3db Mon Sep 17 00:00:00 2001 From: hehaibing-1996 Date: Fri, 27 Sep 2024 17:39:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=9F=E8=AE=AF=E5=85=AC=E5=8F=B81.=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A0=8F=E5=8F=AF=E4=BB=A5=E8=BE=93=E5=85=A5=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=AD=97=E7=AC=A6=202.=E9=80=80=E5=87=BA=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=A8=A1=E5=BC=8F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WCS.BLL/HardWare/SmartShelf.cs | 5 ++++- 货架标准上位机/Views/MXWindows/MXOutOrderView.xaml.cs | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/WCS.BLL/HardWare/SmartShelf.cs b/WCS.BLL/HardWare/SmartShelf.cs index e072fb7..c08b2cc 100644 --- a/WCS.BLL/HardWare/SmartShelf.cs +++ b/WCS.BLL/HardWare/SmartShelf.cs @@ -337,8 +337,10 @@ namespace WCS.BLL.HardWare if (module.CurrentOutSns == null || module.CurrentOutSns.Count == 0) { Logs.Write($"GoInOutstoreByModule货架【{ShelfCode}】，模组【{module.ModuleCode}】，不存在需要继续出的物料，给其复位。", LogsType.Outstore); + //不需要这个模组继续亮灯了 - module.Reset(TcpCleint); + module.GoOutOutStoreMode(TcpCleint); + Thread.Sleep(400); //判断此货架是否还有出库模式的模块 #region 判断是否退出入库 是否亮下一次灯逻辑 @@ -352,6 +354,7 @@ namespace WCS.BLL.HardWare //退出出库模式 var taskGoOut = Task.Run(() => { + Thread.Sleep(10); GoOutOutstore(); }); diff --git a/货架标准上位机/Views/MXWindows/MXOutOrderView.xaml.cs b/货架标准上位机/Views/MXWindows/MXOutOrderView.xaml.cs index a83c3e5..3304033 100644 --- a/货架标准上位机/Views/MXWindows/MXOutOrderView.xaml.cs +++ b/货架标准上位机/Views/MXWindows/MXOutOrderView.xaml.cs @@ -62,7 +62,8 @@ namespace 货架标准上位机 private void txtMatQty1_PreviewTextInput(object sender, TextCompositionEventArgs e) { - if (!Regex.IsMatch(e.Text, "^[0-9]")) + //要求可以输入英文字符 + if (!Regex.IsMatch(e.Text, @"^[0-9A-Za-z]+$")) { e.Handled = true; }