ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

盟讯公司1.搜索栏可以输入英文字符 2.退出出库模式异常

Browse Source
This commit is contained in:
hehaibing-1996
2024-09-27 17:39:39 +08:00
parent e1c558a627
commit 376a40cfd9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
WCS.BLL/HardWare/SmartShelf.cs
View File

@ -337,8 +337,10 @@ namespace WCS.BLL.HardWare
if (module.CurrentOutSns == null || module.CurrentOutSns.Count == 0) if (module.CurrentOutSns == null || module.CurrentOutSns.Count == 0)
{ {
Logs.Write($"GoInOutstoreByModule货架【{ShelfCode}】，模组【{module.ModuleCode}】，不存在需要继续出的物料，给其复位。", LogsType.Outstore); Logs.Write($"GoInOutstoreByModule货架【{ShelfCode}】，模组【{module.ModuleCode}】，不存在需要继续出的物料，给其复位。", LogsType.Outstore);
//不需要这个模组继续亮灯了 //不需要这个模组继续亮灯了
module.Reset(TcpCleint); module.GoOutOutStoreMode(TcpCleint);
Thread.Sleep(400);
//判断此货架是否还有出库模式的模块 //判断此货架是否还有出库模式的模块
#region 判断是否退出入库 是否亮下一次灯逻辑 #region 判断是否退出入库 是否亮下一次灯逻辑
@ -352,6 +354,7 @@ namespace WCS.BLL.HardWare
//退出出库模式 //退出出库模式
var taskGoOut = Task.Run(() => var taskGoOut = Task.Run(() =>
{ {
Thread.Sleep(10);
GoOutOutstore(); GoOutOutstore();
}); });

3
货架标准上位机/Views/MXWindows/MXOutOrderView.xaml.cs
View File

@ -62,7 +62,8 @@ namespace 货架标准上位机
private void txtMatQty1_PreviewTextInput(object sender, TextCompositionEventArgs e) 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; e.Handled = true;
} }