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; }