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

1.禁用库位时钉钉消息通知、更新缓存中对应模组的启用/禁用状态

Browse Source 
2.修复异常 模组管理中无法通过模组编码进行搜索
This commit is contained in:
hehaibing-1996
2024-05-28 08:42:56 +08:00
parent a73bb8e6b1
commit 5e179997c3
9 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
货架标准上位机/ViewModels/ModuleInfoViewModel.cs
View File

@ -97,9 +97,10 @@ namespace 货架标准上位机.ViewModel
var dia = Dialog.Show(new TextDialog());
try
{
var body = new GetShelvesRequest()
var body = new GetModulesRequest()
{
ShelfCode = ShelfCode,
ModuleCode = ModuleCode,
UserName = LocalStatic.CurrentUser,
DeviceType = LocalFile.Config.DeviceType,
PageNumber = CurrentPage,

4
货架标准上位机/Views/MXWindows/MXOutInventoryView.xaml
View File

@ -31,12 +31,12 @@
<Button Style="{StaticResource ButtonSuccess}" hc:BorderElement.CornerRadius="15"
Grid.Column="3" MinHeight="45" FontSize="28" Content="&#xec61;开始发料" FontFamily="{StaticResource IconFont}"
Grid.Column="3" MinHeight="45" FontSize="28" Content="&#xec61;完整发料" FontFamily="{StaticResource IconFont}"
Command="{Binding BtnStartCommand}"
>
</Button>
<Button Style="{StaticResource ButtonWarning}" hc:BorderElement.CornerRadius="15"
Grid.Column="4" MinHeight="45" FontSize="28" Content="&#xe61b;暂停发料" FontFamily="{StaticResource IconFont}"
Grid.Column="4" MinHeight="45" FontSize="28" Content="&#xe61b;取消发料" FontFamily="{StaticResource IconFont}"
Command="{Binding BtnPauseCommand}">
</Button>
</Grid>

20
货架标准上位机/Views/Windows/WarningWindow.xaml.cs
View File

@ -43,16 +43,16 @@ namespace 货架标准上位机
WarningManager.RemoveWarning(warning.Guid);
}
/// <summary>
/// 显示提示框
/// </summary>
/// <param name="content">内容</param>
/// <param name="isVisCloseBut">界面右上角是否显示关闭按钮</param>
/// <returns>点击的按钮文本</returns>
public static WarningWindow Show(string content, WebSocketMessageModel _warning, bool isVisCloseBut = true, Window owner = null)
{
return Show(content, string.Empty, _warning, isVisCloseBut);
}
///// <summary>
///// 显示提示框
///// </summary>
///// <param name="content">内容</param>
///// <param name="isVisCloseBut">界面右上角是否显示关闭按钮</param>
///// <returns>点击的按钮文本</returns>
//public static WarningWindow Show(string content, WebSocketMessageModel _warning, bool isVisCloseBut = true, Window owner = null)
//{
// return Show(content, string.Empty, _warning, isVisCloseBut);
//}
/// <summary>
/// 显示提示框