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

1.该订单最后一个货架结束入库

Browse Source
This commit is contained in:
hehaibing-1996
2024-05-31 17:03:54 +08:00
parent 46321e340b
commit a87a93ea11
9 changed files with 78 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
货架标准上位机/ViewModels/MXViewModel/MXOutInventoryViewModel.cs
View File

@ -281,6 +281,10 @@ namespace 货架标准上位机.ViewModel
{
DataGridItemSource = new ObservableCollection<OutOrderMatDetailModel>(Result.Data);
OrderStatus = Result.Message;
if (OrderStatus == OutOrderStatus.全部发料.ToString())
{
//全部发料就默认所有货架结束了这个单子
}
}
else
{

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

@ -15,8 +15,6 @@
<RowDefinition Height="0.9*"></RowDefinition>
<RowDefinition Height="0.9*"></RowDefinition>
<RowDefinition Height="9*"></RowDefinition>
</Grid.RowDefinitions>
<Border Grid.Row="0" Margin="0" Background="AliceBlue" Padding="0">
@ -28,12 +26,9 @@
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
</Grid.ColumnDefinitions>
<Button Style="{StaticResource ButtonSuccess}" hc:BorderElement.CornerRadius="15"
Grid.Column="3" MinHeight="45" FontSize="28" Content="&#xec61;完整发料" FontFamily="{StaticResource IconFont}"
Command="{Binding BtnStartCommand}"
>
Command="{Binding BtnStartCommand}">
</Button>
<Button Style="{StaticResource ButtonWarning}" hc:BorderElement.CornerRadius="15"
Grid.Column="4" MinHeight="45" FontSize="28" Content="&#xe61b;取消发料" FontFamily="{StaticResource IconFont}"

7
货架标准上位机/WebSocket.cs
View File

@ -105,6 +105,13 @@ namespace 货架标准上位机
OutVentoryView.viewModel.RefreshDataGridItemSource();
client.Send(e.DataFrame.ToText());
break;
case WarningTypeEnum.通知刷新出库单列表:
if (LocalFile.Config.IsMx)
MXOutInventoryView.viewModel.RefreshOutOrderList(MXOutInventoryView.viewModel.SelectedOutOrderNumber);
else
OutVentoryView.viewModel.RefreshOutOrderList(MXOutInventoryView.viewModel.SelectedOutOrderNumber);
client.Send(e.DataFrame.ToText());
break;
case WarningTypeEnum.通知刷新盘点:
StockTakingView.viewModel.RefreshDataGridItemSource();
client.Send(e.DataFrame.ToText());