liuwf 1 year ago
parent d56217341e
commit 89d6a133ab

@ -2320,7 +2320,7 @@
<StackPanel Orientation="Vertical" > <StackPanel Orientation="Vertical" >
<Button Content="选择出库" Background="#346DFF" Foreground="White" FontSize="50" Margin="20,0,0,0" Height="100" Width="250" Click="SelectOutBtn_Click"/> <Button x:Name="SelectOutButton" Content="选择出库" Background="#346DFF" Foreground="White" FontSize="50" Margin="20,0,0,0" Height="100" Width="250" Click="SelectOutBtn_Click"/>
<Button Content="继续出库" Background="#346DFF" Foreground="White" FontSize="50" Margin="20,50,0,0" Height="100" Width="250" Click="ContineOutBtn_Click"/> <Button Content="继续出库" Background="#346DFF" Foreground="White" FontSize="50" Margin="20,50,0,0" Height="100" Width="250" Click="ContineOutBtn_Click"/>
</StackPanel> </StackPanel>

@ -452,6 +452,7 @@ namespace Khd.Core.Wpf.Form
{ {
} }
Thread.Sleep(1000);
} }
} }
@ -476,9 +477,25 @@ namespace Khd.Core.Wpf.Form
BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 10); BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 10);
string nowStationCode = baseEquip.endStationCode; string nowStationCode = baseEquip.endStationCode;
if (!string.IsNullOrEmpty(nowStationCode))
{
Dispatcher.Invoke(() => Dispatcher.Invoke(() =>
{ {
this.OutOrder.Text = "当前:" + nowStationCode + "\n" + "待出库单:\n" + list.Distinct().Join("\n"); SelectOutButton.Content = "当前:" + nowStationCode;
//SelectOutButton.IsEnabled = false;
});
}
else
{
Dispatcher.Invoke(() =>
{
SelectOutButton.Content = "选择出库";
//SelectOutButton.IsEnabled = true;
});
}
Dispatcher.Invoke(() =>
{
this.OutOrder.Text = "待出库单:\n" + list.Distinct().Join("\n");
}); });
@ -616,7 +633,7 @@ namespace Khd.Core.Wpf.Form
{ {
} }
Thread.Sleep(1000); Thread.Sleep(2000);
} }
} }

Loading…
Cancel
Save