Browse Source

本地存储

煮面机(新)
lyw 4 months ago
parent
commit
08d0a7e0bd
4 changed files with 10 additions and 4 deletions
  1. +2
    -2
      BPASmartClient.Device/BaseDevice.cs
  2. +6
    -0
      BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
  3. +1
    -1
      BPASmartClient/Control/FoodMenuView.xaml
  4. +1
    -1
      BPASmartClient/Control/FoodMenuView.xaml.cs

+ 2
- 2
BPASmartClient.Device/BaseDevice.cs View File

@@ -183,12 +183,12 @@ namespace BPASmartClient.Device
TaskManage.GetInstance.StartLong(() =>
{
var res = this.peripherals.FindAll(o => o.IsConnected == true);
if (res.Count > 0)
if (res.Count > 0&&IsConnected)
{
IsConnected = true;
stateAction?.Invoke(true);
}
else
else if (res.Count<=0&&!IsConnected)
{
IsConnected= false;
stateAction?.Invoke(false);


+ 6
- 0
BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs View File

@@ -633,6 +633,8 @@ namespace BPASmartClient.MorkSUpgradedVer
{
if (ushort.TryParse(res.BatchingLoc, out ushort loc))
{

//在此处处理网络订单(订单本地化)
if (loc >= 1 && loc <= 5)
{
if (mORKS.RBTakeNoodleTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
@@ -810,6 +812,10 @@ namespace BPASmartClient.MorkSUpgradedVer
}
else
{
if (mORKS.CurrentFeedbackLoc == 5)
{
TurntableStart((ushort)1);
}
TurntableStart((ushort)(mORKS.CurrentFeedbackLoc + 1));
}


+ 1
- 1
BPASmartClient/Control/FoodMenuView.xaml View File

@@ -35,7 +35,7 @@
<Border Background="#23282E" BorderThickness="0">
<StackPanel Orientation="Vertical" VerticalAlignment="Top">
<RadioButton IsChecked="True" Click="RadioButton_Click" Style="{StaticResource toggle}" GroupName="or" Width="180" Height="60" FontSize="30" Content="正在制作" Foreground="White"/>
<RadioButton IsChecked="False" Click="RadioButton_Click" Style="{StaticResource toggle}" GroupName="or" Width="180" Height="60" FontSize="30" Content="当前订单" Foreground="White"/>
<RadioButton IsChecked="False" Click="RadioButton_Click" Style="{StaticResource toggle}" GroupName="or" Width="180" Height="60" FontSize="30" Content="完成订单" Foreground="White"/>
<RadioButton IsChecked="False" Click="RadioButton_Click" Style="{StaticResource toggle}" GroupName="or" Width="180" Height="60" FontSize="30" Content="历史查询" Foreground="White"/>
</StackPanel>
</Border>


+ 1
- 1
BPASmartClient/Control/FoodMenuView.xaml.cs View File

@@ -43,7 +43,7 @@ namespace BPASmartClient.Control
historyGrid.Visibility = Visibility.Collapsed;
title.Text = "制作订单列表";
}
else if (rb.Content.ToString() == "当前订单")
else if (rb.Content.ToString() == "完成订单")
{
makeGrid.Visibility = Visibility.Collapsed;
takeGrid.Visibility = Visibility.Visible;


Loading…
Cancel
Save