From 1e8d0aee3dc476bdee863019726d41ae15bc69de Mon Sep 17 00:00:00 2001
From: NXX <447201003@qq>
Date: Wed, 11 Jan 2023 09:35:02 +0800
Subject: [PATCH 01/96] =?UTF-8?q?=E5=B0=8F=E7=82=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkF/Control_MorkF.cs         | 138 ++++++++++++++----
 BPASmartClient.MorkF/ML_MorkF.cs              |   9 ++
 BPASmartClient.MorkF/View/LocalMenu.xaml      |  76 +++++-----
 .../View/MaterialCalibration.xaml             | 103 +++++++++----
 .../ViewModel/MaterialCalibrationViewModel.cs |  91 ++++++++----
 BPASmartClient/MainWindow.xaml.cs             |   1 +
 6 files changed, 300 insertions(+), 118 deletions(-)

diff --git a/BPASmartClient.MorkF/Control_MorkF.cs b/BPASmartClient.MorkF/Control_MorkF.cs
index 2d687cdf..cf742f12 100644
--- a/BPASmartClient.MorkF/Control_MorkF.cs
+++ b/BPASmartClient.MorkF/Control_MorkF.cs
@@ -35,7 +35,7 @@ namespace BPASmartClient.MorkF
         /// <summary>
         /// 菜品库while循环最大sleep次数
         /// </summary>
-        private const int materialSleepCount = 900;
+        private const int materialSleepCount = 600;
 
         /// <summary>
         /// 菜品库while循环每次sleep时间
@@ -61,7 +61,7 @@ namespace BPASmartClient.MorkF
         /// <summary>
         /// 菜品盒坐标系高度
         /// </summary>
-        private const int materialBoxHeight = 9500;
+        private const int materialBoxHeight = 9700;
 
         //传感器1到菜品库的高度（厘米）
         private const int materialLaserHighCM_1 = 22;
@@ -346,7 +346,15 @@ namespace BPASmartClient.MorkF
                     ml_morkf.PawArrivePortThree = bools[2];
                 }
             }), 2);
-
+            //获取爪子伸出退回到位
+            GetStatus("M10.6", new Action<object>((objects) =>
+            {
+                if (objects is bool[] bools && bools.Length == 2)
+                {
+                    ml_morkf.PawOutComplete = bools[0];
+                    ml_morkf.PawInComplete = bools[1];
+                }
+            }), 2);
             //获取总初始化完成
             GetStatus("M10.2", new Action<object>((objects) =>
             {
@@ -478,8 +486,21 @@ namespace BPASmartClient.MorkF
                     GetDistance_3();
                 }), "GetDistance_3");
             }), "GetDistance_3");
-            ActionManage.GetInstance.Register(PawExtend, "PawTurnFront");
-            ActionManage.GetInstance.Register(PawShrink, "PawTurnBack");
+            ActionManage.GetInstance.Register(new Action(() =>
+            {
+                ThreadManage.GetInstance().Start(new Action(() =>
+                {
+                    PawExtend();
+                }), "PawTurnFront");
+            }), "PawTurnFront");
+               
+            ActionManage.GetInstance.Register(new Action(() =>
+                {
+                    ThreadManage.GetInstance().Start(new Action(() =>
+                    {
+                        PawShrink();
+                    }), "PawTurnBack");
+                }), "PawTurnBack");
             ActionManage.GetInstance.Register(new Action<object>((list) =>
             {
                 ThreadManage.GetInstance().Start(new Action(() =>
@@ -968,33 +989,54 @@ namespace BPASmartClient.MorkF
         /// 爪子伸出
         /// </summary>
         /// <param name="o">电磁阀启停：true：启动。false：停止。</param>
-        public void PawExtend()
+        public bool PawExtend()
         {
             if (!ml_morkf.InitialComplete)
             {
                 MessageLog.GetInstance.ShowEx("爪子伸出错误，菜品库未初始化");
-                return;
+                return false;
             }
-
+            Thread.Sleep(500);
             MaterailLibrary_Write("M0.6", true);
-            //等待爪子伸出延时4s
-            Thread.Sleep(6000);
+            for (int i = 0; i < materialSleepCount && !ml_morkf.PawOutComplete; i++)//潘华小炒没有夹爪到位功能
+            {
+                Thread.Sleep(materialSleepTime);
+                if (i >= materialSleepCount - 1)
+                {
+                    MessageLog.GetInstance.ShowEx("爪子伸出超时");
+                    return false;
+                }
+            }
+            return true;
+            ////等待爪子伸出延时4s
+            //Thread.Sleep(6000);
         }
         /// <summary>
         /// 爪子收缩
         /// </summary>
         /// <param name="o">电磁阀启停：true：启动。false：停止。</param>
-        public void PawShrink()
+        public bool PawShrink()
         {
             if (!ml_morkf.InitialComplete)
             {
                 MessageLog.GetInstance.ShowEx("爪子伸出错误，菜品库未初始化");
-                return;
+                return false;
             }
 
             MaterailLibrary_Write("M0.7", true);
+            Thread.Sleep(500);
+            for (int i = 0; i < materialSleepCount && !ml_morkf.PawInComplete; i++)//潘华小炒没有夹爪到位功能
+            {
+                Thread.Sleep(materialSleepTime);
+                if (i >= materialSleepCount - 1)
+                {
+                    MessageLog.GetInstance.ShowEx("爪子伸出超时");
+                    return false;
+                }
+            }
+            return true;
             //等待爪子收缩延时4s
-            Thread.Sleep(6000);
+            //Thread.Sleep(6000);
         }
         /// <summary>
         /// 电磁阀启停
@@ -1033,6 +1075,10 @@ namespace BPASmartClient.MorkF
                 Thread.Sleep(materialSleepTime);
                 if (i >= materialSleepCount - 1)
                 {
+                    if (i == 10)
+                    {
+                        MaterailLibrary_Write("M1.0", true);
+                    }
                     MessageLog.GetInstance.ShowEx("爪子去到1号位超时");
                     return false;
                 }
@@ -1063,6 +1109,10 @@ namespace BPASmartClient.MorkF
                 Thread.Sleep(materialSleepTime);
                 if (i >= materialSleepCount - 1)
                 {
+                    if (i == 10)
+                    {
+                        MaterailLibrary_Write("M1.1", true);
+                    }
                     MessageLog.GetInstance.ShowEx("爪子去到2号位超时");
                     return false;
                 }
@@ -1090,10 +1140,14 @@ namespace BPASmartClient.MorkF
             for (int i = 0; i < materialSleepCount && !ml_morkf.PawArrivePortThree; i++)
             {
                 Thread.Sleep(materialSleepTime);
+                if(i == 30)
+                {
+                    MaterailLibrary_Write("M1.2", true);
+                }
                 if (i >= materialSleepCount - 1)
                 {
                     MessageLog.GetInstance.ShowEx("爪子去到3号位超时");
-                    return false;
+
                 }
             }
             if (!ml_morkf.PawPositon_3)
@@ -1243,6 +1297,12 @@ namespace BPASmartClient.MorkF
                 return false;
             }
 
+            if (x>212000|| y >240000)
+            {
+                MessageLog.GetInstance.ShowEx("机械臂移动超出范围");
+                return false;
+            }
+
             //取反
             x = 0 - Math.Abs(x);
             y = 0 - Math.Abs(y);
@@ -1374,9 +1434,9 @@ namespace BPASmartClient.MorkF
             Thread.Sleep(1000);
 
             //获取传感器的距离，转换成坐标系的点
-            //int laserHigh = ml_morkf.LaserDistance;
+            int laserHigh = ml_morkf.LaserDistance;
 
-            int laserHigh = 400;
+            
             //秦工要求读取后置0
             WriteDistance(0);
 
@@ -1396,7 +1456,7 @@ namespace BPASmartClient.MorkF
             }
 
             //设置到传感器感应的距离处
-            if (!SetArmPosition(x, y))
+            if (!SetArmPosition(x - moveX, y))  
             {
                 return false;
             }
@@ -1414,7 +1474,11 @@ namespace BPASmartClient.MorkF
             }
 
             //伸出爪子
-            PawExtend();
+            if (!PawExtend())
+            {
+                return false;
+            }
+          
 
             //移动前开启电磁阀
             Electromagnetism(new List<bool> { false });
@@ -1467,10 +1531,12 @@ namespace BPASmartClient.MorkF
             //    //收缩爪子
             //    PawShrink();
             //}), "GetMaterialPawShrink");
-            PawShrink();
+
+            //收缩爪子
+            if (!PawShrink()) return false;
 
             //判断炒锅是否可以放盒
-            for (int i = 0; materialSleepCount > i && !morkFs[fryIndex].FryPot1_HOBTPut; i++)
+            for (int i = 0; materialSleepCount > i && !morkFs[fryNum].FryPot1_HOBTPut; i++)
             {
                 Thread.Sleep(materialSleepTime);
                 if (i >= materialSleepCount - 1)
@@ -1520,8 +1586,12 @@ namespace BPASmartClient.MorkF
                 return false;
             }
 
+            
             //伸出爪子
-            PawExtend();
+            if (!PawExtend())
+            {
+                return false;
+            }
 
             Thread.Sleep(300);
 
@@ -1530,7 +1600,7 @@ namespace BPASmartClient.MorkF
             Thread.Sleep(300);
 
             //收缩爪子
-            PawShrink();
+            if (!PawShrink()) return false;
 
             //设置到炒锅i出菜处
             if (!SetArmPosition(x + materialToFryDistance, y))
@@ -1578,10 +1648,13 @@ namespace BPASmartClient.MorkF
                 Electromagnetism(new List<bool> { true });
 
                 //爪子收回
-                PawShrink();
+                if (!PawShrink())
+                {
+                    return false;
+                }
 
                 //爪子去2号点位
-                if(!PawToPoint2()) 
+                if (!PawToPoint2()) 
                 {
                     return false;
                 }
@@ -1670,8 +1743,10 @@ namespace BPASmartClient.MorkF
                 Laser2CoordinateState laser2CoordinateState = LaserDistance2MaterialCount(distance, x, out boxCount);
                 if (laser2CoordinateState == Laser2CoordinateState.MaterialNormal)
                 {
+                    int compensateHeight = boxCount > 1 ? 500 : 0;//补偿高度，超过1层盒子增加补偿
+                    
                     //盒子高度计算除去起始位置的那个盒子
-                    x_high = (boxCount - 1) * materialBoxHeight;
+                    x_high = (boxCount - 1) * materialBoxHeight + compensateHeight;
                 }
                 return laser2CoordinateState;
 
@@ -1722,6 +1797,7 @@ namespace BPASmartClient.MorkF
                 if(heightDifferent < 0)
                 {
                     MessageLog.GetInstance.ShowEx($"菜品库检测{x}处的菜品量时，传感器获取的高度差为负数，请校准该层高度");
+                    return Laser2CoordinateState.MaterialEmpty; ;
                 }
 
                 //盒子高度为45，但是需要考虑到误差，不足35，则认为为空
@@ -2542,7 +2618,7 @@ namespace BPASmartClient.MorkF
 
                                             //更新
                                             morkFs[i].UpdateProcess(potActions);
-
+                                           
                                             switch (potActions.Actions)
                                             {
                                                 case nameof(StirFryPotActionEnum.加热开启):
@@ -2608,6 +2684,16 @@ namespace BPASmartClient.MorkF
                                                     MessageLog.GetInstance.Show(potActions.Actions);
                                                     break;
                                                 case nameof(StirFryPotActionEnum.取原料):
+                                                    if(potActions.SeasoningLists[0].Loc == 1 || 
+                                                    potActions.SeasoningLists[0].Loc == 9 || 
+                                                    potActions.SeasoningLists[0].Loc == 10 || 
+                                                    potActions.SeasoningLists[0].Loc == 18 ||
+                                                    potActions.SeasoningLists[0].Loc == 19 ||
+                                                    potActions.SeasoningLists[0].Loc == 27  )
+                                                    {
+                                                        MessageLog.GetInstance.ShowEx("该取料位置禁止使用");
+                                                        return;
+                                                    }
                                                     //炒锅取菜状态置为未取到
                                                     morkFs[i].GetMaterialComplete = false;
 
diff --git a/BPASmartClient.MorkF/ML_MorkF.cs b/BPASmartClient.MorkF/ML_MorkF.cs
index 993de6c1..4ce879a3 100644
--- a/BPASmartClient.MorkF/ML_MorkF.cs
+++ b/BPASmartClient.MorkF/ML_MorkF.cs
@@ -35,6 +35,15 @@ namespace BPASmartClient.MorkF
         /// </summary>
         public bool InitialComplete { get; set; }
 
+        /// <summary>
+        /// 爪子伸出到位
+        /// </summary>
+        public bool PawOutComplete { get; set; }
+        /// <summary>
+        /// 爪子缩回到位
+        /// </summary>
+        public bool PawInComplete { get; set; }
+
         private bool _ArriveComplete = false;
         /// <summary>
         /// 定位到达，上升沿捕获需要特殊处理
diff --git a/BPASmartClient.MorkF/View/LocalMenu.xaml b/BPASmartClient.MorkF/View/LocalMenu.xaml
index a950c91c..b217bd3d 100644
--- a/BPASmartClient.MorkF/View/LocalMenu.xaml
+++ b/BPASmartClient.MorkF/View/LocalMenu.xaml
@@ -7,50 +7,61 @@
         xmlns:local="clr-namespace:BPASmartClient.MorkF.View"
         xmlns:vm="clr-namespace:BPASmartClient.MorkF.ViewModel"
         mc:Ignorable="d"
-        Title="LocalMenu" Height="800" Width="800" WindowStartupLocation="CenterScreen" WindowStyle="None" AllowsTransparency="True" MouseLeftButtonDown="Window_MouseLeftButtonDown">
+        Title="LocalMenu" Height="800" Width="800" WindowStartupLocation="CenterScreen" WindowStyle="None" AllowsTransparency="True" MouseLeftButtonDown="Window_MouseLeftButtonDown" Background="Gray"
+        >
     <Window.DataContext>
         <vm:LocalMenuViewModel/>
     </Window.DataContext>
     <Window.Resources>
-        <Style TargetType="ListBoxItem" >
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                        <Border  BorderBrush="Black" BorderThickness="0" Background="White">
-                            <Grid Width="600" HorizontalAlignment="Center" VerticalAlignment="Center" >
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition Width="2*"/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-                                <TextBox Grid.Column="0" Text="{Binding FryTime}" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                <TextBox Grid.Column="1" Text="{Binding During}" Margin="10,0"/>
-                                <ComboBox Grid.Column="2" Width="120" ItemsSource="{Binding DataContext.strPotActions , RelativeSource={RelativeSource AncestorType=Window,Mode=FindAncestor}}"
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+            <Style TargetType="ListBoxItem" >
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                            <Border  BorderBrush="Black" BorderThickness="0" Background="Transparent">
+                                <Grid Width="600" HorizontalAlignment="Center" VerticalAlignment="Center" >
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition/>
+                                        <ColumnDefinition/>
+                                        <ColumnDefinition Width="2*"/>
+                                        <ColumnDefinition/>
+                                        <ColumnDefinition/>
+                                        <ColumnDefinition/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBox Grid.Column="0" Text="{Binding FryTime}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <TextBox Grid.Column="1" Text="{Binding During}" Margin="10,0"/>
+                                    <ComboBox Grid.Column="2" Width="120" ItemsSource="{Binding DataContext.strPotActions , RelativeSource={RelativeSource AncestorType=Window,Mode=FindAncestor}}"
                                       SelectedValue="{Binding Actions}" Margin="10,0"/>
-                                <TextBox Grid.Column="3" Text="{Binding SeasoningLists[0].Loc}" Margin="10,0"/>
-                                <TextBox Grid.Column="4" Text="{Binding SeasoningLists[0].Qty}" Margin="10,0"/>
-                                <Button Grid.Column="5" Content="删除" Margin="10,0" HorizontalAlignment="Center"
+                                    <TextBox Grid.Column="3" Text="{Binding SeasoningLists[0].Loc}" Margin="10,0"/>
+                                    <TextBox Grid.Column="4" Text="{Binding SeasoningLists[0].Qty}" Margin="10,0"/>
+                                    <Button Grid.Column="5" Content="删除" Margin="10,0" HorizontalAlignment="Center"
                                     Command="{Binding DataContext.Delete, RelativeSource={RelativeSource AncestorType=Window,Mode=FindAncestor}}"
                                     CommandParameter="{Binding DataContext, RelativeSource={RelativeSource AncestorType=ListBoxItem,Mode=FindAncestor}}"/>
-                            </Grid>
-                        </Border>
-                       
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
+                                </Grid>
+                            </Border>
+
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+        </ResourceDictionary>
+        
     </Window.Resources>
-    <Grid>
+    <Grid >
+        <Grid.Background>
+            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/内部背景.png"/>
+        </Grid.Background>
         <Grid.RowDefinitions>
-            <RowDefinition Height="50"/>
+            <RowDefinition Height="80"/>
             <RowDefinition Height="50"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <ComboBox Name="Materials" SelectionChanged="Materials_SelectionChanged" ItemsSource="{Binding MaterialNames}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        <StackPanel Margin="10,20,10,0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <ComboBox Name="Materials" Width="100" Height="40" SelectionChanged="Materials_SelectionChanged"  ItemsSource="{Binding MaterialNames}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
             <TextBox Text="{Binding MaterialName}"  Width="80" Height="40" Margin="10,0"/>
             <Button Content="增加菜谱" Command="{Binding AddMaterial}" Width="80" Height="40" Margin="10,0"/>
             <Button Content="下单" Command="{Binding NewStartLocalMaterial}" Width="80" Height="40" Margin="10,0"/>
@@ -79,7 +90,6 @@
         </Grid>
         <ListBox x:Name="listview1" Grid.Row="2"  BorderBrush="Black" BorderThickness="0" HorizontalAlignment="Center"  AllowDrop="True"
                   ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding PotActionStep}" Margin=" 10" Background="Transparent"
-                 
                  >
             
         </ListBox>
diff --git a/BPASmartClient.MorkF/View/MaterialCalibration.xaml b/BPASmartClient.MorkF/View/MaterialCalibration.xaml
index 2cf13469..0212c0f6 100644
--- a/BPASmartClient.MorkF/View/MaterialCalibration.xaml
+++ b/BPASmartClient.MorkF/View/MaterialCalibration.xaml
@@ -82,6 +82,10 @@
     <Grid>
         <ScrollViewer>
             <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="0.4*"/>
+                </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition></RowDefinition>
                     <RowDefinition></RowDefinition>
@@ -627,7 +631,7 @@
                                     <TextBlock Text="x轴：" Margin="10,0"/>
                                     <TextBox Grid.Column="1" Text="{Binding TwentySixX}" Width="100"/>
                                     <TextBlock Grid.Column="2" Text="Y轴：" Margin="10,0"/>
-                                    <TextBox Grid.Column="3" Text="{Binding SeventeenY}" Width="100"/>
+                                    <TextBox Grid.Column="3" Text="{Binding TwentySixY}" Width="100"/>
                                 </Grid>
                             </Grid>
                             <Grid>
@@ -657,6 +661,8 @@
                         <Grid.RowDefinitions>
                             <RowDefinition Height="*"/>
                             <RowDefinition Height="*"/>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="*"/>
                         </Grid.RowDefinitions>
                         <WrapPanel>
                             <Grid>
@@ -725,6 +731,7 @@
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="1*"/>
                                     <RowDefinition Height="1*"/>
+                                   
                                 </Grid.RowDefinitions>
                                 <RadioButton Content="第二层菜品库出菜位置" Margin="5,0"  IsEnabled="True" IsChecked="{Binding PositionMaterialTwo}" GroupName="MaterialPosition" HorizontalAlignment="Center"/>
                                 <Grid Grid.Row="1">
@@ -740,6 +747,7 @@
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="1*"/>
                                     <RowDefinition Height="1*"/>
+                                   
                                 </Grid.RowDefinitions>
                                 <RadioButton Content="第三层菜品库出菜位置" Margin="5,0"  IsEnabled="True" IsChecked="{Binding PositionMaterialThree}" GroupName="MaterialPosition" HorizontalAlignment="Center"/>
                                 <Grid Grid.Row="1">
@@ -749,56 +757,91 @@
                                         <TextBlock Grid.Column="2" Text="Y轴：" Margin="10,0"/>
                                         <TextBox Grid.Column="3" Text="0" IsEnabled="False" Width="100"/>
                                     </WrapPanel>
+                                    
                                 </Grid>
                             </Grid>
+
+                        </WrapPanel>
+                        <WrapPanel Grid.Row="2" Margin="10,10">
+                            <Button Content="感应器1标准位置" Margin="10,0,10,0" Command="{Binding GetDistance_1}" Cursor="Hand"/>
+                            <TextBox Grid.Column="1" Text="{Binding Distance_1}"  Margin="10,0,10,0" Width="100"/>
+                            <Button Content="感应器2标准位置" Margin="10,0,10,0"  Command="{Binding GetDistance_2}"/>
+                            <TextBox Grid.Column="1" Text="{Binding Distance_2}"  Margin="10,0,10,0" Width="100"/>
+                            <Button Content="感应器3标准位置" Margin="10,0,10,0" Command="{Binding GetDistance_3}"/>
+                            <TextBox Grid.Column="1" Text="{Binding Distance_3}"  Margin="10,0,10,0" Width="100"/>
+                        </WrapPanel>
+                        <WrapPanel Grid.Row="3">
+                            <Button Content="全部位置保存" Margin="10,0,50,0" Height="40" Command="{Binding SaveCoordinate}" Cursor="Hand"/>
+                            <Button Content="全部位置读取" Height="40" Command="{Binding ReadCoordinate}"/>
                         </WrapPanel>
                     </Grid>
                 </GroupBox>
-                <GroupBox Grid.Row="4" Header="操作" FontSize="15" Foreground="Aqua" VerticalAlignment="Center" >
-                    <Grid >
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="1*"/>
-                            <RowDefinition Height="1*"/>
-                            <RowDefinition Height="1*"/>
-                            <RowDefinition Height="1*"/>
-                        </Grid.RowDefinitions>
-                        <WrapPanel>
+                <GroupBox Grid.Row="0" Grid.RowSpan="3" Grid.Column="1" Header="操作" FontSize="15" Foreground="Aqua" VerticalAlignment="Center" >
+                    <StackPanel >
+                        <WrapPanel Margin="10,10">
                             <Button Content="菜品库初始化"  Margin="10,0,5,0" Command="{Binding FoodLibInit}"/>
+                           
+                           
+                           
+                        </WrapPanel>
+                        <WrapPanel Grid.Row="1" Margin="10,10">
                             <Button Content="电磁阀启动"  Margin="10,0,5,0" Command="{Binding StartElectromagnetism}"/>
                             <Button Content="电磁阀停止"  Margin="10,0,5,0" Command="{Binding StopElectromagnetism}"/>
-                            <Button  Content="夹爪伸出" Command="{Binding PawTurnFront}" Margin="5,0" Cursor="Hand"/>
-                            <Button  Content="夹爪收缩" Command="{Binding PawTurnBack}" Margin="5,0" Cursor="Hand"/>
+                        </WrapPanel>
+                        <WrapPanel Grid.Row="2" Margin="10,10">
+                            <Button  Content="夹爪伸出" Command="{Binding PawTurnFront}"  Margin="10,0,5,0"  Cursor="Hand"/>
+                            <Button  Content="夹爪收缩" Command="{Binding PawTurnBack}"  Margin="10,0,5,0"  Cursor="Hand"/>
+                        </WrapPanel>
+                        <WrapPanel Grid.Row="3" Margin="10,10">
+                            <TextBlock Text="夹爪位置:" Margin="10,0,5,0" />
                             <RadioButton Content="位置1" Margin="5,0"  IsEnabled="True" IsChecked="{Binding PawPositon1}" Command="{Binding PawToPoint1}" GroupName="PawTurn"/>
                             <RadioButton Content="位置2" Margin="5,0" IsEnabled="True" IsChecked="{Binding PawPositon2}"  Command="{Binding PawToPoint2}" GroupName="PawTurn"/>
                             <RadioButton Content="位置3" Margin="5,0 " IsEnabled="True" IsChecked="{Binding PawPositon3}" Command="{Binding PawToPoint3}" GroupName="PawTurn"/>
                         </WrapPanel>
-                        <WrapPanel Grid.Row="1">
-                            <Button Content="感应器1测距" Margin="5,0" Command="{Binding GetDistance_1}" Cursor="Hand"/>
-                            <TextBox Grid.Column="1" Text="{Binding Distance_1}" Width="100"/>
-                            <Button Content="感应器2测距" Margin="5,0" Command="{Binding GetDistance_2}"/>
-                            <TextBox Grid.Column="1" Text="{Binding Distance_2}" Width="100"/>
-                            <Button Content="感应器3测距" Margin="5,0" Command="{Binding GetDistance_3}"/>
-                            <TextBox Grid.Column="1" Text="{Binding Distance_3}" Width="100"/>
-                        </WrapPanel>
-                        <WrapPanel Grid.Row="2">
-                            <TextBlock Text="移动系数："></TextBlock>
+                     
+                        <WrapPanel Grid.Row="4" Margin="10,10">
+                            <TextBlock Text="移动系数："  Margin="10,0,0,0"></TextBlock>
                             <TextBox
-                 Style="{DynamicResource UserTextBoxStyle}"
-                 Foreground="#a2c2e8" Text="{Binding Str}"/>
-                            <TextBlock Text="移动方式：" Margin="50,0,0,0"></TextBlock>
+                            Style="{DynamicResource UserTextBoxStyle}"
+                                Foreground="#a2c2e8" Text="{Binding Str}"/>
+                            
+                           
+                        </WrapPanel>
+                        <WrapPanel Grid.Row="5"   Margin="10,10">
+                            <TextBlock Text="移动方式：" Margin="10,0,0,0"></TextBlock>
                             <RadioButton Content="上" Margin="5,0" IsChecked="{Binding Up}" GroupName="ArmRun"/>
                             <RadioButton Content="下" Margin="5,0" IsChecked="{Binding Down}" GroupName="ArmRun"/>
                             <RadioButton Content="左" Margin="5,0 " IsChecked="{Binding Left}" GroupName="ArmRun"/>
                             <RadioButton Content="右" Margin="5,0 " IsChecked="{Binding Right}" GroupName="ArmRun"/>
                             <RadioButton Content="定点" Margin="5,0 " IsChecked="{Binding Point}" GroupName="ArmRun"/>
                             <Button Content="移动" Command="{Binding SetNowPosition}"/>
+
                         </WrapPanel>
-                        <WrapPanel Grid.Row="3" Cursor="">
-                            <Button Content="自动计算" Margin="20,0,50,0" Command="{Binding AutoCalculation}"/>
-                            <Button Content="保存" Margin="20,0,50,0" Command="{Binding SaveCoordinate}"/>
-                            <Button Content="读取" Command="{Binding ReadCoordinate}"/>
+                        <WrapPanel Grid.Row="6"  Margin="10,10">
+                            <Button Content="自动计算" Margin="10,0,50,0" Command="{Binding AutoCalculation}"/>
+
+                        </WrapPanel >
+                        <WrapPanel Grid.Row="7"  Margin="10,10">
+                            <TextBlock Text="取料手臂设定位置" Margin="10,0,10,10"/>
+                            <TextBlock Text="X:" Margin="5,0"/>
+                            <TextBox Text="{Binding SettingX}" Width="70" Margin="5,0"  VerticalAlignment="Center" />
+                            <TextBlock Text="Y:" Margin="5,0"/>
+                            <TextBox Text="{Binding SettingY}" Width="70" Margin="5,0"  VerticalAlignment="Center"  />
+                            <Button Content="移动" Command="{Binding SetArmPosition}" Margin="5,0,10,0" Cursor="Hand"/>
+                            <TextBlock Text="移动速度:" Margin="5,0"/>
+                            <TextBox Text="{Binding MoveSpeed}" Width="70" Margin="5,0"  VerticalAlignment="Center"  />
+                            <Button Content="设定" Command="{Binding SetSpeed}" Cursor="Hand"   Margin="5,0,10,0" />
+                            
                         </WrapPanel>
-                    </Grid>
+                        <!--<WrapPanel Margin="10">
+                            <Button Content="感应器1测距" Margin="5,0" Command="{Binding GetTestDistance_1}" Cursor="Hand"/>
+                            <TextBox Text="{Binding SensingDistance_1}" Margin="5,0" Width="60" IsReadOnly="True"/>
+                            <Button Content="感应器2测距" Margin="5,0" Command="{Binding GetTestDistance_2}"/>
+                            <TextBox Text="{Binding SensingDistance_2}" Margin="5,0" Width="60" IsReadOnly="True"/>
+                            <Button Content="感应器3测距" Margin="5,0" Command="{Binding GetTestDistance_3}"/>
+                            <TextBox Text="{Binding SensingDistance_3}" Margin="5,0" Width="60" IsReadOnly="True"/>
+                        </WrapPanel>-->
+                    </StackPanel>
                 </GroupBox>
             </Grid>
         </ScrollViewer>
diff --git a/BPASmartClient.MorkF/ViewModel/MaterialCalibrationViewModel.cs b/BPASmartClient.MorkF/ViewModel/MaterialCalibrationViewModel.cs
index 49fe6251..ab0449ea 100644
--- a/BPASmartClient.MorkF/ViewModel/MaterialCalibrationViewModel.cs
+++ b/BPASmartClient.MorkF/ViewModel/MaterialCalibrationViewModel.cs
@@ -280,6 +280,30 @@ namespace BPASmartClient.MorkF.ViewModel
         private int _Distance_2;
         public int Distance_3 { get { return _Distance_3; } set { _Distance_3 = value; OnPropertyChanged(); } }
         private int _Distance_3;
+        #endregion
+
+        #region 控制
+        public int SettingX { get { return _settingX; } set { _settingX = value; OnPropertyChanged(); } }
+        private int _settingX = 0;
+        public int SettingY { get { return _settingY; } set { _settingY = value; OnPropertyChanged(); } }
+        private int _settingY = 0;
+        public int MoveSpeed { get { return _moveSpeed; } set { _moveSpeed = value; OnPropertyChanged(); } }
+        private int _moveSpeed;
+
+        public int SensingDistance_1 { get { return _sensingDistance_1; } set { _sensingDistance_1 = value; OnPropertyChanged(); } }
+        private int _sensingDistance_1;
+        public int SensingDistance_2 { get { return _sensingDistance_2; } set { _sensingDistance_2 = value; OnPropertyChanged(); } }
+        private int _sensingDistance_2;
+        public int SensingDistance_3 { get { return _sensingDistance_3; } set { _sensingDistance_3 = value; OnPropertyChanged(); } }
+        private int _sensingDistance_3;
+
+        public RelayCommand SetSpeed { get; set; }//速度设定
+        public RelayCommand SetArmPosition { get; set; }//机器臂位置设定
+
+        public RelayCommand GetTestDistance_1 { get; set; }//获取感应器距离1
+        public RelayCommand GetTestDistance_2 { get; set; }//获取感应器距离2
+        public RelayCommand GetTestDistance_3 { get; set; }//获取感应器距离3
+
         #endregion
         public bool Up { get { return _Up; } set { _Up = value; OnPropertyChanged(); } }
         private bool _Up;
@@ -355,9 +379,9 @@ namespace BPASmartClient.MorkF.ViewModel
         public RelayCommand StopElectromagnetism { get; set; }
         public RelayCommand PawTurnFront { get; set; }//夹爪正转
         public RelayCommand PawTurnBack { get; set; }//夹爪反转
-        public RelayCommand PawToPoint1 { get; set; }//感应测距1
-        public RelayCommand PawToPoint2 { get; set; }//感应测距2
-        public RelayCommand PawToPoint3 { get; set; }//感应测距3
+        public RelayCommand PawToPoint1 { get; set; }//夹爪位置1
+        public RelayCommand PawToPoint2 { get; set; }//夹爪位置2
+        public RelayCommand PawToPoint3 { get; set; }//夹爪位置3
         public RelayCommand GetDistance_1 { get; set; }//感应测距1
         public RelayCommand GetDistance_2 { get; set; }//感应测距2
         public RelayCommand GetDistance_3 { get; set; }//感应测距3
@@ -844,10 +868,10 @@ namespace BPASmartClient.MorkF.ViewModel
                 return;
             }
 
-            if (PositionOne)
-            {
-                ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> {"1", OneX + OperationX, OneY + OperationY });//设定机械臂当前位置
-            }
+            //if (PositionOne)
+            //{
+            //    ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> {"1", OneX + OperationX, OneY + OperationY });//设定机械臂当前位置
+            //}
             if (PositionTwo)
             {
                 ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "2", TwoX + OperationX, TwoY + OperationY });//设定机械臂当前位置
@@ -876,14 +900,14 @@ namespace BPASmartClient.MorkF.ViewModel
             {
                 ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "8", EightX + OperationX, EightY + OperationY });//设定机械臂当前位置
             }
-            if (PositionNine)
-            {
-                ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "9", NineX + OperationX, NineY + OperationY });//设定机械臂当前位置
-            }
-            if (PositionTen)
-            {
-                ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "10", TenX + OperationX, TenY + OperationY });//设定机械臂当前位置
-            }
+            //if (PositionNine)
+            //{
+            //    ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "9", NineX + OperationX, NineY + OperationY });//设定机械臂当前位置
+            //}
+            //if (PositionTen)
+            //{
+            //    ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "10", TenX + OperationX, TenY + OperationY });//设定机械臂当前位置
+            //}
             if (PositionEleven)
             {
                 ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "11", ElevenX + OperationX, ElevenY + OperationY });//设定机械臂当前位置
@@ -912,14 +936,14 @@ namespace BPASmartClient.MorkF.ViewModel
             {
                 ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "17", SeventeenX + OperationX, SeventeenY + OperationY });//设定机械臂当前位置
             }
-            if (PositionEighteen)
-            {
-                ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "18", EighteenX + OperationX, EighteenY + OperationY });//设定机械臂当前位置
-            }
-            if (PositionNineteen)
-            {
-                ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "19", NineteenX + OperationX, NineteenY + OperationY });//设定机械臂当前位置
-            }
+            //if (PositionEighteen)
+            //{
+            //    ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "18", EighteenX + OperationX, EighteenY + OperationY });//设定机械臂当前位置
+            //}
+            //if (PositionNineteen)
+            //{
+            //    ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "19", NineteenX + OperationX, NineteenY + OperationY });//设定机械臂当前位置
+            //}
             if (PositionTwenty)
             {
                 ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "20", TwentyX + OperationX, TwentyY + OperationY });//设定机械臂当前位置
@@ -948,10 +972,10 @@ namespace BPASmartClient.MorkF.ViewModel
             {
                 ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "26", TwentySixX + OperationX, TwentySixY + OperationY });//设定机械臂当前位置
             }
-            if (PositionTwentySeven)
-            {
-                ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "27", TwentySevenX + OperationX, TwentySevenY + OperationY });//设定机械臂当前位置
-            }
+            //if (PositionTwentySeven)
+            //{
+            //    ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "27", TwentySevenX + OperationX, TwentySevenY + OperationY });//设定机械臂当前位置
+            //}
             if (PositionMaterialHeight)
             {
                 ActionManage.GetInstance.Send("CalibrationCoordination", new List<object> { "MaterialHeight", MaterialHeightX + OperationX, MaterialHeightY + OperationY });//设定机械臂当前位置
@@ -987,12 +1011,21 @@ namespace BPASmartClient.MorkF.ViewModel
             PawToPoint1 = new RelayCommand(() => { ActionManage.GetInstance.Send("PawToPoint1"); });//爪子去1号位
             PawToPoint2 = new RelayCommand(() => { ActionManage.GetInstance.Send("PawToPoint2"); });//爪子去2号位
             PawToPoint3 = new RelayCommand(() => { ActionManage.GetInstance.Send("PawToPoint3"); });//爪子去3号位
-            PawTurnFront = new RelayCommand(() => { ActionManage.GetInstance.Send("PawTurnFront"); });//夹爪正转
-            PawTurnBack = new RelayCommand(() => { ActionManage.GetInstance.Send("PawTurnBack"); });//夹爪反转
+            PawTurnFront = new RelayCommand(() => { 
+                ActionManage.GetInstance.Send("PawTurnFront");
+            });//夹爪伸出
+            PawTurnBack = new RelayCommand(() => { 
+                ActionManage.GetInstance.Send("PawTurnBack");
+            });//夹爪收缩
             GetDistance_1 = new RelayCommand(() => { ActionManage.GetInstance.Send("GetDistance_1"); });//感应距离1
             GetDistance_2 = new RelayCommand(() => { ActionManage.GetInstance.Send("GetDistance_2"); });//感应距离2
             GetDistance_3 = new RelayCommand(() => { ActionManage.GetInstance.Send("GetDistance_3"); });//感应距离3
 
+            SetSpeed = new RelayCommand(() => { ActionManage.GetInstance.Send("SetSpeed", new List<int> { MoveSpeed }); });//速度设定
+            SetArmPosition = new RelayCommand(() => { 
+                ActionManage.GetInstance.Send("SetArmPosition", new List<int> { SettingX, SettingY });
+            });//设定移动位置
+
             PhysicalMaterialCoordinate();
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
diff --git a/BPASmartClient/MainWindow.xaml.cs b/BPASmartClient/MainWindow.xaml.cs
index f9bd5683..88a9d024 100644
--- a/BPASmartClient/MainWindow.xaml.cs
+++ b/BPASmartClient/MainWindow.xaml.cs
@@ -66,6 +66,7 @@ namespace BPASmartClient
                 if(res == MessageBoxResult.OK)
                 {
                     this.Close();
+                    Application.Current.Shutdown();
                 }
                 
             };

From edef6d6bedf137ee4270fe360fd865f1bb4178c0 Mon Sep 17 00:00:00 2001
From: NXX <447201003@qq>
Date: Thu, 12 Jan 2023 11:26:02 +0800
Subject: [PATCH 02/96] =?UTF-8?q?=E5=B0=8F=E7=82=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.Model/GlobalFoodMenu.cs        |  14 --
 .../小炒机/MaterialAndFryingTime.cs        |  15 +++
 .../BPASmartClient.MorkBF.csproj              |   1 +
 BPASmartClient.MorkBF/Control_MorkBF.cs       |  25 ++--
 .../BPASmartClient.MorkF.csproj               |   1 +
 BPASmartClient.MorkF/Control_MorkF.cs         | 123 +++++++++---------
 BPASmartClient.MorkF/View/DebugView.xaml      |  12 +-
 BPASmartClient.MorkF/View/LocalMenu.xaml      |  22 ++--
 BPASmartClient.MorkF/View/LocalMenu.xaml.cs   |   2 +-
 .../ViewModel/DebugViewModel.cs               |   3 +-
 .../ViewModel/LocalMenuViewModel.cs           |  77 ++++++-----
 BPASmartClient.ViewModel/FoodMenuViewModel.cs |  11 +-
 BPASmartClient/Control/FoodMenuView.xaml      |  10 +-
 BPASmartClient/Control/FoodMenuView.xaml.cs   |   4 +-
 14 files changed, 174 insertions(+), 146 deletions(-)
 delete mode 100644 BPASmartClient.Model/GlobalFoodMenu.cs
 create mode 100644 BPASmartClient.Model/小炒机/MaterialAndFryingTime.cs

diff --git a/BPASmartClient.Model/GlobalFoodMenu.cs b/BPASmartClient.Model/GlobalFoodMenu.cs
deleted file mode 100644
index 73bdd544..00000000
--- a/BPASmartClient.Model/GlobalFoodMenu.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BPASmartClient.Model
-{
-    public class GlobalFoodMenu
-    {
-        public static ObservableCollection<FoodMenuModel> LocalFoodMenus = new ObservableCollection<FoodMenuModel>(); 
-    }
-}
diff --git a/BPASmartClient.Model/小炒机/MaterialAndFryingTime.cs b/BPASmartClient.Model/小炒机/MaterialAndFryingTime.cs
new file mode 100644
index 00000000..dba43182
--- /dev/null
+++ b/BPASmartClient.Model/小炒机/MaterialAndFryingTime.cs
@@ -0,0 +1,15 @@
+using BPA.Models;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.Model.小炒机
+{
+    public class MaterialAndFryingTime
+    {
+        public Dictionary<string, ObservableCollection<PotActions>> materials { get; set; } = new Dictionary<string, ObservableCollection<PotActions>>();
+    }
+}
diff --git a/BPASmartClient.MorkBF/BPASmartClient.MorkBF.csproj b/BPASmartClient.MorkBF/BPASmartClient.MorkBF.csproj
index 14337820..163b8885 100644
--- a/BPASmartClient.MorkBF/BPASmartClient.MorkBF.csproj
+++ b/BPASmartClient.MorkBF/BPASmartClient.MorkBF.csproj
@@ -13,6 +13,7 @@
   <ItemGroup>
     <ProjectReference Include="..\BPASmartClient.Business\BPASmartClient.Business.csproj" />
     <ProjectReference Include="..\BPASmartClient.Device\BPASmartClient.Device.csproj" />
+    <ProjectReference Include="..\BPASmartClient.ViewModel\BPASmartClient.ViewModel.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BPASmartClient.MorkBF/Control_MorkBF.cs b/BPASmartClient.MorkBF/Control_MorkBF.cs
index 3f586713..0bd4ab2f 100644
--- a/BPASmartClient.MorkBF/Control_MorkBF.cs
+++ b/BPASmartClient.MorkBF/Control_MorkBF.cs
@@ -9,6 +9,7 @@ using BPASmartClient.Model;
 using BPASmartClient.Model.大炒;
 using BPASmartClient.MorkBF.Model;
 using BPASmartClient.MorkBF.ViewModel;
+using BPASmartClient.ViewModel;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -34,18 +35,18 @@ namespace BPASmartClient.MorkBF
             IsHealth = true;
             BPASmartClient.Helper.Json<LocalFryPotMessage>.Read();
             MonitorViewModel.DeviceId = DeviceId;
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                GlobalFoodMenu.LocalFoodMenus.Clear();
-                if(BPASmartClient.Helper.Json<LocalFryPotMessage>.Data.FryPotMessage.Count>0)
-                {
-                    foreach (var item in BPASmartClient.Helper.Json<LocalFryPotMessage>.Data.FryPotMessage)
-                    {
-                        GlobalFoodMenu.LocalFoodMenus.Add(new FoodMenuModel { GoodKey = item.GoodKey, GoodName = item.GoodName });
-                    }
-                }
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    FoodMenuViewModel.GetInstance().FoodMenus.Clear();
+            //    if(BPASmartClient.Helper.Json<LocalFryPotMessage>.Data.FryPotMessage.Count>0)
+            //    {
+            //        foreach (var item in BPASmartClient.Helper.Json<LocalFryPotMessage>.Data.FryPotMessage)
+            //        {
+            //            FoodMenuViewModel.GetInstance().FoodMenus.Add(new FoodMenuModel { GoodKey = item.GoodKey, GoodName = item.GoodName });
+            //        }
+            //    }
                 
-            }), "更新菜单");
+            //}), "更新菜单");
             CommandRegist();//调试
             ServerInit();
             DataParse();//数据解析
@@ -927,7 +928,7 @@ namespace BPASmartClient.MorkBF
                     WorkStatus_1 = morkBF.FirePot1_Temperature > 0 ? WorkStatus.工作 : WorkStatus.待机,
                     WorkStatus_2 = morkBF.FirePot2_Temperature > 0 ? WorkStatus.工作 : WorkStatus.待机,
                     RobotStatu =  WorkStatus.工作,
-                    Alarm = new List<AlarmModel>(),
+                    Alarm = new List<BPA.Message.AlarmModel>(),
                     FailuresCount = 0,
                     StatsCount = statsModels,
                     MaxWok_Dishes_1 = "满汉全席",
diff --git a/BPASmartClient.MorkF/BPASmartClient.MorkF.csproj b/BPASmartClient.MorkF/BPASmartClient.MorkF.csproj
index e7ac07e7..5b3cc3dc 100644
--- a/BPASmartClient.MorkF/BPASmartClient.MorkF.csproj
+++ b/BPASmartClient.MorkF/BPASmartClient.MorkF.csproj
@@ -18,6 +18,7 @@
     <ProjectReference Include="..\BPASmartClient.Device\BPASmartClient.Device.csproj" />
     <ProjectReference Include="..\BPASmartClient.Modbus\BPASmartClient.Modbus.csproj" />
     <ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" />
+    <ProjectReference Include="..\BPASmartClient.ViewModel\BPASmartClient.ViewModel.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/BPASmartClient.MorkF/Control_MorkF.cs b/BPASmartClient.MorkF/Control_MorkF.cs
index cf742f12..0d1ee202 100644
--- a/BPASmartClient.MorkF/Control_MorkF.cs
+++ b/BPASmartClient.MorkF/Control_MorkF.cs
@@ -16,6 +16,8 @@ using System.Windows.Documents;
 using BPASmartClient.Business;
 using Microsoft.CodeAnalysis;
 using BPASmartClient.MorkF.ViewModel;
+using BPASmartClient.ViewModel;
+using System.Windows;
 
 namespace BPASmartClient.MorkF
 {
@@ -50,13 +52,13 @@ namespace BPASmartClient.MorkF
         /// <summary>
         /// 菜品盒下移高度，相对于坐标系
         /// </summary>
-        private const int materialBoxHigh = 4080;
+        //private const int materialBoxHigh = 4080;
 
-        //菜品库出餐高度
-        private const int materialHigh = 33000;
+        ////菜品库出餐高度
+        //private const int materialHigh = 33000;
 
-        //传感器到菜品库的高度（坐标系）
-        private const int materialLaserHigh = 34500;
+        ////传感器到菜品库的高度（坐标系）
+        //private const int materialLaserHigh = 34500;
 
         /// <summary>
         /// 菜品盒坐标系高度
@@ -64,26 +66,26 @@ namespace BPASmartClient.MorkF
         private const int materialBoxHeight = 9700;
 
         //传感器1到菜品库的高度（厘米）
-        private const int materialLaserHighCM_1 = 22;
+        //private const int materialLaserHighCM_1 = 22;
 
-        //传感器2到菜品库的高度（厘米）
-        private const int materialLaserHighCM_2 = 27;
+        ////传感器2到菜品库的高度（厘米）
+        //private const int materialLaserHighCM_2 = 27;
 
-        //传感器3到菜品库的高度（厘米）
-        private const int materialLaserHighCM_3 = 31;
+        ////传感器3到菜品库的高度（厘米）
+        //private const int materialLaserHighCM_3 = 31;
 
         /// <summary>
         /// 传感器到隔板的距离（坐标系）
         /// </summary>
         private const int clapboardLaserHigh = 10000;
 
-        //炒锅1倒菜的xy坐标
-        private const int materialPutPositionXFry1 = 70000;
-        private const int materialPutPositionYFry1 = 40000;
+        ////炒锅1倒菜的xy坐标
+        //private const int materialPutPositionXFry1 = 70000;
+        //private const int materialPutPositionYFry1 = 40000;
 
-        //炒锅2倒菜的xy坐标
-        private const int materialPutPositionXFry2 = 70000;
-        private const int materialPutPositionYFry2 = 40000;
+        ////炒锅2倒菜的xy坐标
+        //private const int materialPutPositionXFry2 = 70000;
+        //private const int materialPutPositionYFry2 = 40000;
 
         //菜品库机械爪放置菜品距离
         private const int materialToFryDistance = 10000;
@@ -146,7 +148,7 @@ namespace BPASmartClient.MorkF
         /// <summary>
         /// 告警列表
         /// </summary>
-        private List<AlarmModel> alarmModel = new List<AlarmModel>();
+        private List<BPA.Message.AlarmModel> alarmModel = new List<BPA.Message.AlarmModel>();
 
         /// <summary>
         /// 
@@ -201,7 +203,7 @@ namespace BPASmartClient.MorkF
                 MaterialCoordinate.GetInstance().frying2 = materialCoordinate.frying2;
                 MaterialCoordinate.GetInstance().materialHeight = materialCoordinate.materialHeight;
                 MaterialCoordinate.GetInstance().MaterialOneX = materialCoordinate.MaterialOneX;
-                    MaterialCoordinate.GetInstance().MaterialTwoX = materialCoordinate.MaterialTwoX;
+                MaterialCoordinate.GetInstance().MaterialTwoX = materialCoordinate.MaterialTwoX;
                 MaterialCoordinate.GetInstance().MaterialThreeX = materialCoordinate.MaterialThreeX;
             }
             ////菜品库编号与坐标系对象存储
@@ -404,7 +406,6 @@ namespace BPASmartClient.MorkF
             ActionManage.GetInstance.Register(PLCInite, "InitCommand");
             ActionManage.GetInstance.Register(StartOrder, "StartOrder");
             ActionManage.GetInstance.Register(StartOrderMain, "开始下单");
-            ActionManage.GetInstance.Register(StartLocalOrder, "StartLocalOrder");
             ActionManage.GetInstance.Register(StopLocalOrder, "StopLocalOrder");
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
@@ -725,7 +726,7 @@ namespace BPASmartClient.MorkF
         }
 
         /// <summary>
-        /// 本地菜单下单
+        /// 根据菜品ID下单
         /// </summary>
         private void StartOrder(object o)
         {
@@ -749,44 +750,42 @@ namespace BPASmartClient.MorkF
         }
 
         /// <summary>
-        /// 本地菜单下单
+        /// 主界面本地菜单下单
         /// </summary>
         private void StartOrderMain(object o)
         {
             if (o == null) return;
-            if (o is string goodId)
+            if (o is FoodMenuModel good)
             {
-                var res = LocalstirFryGoods?.FirstOrDefault(p => p.GoodsKey.ToString() == goodId);//匹配订单对应制作流程
-                if (res != null)
-                {
-                    /* morkF.listStirBom.Add(res.StirFryBomInfo);*///添加订单制作流程
-                    if (StirFryGoodsQuenes.Count > 0) return;
-                    StirFryGoodsQuenes.Enqueue(new OrderLocInfo()
-                    {
-                        SuborderId = Guid.NewGuid().ToString(),
-                        StirPotActions = res.StirPotActions,
-                        GoodName = "本地菜品"
-                    });
-                    MessageLog.GetInstance.Show($"添加本地订单{res.GoodsKey}");
-                }
+                NewStartLocalOrder(good.GoodName);
             }
-        }
 
-        private void StartLocalOrder()
-        {
-            if (StirFryGoodsQuenes.Count > 0) return;//只能一个一个做 
-            if (Json<LocalPotStep>.Data.LocalstirFryGoods.StirPotActions.Count > 0)
-            {
-                StirFryGoodsQuenes.Enqueue(new OrderLocInfo()
-                {
-                    SuborderId = Guid.NewGuid().ToString(),
-                    StirPotActions = Json<LocalPotStep>.Data.LocalstirFryGoods.StirPotActions,
-                    GoodName = "本地菜品"
-                });
-                MessageLog.GetInstance.Show($"添加本地模拟的订单{Json<LocalPotStep>.Data.LocalstirFryGoods.GoodsKey}");
-            }
+                
+            //if (o == null) return;
+            //if (o is string goodId)
+            //{
+            //    var res = LocalstirFryGoods?.FirstOrDefault(p => p.GoodsKey.ToString() == goodId);//匹配订单对应制作流程
+            //    if (res != null)
+            //    {
+            //        /* morkF.listStirBom.Add(res.StirFryBomInfo);*///添加订单制作流程
+            //        if (StirFryGoodsQuenes.Count > 0) return;
+            //        StirFryGoodsQuenes.Enqueue(new OrderLocInfo()
+            //        {
+            //            SuborderId = Guid.NewGuid().ToString(),
+            //            StirPotActions = res.StirPotActions,
+            //            GoodName = "本地菜品"
+            //        });
+            //        MessageLog.GetInstance.Show($"添加本地订单{res.GoodsKey}");
+            //    }
+            //}
         }
 
+        
+
+        /// <summary>
+        /// 本地配置的订单
+        /// </summary>
+        /// <param name="materialName"></param>
         private void NewStartLocalOrder(string materialName)
         {
             //if (StirFryGoodsQuenes.Count > 0) return;//只能一个一个做 
@@ -821,6 +820,7 @@ namespace BPASmartClient.MorkF
                     GoodName = materialName
                 });
                 MessageLog.GetInstance.Show($"添加本地模拟的订单{Json<LocalPotStep>.Data.LocalstirFryGoods.GoodsKey}");
+                MessageBox.Show("下单成功");
             }
         }
 
@@ -1525,7 +1525,7 @@ namespace BPASmartClient.MorkF
                 return false;
             }
 
-            WriteSpeed(50000);
+            WriteSpeed(50000);//移动速度
             //ThreadManage.GetInstance().Start(new Action(() =>
             //{
             //    //收缩爪子
@@ -2292,11 +2292,7 @@ namespace BPASmartClient.MorkF
                                     GoodsKey = item.GoodsKey,
                                     StirPotActions = OrderSort(item.StirPotActions),
                                 });
-                                GlobalFoodMenu.LocalFoodMenus.Add(new FoodMenuModel
-                                {
-                                    GoodKey = item.GoodsKey.ToString(),
-                                    GoodName = "",
-                                });
+                                
                             }
                         }
 
@@ -2433,9 +2429,9 @@ namespace BPASmartClient.MorkF
         /// </summary>
         /// <param name="subid"></param>
         /// <param name="oRDER_STATUS"></param>
-        private void OrderChange(string subid, ORDER_STATUS oRDER_STATUS)
+        private void OrderChange(string Id , string goodName, ORDER_STATUS oRDER_STATUS,int deviceId)
         {
-            EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { Status = oRDER_STATUS, SubOrderId = subid });
+            EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { Status = oRDER_STATUS, GoodName = goodName,DeviceId = deviceId,  SubOrderId =Id });
         }
 
         /// <summary>
@@ -2563,13 +2559,14 @@ namespace BPASmartClient.MorkF
                     if (morkFs[i].AutoMode && morkFs[i].FryPot1_InitialComplete && ml_morkf.InitialComplete &&
                         !morkFs[i].FryWorking)//炒锅在自动状态&&初始化完成&&菜品库初始化&&是否在炒菜中
                     {
-                        Thread.Sleep(5000);
+                        Thread.Sleep(4000);
 
                         lock(lock_MainProcessExcute)
                         {
                             //待炒小炒队列出队列
                             if (StirFryGoodsQuenes.TryDequeue(out var res))
                             {
+                                OrderChange(res.SuborderId, res.GoodName, ORDER_STATUS.WAIT, DeviceId = i);
                                 //设置当前炒制菜品
                                 nowStirFryGood[i] = res;
                                 //炒锅工作状态置为正在工作中
@@ -2595,7 +2592,7 @@ namespace BPASmartClient.MorkF
                                         bool ret = true;
                                         
                                         MessageLog.GetInstance.Show($"炒锅{i}开始炒制菜品{res.GoodName}");
-
+                                        OrderChange(res.SuborderId, res.GoodName, ORDER_STATUS.COOKING, DeviceId = i);
                                         morkFs[i].GoodName = res.GoodName;
 
                                         Coordinate myCoordinate = new Coordinate();
@@ -2764,7 +2761,7 @@ namespace BPASmartClient.MorkF
                                                     ret = OutFood(i, out error, true);
                                                     if(ret == false)
                                                     {
-                                                        alarmModel.Add(new AlarmModel() { AlarmTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = error });
+                                                        alarmModel.Add(new BPA.Message.AlarmModel() { AlarmTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = error });
                                                     }
                                                     break;
                                                 case nameof(StirFryPotActionEnum.炒制菜品):
@@ -2782,7 +2779,7 @@ namespace BPASmartClient.MorkF
                                                     }
                                                     if (ret == false)
                                                     {
-                                                        alarmModel.Add(new AlarmModel() { AlarmTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = error });
+                                                        alarmModel.Add(new BPA.Message.AlarmModel() { AlarmTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = error });
                                                     }
                                                     MessageLog.GetInstance.Show(potActions.Actions);
                                                     break;
@@ -2799,9 +2796,9 @@ namespace BPASmartClient.MorkF
                                         Thread.Sleep(3000);
                                         //回原点位
                                         StirArmGoOrigin(i);
-
+                                        OrderChange(res.SuborderId, res.GoodName, ORDER_STATUS.COMPLETED_COOK, DeviceId = i);
                                         //同时只能允许有一个出餐
-                                        lock(lock_OutMeal)
+                                        lock (lock_OutMeal)
                                         {
                                             //出餐启动
                                             OutMeal(i);
diff --git a/BPASmartClient.MorkF/View/DebugView.xaml b/BPASmartClient.MorkF/View/DebugView.xaml
index 186c5233..e6baed2a 100644
--- a/BPASmartClient.MorkF/View/DebugView.xaml
+++ b/BPASmartClient.MorkF/View/DebugView.xaml
@@ -55,16 +55,16 @@
 
                     <TextBlock Text="菜单编号：" Margin="10,0"/>
                     <TextBox Text="{Binding FoodMenuID}" Width="100"/>
-                    <Button Content="下单" Margin="10,0" Command="{Binding StartOrder}" Cursor="Hand"/>
-                    <Button Content="本地模拟流程配置" Click="Button_Click"/>
-                    <Button Content="本地模拟流程下单"  Margin="10,0" Command="{Binding StartLocalOrder}" Cursor="Hand"/>
+                    <Button Content="菜单编号下单下单" Margin="10,0" Command="{Binding StartOrder}" Cursor="Hand"/>
+                    <Button Content="本地菜单流程配置" Click="Button_Click"/>
+                    
                     <Button Content="停止炒菜"  Margin="10,0" Command="{Binding StopLocalOrder}" Cursor="Hand"/>
-                            <Button Content="{Binding ModeButten}"  Margin="10,0" Command="{Binding ModeChange}" Cursor="Hand"/>
+                    <Button Content="{Binding ModeButten}"  Margin="10,0" Command="{Binding ModeChange}" Cursor="Hand"/>
                 </WrapPanel>
             </Grid>
 
         </GroupBox>
-        <GroupBox Header="菜品选择" FontSize="15" Foreground="Aqua" Grid.Row="2" VerticalAlignment="Center" Height="190" >
+        <!--<GroupBox Header="菜品选择" FontSize="15" Foreground="Aqua" Grid.Row="2" VerticalAlignment="Center" Height="190" >
             <Grid  >
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*"/>
@@ -127,7 +127,7 @@
                 </WrapPanel>
             </Grid>
 
-        </GroupBox>
+        </GroupBox>-->
         <StackPanel Orientation="Vertical" Grid.Row="3">
             <GroupBox Header="配料仓控制" FontSize="15" Foreground="Aqua"  VerticalAlignment="Center" Height="65">
                 <WrapPanel Orientation="Horizontal" Grid.RowSpan="2" VerticalAlignment="Top" Margin="0,5,0,0" >
diff --git a/BPASmartClient.MorkF/View/LocalMenu.xaml b/BPASmartClient.MorkF/View/LocalMenu.xaml
index b217bd3d..1731d793 100644
--- a/BPASmartClient.MorkF/View/LocalMenu.xaml
+++ b/BPASmartClient.MorkF/View/LocalMenu.xaml
@@ -7,7 +7,7 @@
         xmlns:local="clr-namespace:BPASmartClient.MorkF.View"
         xmlns:vm="clr-namespace:BPASmartClient.MorkF.ViewModel"
         mc:Ignorable="d"
-        Title="LocalMenu" Height="800" Width="800" WindowStartupLocation="CenterScreen" WindowStyle="None" AllowsTransparency="True" MouseLeftButtonDown="Window_MouseLeftButtonDown" Background="Gray"
+        Title="LocalMenu" Height="900" Width="800" WindowStartupLocation="CenterScreen" WindowStyle="None" AllowsTransparency="True" MouseLeftButtonDown="Window_MouseLeftButtonDown" Background="Gray"
         >
     <Window.DataContext>
         <vm:LocalMenuViewModel/>
@@ -22,7 +22,7 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                            <Border  BorderBrush="Black" BorderThickness="0" Background="Transparent">
+                            <Border  BorderBrush="Black" BorderThickness="0" Background="Transparent" Margin="5">
                                 <Grid Width="600" HorizontalAlignment="Center" VerticalAlignment="Center" >
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition/>
@@ -56,23 +56,29 @@
             <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/内部背景.png"/>
         </Grid.Background>
         <Grid.RowDefinitions>
+            <RowDefinition Height="80"/>
             <RowDefinition Height="80"/>
             <RowDefinition Height="50"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <StackPanel Margin="10,20,10,0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <ComboBox Name="Materials" Width="100" Height="40" SelectionChanged="Materials_SelectionChanged"  ItemsSource="{Binding MaterialNames}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+            
             <TextBox Text="{Binding MaterialName}"  Width="80" Height="40" Margin="10,0"/>
             <Button Content="增加菜谱" Command="{Binding AddMaterial}" Width="80" Height="40" Margin="10,0"/>
-            <Button Content="下单" Command="{Binding NewStartLocalMaterial}" Width="80" Height="40" Margin="10,0"/>
-            <!--<Button Content="菜谱重命名" Command="{Binding RenameMaterial}" Width="80" Height="40" Margin="10,0"/>
-            <Button Content="删除菜谱" Command="{Binding DeleteMaterial}" Width="80" Height="40" Margin="10,0"/>-->
+        </StackPanel>
+        <StackPanel Grid.Row="1" Margin="10,20,10,0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <ComboBox Name="Materials" Width="100" Height="40" SelectionChanged="Materials_SelectionChanged"  SelectedIndex="0" IsReadOnly="True"
+                      ItemsSource="{Binding MaterialNames}" SelectedItem="{Binding SelectMaterialName}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+           
+            <!--<Button Content="下单" Command="{Binding NewStartLocalMaterial}" Width="80" Height="40" Margin="10,0" Cursor="Hand"/>-->
+            <!--<Button Content="菜谱重命名" Command="{Binding RenameMaterial}" Width="80" Height="40" Margin="10,0"/>-->
+            <Button Content="删除菜谱" Command="{Binding DeleteMaterial}" Width="80" Height="40" Margin="10,0"/>
             <Button Content="增加步骤" Command="{Binding AddFryTime}" Width="80" Height="40" Margin="10,0"/>
             <Button Content="保存" Command="{Binding Save}" Width="80" Height="40" Margin="10,0"/>
             <Button Content="退出" Click="Button_Click" Width="80" Height="40" Margin="10,0"/>
         </StackPanel>
         
-        <Grid Grid.Row="1" Width="600" HorizontalAlignment="Center" VerticalAlignment="Center">
+        <Grid Grid.Row="2" Width="600" HorizontalAlignment="Center" VerticalAlignment="Center">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition/>
@@ -88,7 +94,7 @@
             <TextBlock Grid.Column="4" Text="调料重量" HorizontalAlignment="Center"/>
             <TextBlock Grid.Column="5" Text="删除" HorizontalAlignment="Center"/>
         </Grid>
-        <ListBox x:Name="listview1" Grid.Row="2"  BorderBrush="Black" BorderThickness="0" HorizontalAlignment="Center"  AllowDrop="True"
+        <ListBox x:Name="listview1" Grid.Row="3"  BorderBrush="Black" BorderThickness="0" HorizontalAlignment="Center"  AllowDrop="True"
                   ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding PotActionStep}" Margin=" 10" Background="Transparent"
                  >
             
diff --git a/BPASmartClient.MorkF/View/LocalMenu.xaml.cs b/BPASmartClient.MorkF/View/LocalMenu.xaml.cs
index e5d001f4..d3c98d16 100644
--- a/BPASmartClient.MorkF/View/LocalMenu.xaml.cs
+++ b/BPASmartClient.MorkF/View/LocalMenu.xaml.cs
@@ -233,7 +233,7 @@ namespace BPASmartClient.MorkF.View
 
         private void Materials_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            string str = Materials.SelectedValue.ToString();
+            string str = Materials.SelectedValue?.ToString();
             if(str != string.Empty)
             {
                 ActionManage.GetInstance.Send("LoacMenuSelectMaterial", str);
diff --git a/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs
index c2caa4fa..4c093fa1 100644
--- a/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs
+++ b/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs
@@ -33,7 +33,7 @@ namespace BPASmartClient.MorkF.ViewModel
         public RelayCommand FoodPlcInite { get; set; }
         public RelayCommand Plc1Reset { get; set; }
         public RelayCommand StartOrder { get; set; }
-        public RelayCommand StartLocalOrder { get; set; }
+       
         public RelayCommand StopLocalOrder { get; set; }
         public RelayCommand ModeChange { get; set; }
 
@@ -205,7 +205,6 @@ namespace BPASmartClient.MorkF.ViewModel
             PlcInite = new RelayCommand(() => { ActionManage.GetInstance.Send("InitCommand"); });
             Plc1Reset = new RelayCommand(() => { ActionManage.GetInstance.Send("Plc1Reset"); });
             StartOrder = new RelayCommand(() => { ActionManage.GetInstance.Send("StartOrder", FoodMenuID); });
-            StartLocalOrder = new RelayCommand(() => { ActionManage.GetInstance.Send("StartLocalOrder"); });
             StopLocalOrder = new RelayCommand(() => { ActionManage.GetInstance.Send("StopLocalOrder"); });
             ModeChange = new RelayCommand(() => { 
                 ActionManage.GetInstance.Send("ModeChange"); 
diff --git a/BPASmartClient.MorkF/ViewModel/LocalMenuViewModel.cs b/BPASmartClient.MorkF/ViewModel/LocalMenuViewModel.cs
index 39ec33cd..67d12347 100644
--- a/BPASmartClient.MorkF/ViewModel/LocalMenuViewModel.cs
+++ b/BPASmartClient.MorkF/ViewModel/LocalMenuViewModel.cs
@@ -1,6 +1,9 @@
 using BPA.Models;
 using BPASmartClient.Helper;
+using BPASmartClient.Model;
+using BPASmartClient.Model.小炒机;
 using BPASmartClient.MorkF.Model;
+using BPASmartClient.ViewModel;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
@@ -17,20 +20,33 @@ namespace BPASmartClient.MorkF.ViewModel
     
     partial class LocalMenuViewModel:ObservableObject
     {
+        /// <summary>
+        /// 单个菜品流程
+        /// </summary>
         public  ObservableCollection<PotActions> PotActionStep { get { return _PotActionStep; }
             set { _PotActionStep = value; OnPropertyChanged(); } } 
             private ObservableCollection<PotActions> _PotActionStep = new ObservableCollection<PotActions>();
 
+        
         public string MaterialName { get; set; }
-
-        public string SelectMaterialName { get; set; }
-
+        /// <summary>
+        /// 选中的菜品
+        /// </summary>
+        public string SelectMaterialName { get { return _selectMaterialName; } set { _selectMaterialName = value; OnPropertyChanged(); } }
+        private string _selectMaterialName;
+        /// <summary>
+        /// 菜品combox集合
+        /// </summary>
         public ObservableCollection<string> MaterialNames { get; set; } = new ObservableCollection<string>();
 
-
+        /// <summary>
+        /// 动作名称combox集合
+        /// </summary>
         public ObservableCollection<string> strPotActions { get; set; } = new ObservableCollection<string>();
-
-        public MaterialAndFryingTime materialAndFryingTime { get; set; } = new MaterialAndFryingTime();
+        /// <summary>
+        /// 全部菜品流程集合
+        /// </summary>
+        public MaterialAndFryingTime materialAndFryingTime { get; set; } = Json<MaterialAndFryingTime>.Data;
 
         public RelayCommand<object> Delete { get; set; }
         public RelayCommand AddFryTime { get; set; }
@@ -106,34 +122,33 @@ namespace BPASmartClient.MorkF.ViewModel
                 else
                 {
                     MaterialNames.Add(MaterialName);
+                    SelectMaterialName = MaterialName;
                 }
             });
             DeleteMaterial = new RelayCommand(() =>
             {
-                //尝试是否能找到
-                if (MaterialNames.FirstOrDefault(o => o == SelectMaterialName) == SelectMaterialName)
+                if (materialAndFryingTime.materials.ContainsKey(SelectMaterialName))
                 {
-                    MaterialNames.Remove(SelectMaterialName);
-                    if(materialAndFryingTime.materials.ContainsKey(SelectMaterialName))
-                    {
-                        materialAndFryingTime.materials.Remove(SelectMaterialName);
-                    }
-                }
-            });
-            RenameMaterial = new RelayCommand(() =>
-            {
-                //尝试是否能找到
-                if (MaterialNames.FirstOrDefault(o => o == SelectMaterialName) == SelectMaterialName)
-                {
-                    MaterialNames.Remove(SelectMaterialName);
-                    MaterialNames.Add(MaterialName);
-                    if (materialAndFryingTime.materials.ContainsKey(SelectMaterialName))
-                    {
-                        materialAndFryingTime.materials.Add(MaterialName, materialAndFryingTime.materials[SelectMaterialName]);
-                        materialAndFryingTime.materials.Remove(SelectMaterialName);
-                    }
+                    materialAndFryingTime.materials.Remove(SelectMaterialName);
                 }
+                MaterialNames.Remove(SelectMaterialName);
+                PotActionStep.Clear();
             });
+            //RenameMaterial = new RelayCommand(() =>
+            //{
+            //    //尝试是否能找到
+            //    if (MaterialNames.FirstOrDefault(o => o == SelectMaterialName) == SelectMaterialName)
+            //    {
+            //        MaterialNames.Remove(SelectMaterialName);
+            //        MaterialNames.Add(MaterialName);
+            //        if (materialAndFryingTime.materials.ContainsKey(SelectMaterialName))
+            //        {
+            //            materialAndFryingTime.materials.Add(MaterialName, materialAndFryingTime.materials[SelectMaterialName]);
+            //            materialAndFryingTime.materials.Remove(SelectMaterialName);
+
+            //        }
+            //    }
+            //});
             Save = new RelayCommand(new Action(() =>
             {
                 if(PotActionStep.Count > 0)
@@ -155,8 +170,9 @@ namespace BPASmartClient.MorkF.ViewModel
                 //Json<LocalPotStep>.Data.LocalstirFryGoods.GoodsKey = 11;
                 //Json<LocalPotStep>.Data.LocalstirFryGoods.StirPotActions = new List<PotActions>(PotActionStep);
                 //Json<LocalPotStep>.Save();
-                Json<MaterialAndFryingTime>.Data.materials = materialAndFryingTime.materials;
+                //Json<MaterialAndFryingTime>.Data.materials = materialAndFryingTime.materials;
                 Json<MaterialAndFryingTime>.Save();
+               
                 //ActionManage.GetInstance.Send("LocalMenuClose");
             }));
 
@@ -209,8 +225,5 @@ namespace BPASmartClient.MorkF.ViewModel
         }
     }
 
-    partial class MaterialAndFryingTime
-    {
-        public Dictionary<string, ObservableCollection<PotActions>> materials { get; set; } = new Dictionary<string, ObservableCollection<PotActions>>();
-    }
+   
 }
diff --git a/BPASmartClient.ViewModel/FoodMenuViewModel.cs b/BPASmartClient.ViewModel/FoodMenuViewModel.cs
index 4de85018..68efee72 100644
--- a/BPASmartClient.ViewModel/FoodMenuViewModel.cs
+++ b/BPASmartClient.ViewModel/FoodMenuViewModel.cs
@@ -1,5 +1,6 @@
 using BPASmartClient.Helper;
 using BPASmartClient.Model;
+using BPASmartClient.Model.小炒机;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
@@ -13,17 +14,23 @@ namespace BPASmartClient.ViewModel
 {
     public class FoodMenuViewModel: ObservableObject
     {
-        public ObservableCollection<FoodMenuModel> FoodMenus { get; set; } = GlobalFoodMenu.LocalFoodMenus;
+        /// <summary>
+        /// 菜单
+        /// </summary>
+        public ObservableCollection<FoodMenuModel> FoodMenus { get; set; } = new ObservableCollection<FoodMenuModel>();
 
         public RelayCommand<object> StartOrder { get; set; }
 
         public FoodMenuViewModel()
         {
-            
+            Json<MaterialAndFryingTime>.Data.materials?.Keys?.ToList().ForEach(key => FoodMenus.Add(new FoodMenuModel { GoodName = key }));
+
             StartOrder = new RelayCommand<object>((o) =>
             {
                 ActionManage.GetInstance.Send("开始下单", o);
             });
         }
+
+      
     }
 }
diff --git a/BPASmartClient/Control/FoodMenuView.xaml b/BPASmartClient/Control/FoodMenuView.xaml
index 7e2efe5b..f7b0fd57 100644
--- a/BPASmartClient/Control/FoodMenuView.xaml
+++ b/BPASmartClient/Control/FoodMenuView.xaml
@@ -6,10 +6,8 @@
              xmlns:local="clr-namespace:Control"
              xmlns:vm="clr-namespace:BPASmartClient.ViewModel;assembly=BPASmartClient.ViewModel"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <UserControl.DataContext>
-        <vm:FoodMenuViewModel/>
-    </UserControl.DataContext>
+             d:DesignHeight="850" d:DesignWidth="800">
+   
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -23,6 +21,7 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="50"/>
                 <RowDefinition Height="*"/>
+                <RowDefinition Height="0.6*"/>
             </Grid.RowDefinitions>
             <Grid HorizontalAlignment="Center">
                 <Grid.ColumnDefinitions>
@@ -47,11 +46,12 @@
                             <TextBlock Grid.Column="1"  FontSize="18" Text="{Binding GoodName}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                             <Button Grid.Column="2" Width="120" Content="下单" HorizontalAlignment="Center" VerticalAlignment="Center" Height="30"
                                 Command="{Binding DataContext.StartOrder, RelativeSource={RelativeSource AncestorType=UserControl,Mode=FindAncestor}}"
-                                    CommandParameter="{Binding GoodKey}"/>
+                                    CommandParameter="{Binding .}"/>
                         </Grid>
                     </DataTemplate>
                 </ListBox.ItemTemplate>
             </ListBox>
+            
         </Grid>
       
        
diff --git a/BPASmartClient/Control/FoodMenuView.xaml.cs b/BPASmartClient/Control/FoodMenuView.xaml.cs
index 6cc782da..33bd5be3 100644
--- a/BPASmartClient/Control/FoodMenuView.xaml.cs
+++ b/BPASmartClient/Control/FoodMenuView.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.ViewModel;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Windows;
@@ -21,6 +22,7 @@ namespace BPASmartClient.Control
         public FoodMenuView()
         {
             InitializeComponent();
+            this.DataContext = new FoodMenuViewModel();
         }
     }
 }

From 9954d53082550eeab901ccb5b7b4f56c289925f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Mon, 13 Feb 2023 09:44:09 +0800
Subject: [PATCH 03/96] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../分餐机/ScreenSplitMealsControl1.xaml   | 382 +++++++++---------
 BPASmartClient/App.config                     |  10 +-
 2 files changed, 199 insertions(+), 193 deletions(-)

diff --git a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
index 5340572e..3afb1f26 100644
--- a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
+++ b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
@@ -1,189 +1,195 @@
-<UserControl x:Class="BPASmartClient.ScreenLib.ScreenSplitMealsControl1"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:BPASmartClient.ScreenLib"
-             xmlns:wv2="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
-             xmlns:con="clr-namespace:BPA.CustomResource.UserControls;assembly=BPA.CustomResource"
-             mc:Ignorable="d" 
-            d:DesignHeight="1080" d:DesignWidth="1920">
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/BPA.CustomResource;component/Themes/ProlineStyle.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="2*"/>
-            <ColumnDefinition Width="*"/>
-        </Grid.ColumnDefinitions>
-
-        <StackPanel Margin="0,10,0,0">
-            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="1 号档口" Style="{DynamicResource  from}" Tag="Start">
-                <StackPanel>
-                    <GroupBox Header="设备运行情况" Margin="20,10,0,0"/>
-                    <Grid Height="160" >
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
-                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                                <TextBlock.Style>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="Foreground" Value="Lime"></Setter>
-                                        <Style.Triggers>
-                                            <Trigger Property="Text" Value="停止">
-                                                <Setter Property="Foreground" Value="Red"/>
-                                            </Trigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </TextBlock.Style>
-                            </TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
-                        </StackPanel>
-                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日刷卡数</TextBlock>
-                        </StackPanel>
-                    </Grid>
-                    <GroupBox Header="当前操作信息" Margin="20,10,0,0"/>
-                    <Grid Height="160">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
-                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">前一位刷卡人</TextBlock>
-                        </StackPanel>
-                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前刷卡人</TextBlock>
-                        </StackPanel>
-                    </Grid>
-                </StackPanel>
-
-            </GroupBox>
-            <GroupBox Margin="0,20,10,0" Height="480" Width="450" Header="今日菜品列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                    <ListBox.ItemTemplate>
-                        <DataTemplate>
-                            <WrapPanel>
-                                <Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
-                                    <TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
-                                </Border>
-                            </WrapPanel>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                </ListBox>
-            </GroupBox>
-        </StackPanel>
-
-        <StackPanel Grid.Column="1" MouseLeftButtonDown="StackPanel_MouseLeftButtonDown" VerticalAlignment="Bottom" Margin="0,0,0,10">
-            <GroupBox x:Name="guanggao" Height="600" Width="950" Margin="0,10,0,20" Header="广告区域" HorizontalAlignment="Center" VerticalAlignment="Top" Style="{DynamicResource  from}"  Tag="Start">
-                <Grid>
-                    <wv2:WebView2 Name="webView" />
-                </Grid>
-            </GroupBox>
-            <Grid x:Name="diqiu" Height="600"   Width="950" Margin="0,10,0,20" >
                <Image Style="{DynamicResource imagezhu}"></Image>
                <Image Style="{DynamicResource image中1}" Margin="0,400,0,0"></Image>
                <GroupBox Margin="600,100,0,500" Header="{Binding ViewData.FailuresCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="累计故障数" Content="次" Width="100"/>
                <GroupBox Margin="600,400,0,0" Header="0" Style="{DynamicResource GroupStyle圆形}" Tag="故障次数"  Content="次" Width="160"/>
                <GroupBox Margin="-500,100,0,0" Header="{Binding OrderCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="日总接待人数" Content="人" Width="160"/>
            </Grid>
-            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="信息通知区域" Style="{DynamicResource  from}">
-                <DataGrid Margin="10,10,10,0" ItemsSource="{Binding ViewData.Alarm,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                    <DataGrid.Columns>
-                        <DataGridTemplateColumn Width="250">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="信息时间" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding AlarmTime}" Foreground="#a70909" FontSize="16" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="*">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="详细描述" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding AlarmMs}" Foreground="#a70909" FontSize="16" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                    </DataGrid.Columns>
-                </DataGrid>
-            </GroupBox>
-        </StackPanel>
-
-        <StackPanel Grid.Column="2"  Margin="0,10,0,0">
-            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="2 号档口" Style="{DynamicResource  from}" Tag="Start">
-                <StackPanel>
-                    <GroupBox Header="设备运行情况" Margin="20,10,0,0"/>
-                    <Grid Height="160" >
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
-                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                                <TextBlock.Style>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="Foreground" Value="Lime"></Setter>
-                                        <Style.Triggers>
-                                            <Trigger Property="Text" Value="停止">
-                                                <Setter Property="Foreground" Value="Red"/>
-                                            </Trigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </TextBlock.Style>
-                            </TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
-                        </StackPanel>
-                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日刷卡数</TextBlock>
-                        </StackPanel>
-                    </Grid>
-                    <GroupBox Header="当前操作信息" Margin="20,10,0,0"/>
-                    <Grid Height="160">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
-                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">前一位刷卡人</TextBlock>
-                        </StackPanel>
-                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前刷卡人</TextBlock>
-                        </StackPanel>
-                    </Grid>
-                </StackPanel>
-
-            </GroupBox>
-            <GroupBox Margin="0,20,10,0" Height="480" Width="450" Header="今日菜品列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                    <ListBox.ItemTemplate>
-                        <DataTemplate>
-                            <WrapPanel>
-                                <Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
-                                    <TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
-                                </Border>
-                            </WrapPanel>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                </ListBox>
-            </GroupBox>
-        </StackPanel>
-    </Grid>
-
+<UserControl x:Class="BPASmartClient.ScreenLib.ScreenSplitMealsControl1"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:BPASmartClient.ScreenLib"
+             xmlns:wv2="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
+             xmlns:con="clr-namespace:BPA.CustomResource.UserControls;assembly=BPA.CustomResource"
+             mc:Ignorable="d" 
+            d:DesignHeight="1080" d:DesignWidth="1920">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPA.CustomResource;component/Themes/ProlineStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+
+        <StackPanel Margin="0,10,0,0">
+            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="1 号档口" Style="{DynamicResource  from}" Tag="Start">
+                <StackPanel>
+                    <GroupBox Header="设备运行情况" Margin="20,10,0,0"/>
+                    <Grid Height="160" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="停止">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
+                        </StackPanel>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日刷卡数</TextBlock>
+                        </StackPanel>
+                    </Grid>
+                    <GroupBox Header="当前操作信息" Margin="20,10,0,0"/>
+                    <Grid Height="160">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">前一位刷卡人</TextBlock>
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前刷卡人</TextBlock>
+                        </StackPanel>
+                    </Grid>
+                </StackPanel>
+
+            </GroupBox>
+            <GroupBox Margin="0,20,10,0" Height="480" Width="450" Header="今日菜品列表"  Style="{DynamicResource  from}"  Tag="Start">
+                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <WrapPanel>
+                                <Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
+                                    <TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
+                                </Border>
+                            </WrapPanel>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+            </GroupBox>
+        </StackPanel>
+
+        <StackPanel Grid.Column="1" MouseLeftButtonDown="StackPanel_MouseLeftButtonDown" VerticalAlignment="Bottom" Margin="0,0,0,10">
+            <GroupBox x:Name="guanggao" Height="600" Width="950" Margin="0,10,0,20" Header="广告区域" HorizontalAlignment="Center" VerticalAlignment="Top" Style="{DynamicResource  from}"  Tag="Start">
+                <Grid>
+                    <wv2:WebView2 Name="webView" />
+                </Grid>
+            </GroupBox>
+            <Grid x:Name="diqiu" Height="600"   Width="950" Margin="0,10,0,20" >
+                <Image Style="{DynamicResource imagezhu}"></Image>
+                <Image Style="{DynamicResource image中1}" Margin="0,400,0,0"></Image>
+                <GroupBox Margin="600,100,0,500" Header="{Binding ViewData.FailuresCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="累计故障数" Content="次" Width="100"/>
+                <GroupBox Margin="600,400,0,0" Header="0" Style="{DynamicResource GroupStyle圆形}" Tag="故障次数"  Content="次" Width="160"/>
+                <GroupBox Margin="-500,100,0,0" Header="{Binding OrderCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="日总接待人数" Content="人" Width="160"/>
+            </Grid>
+            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="信息通知区域" Style="{DynamicResource  from}">
+                <DataGrid Margin="10,10,10,0" ItemsSource="{Binding ViewData.Alarm,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                    <DataGrid.Columns>
+                        <DataGridTemplateColumn Width="250">
+                            <DataGridTemplateColumn.Header>
+                                <TextBlock Text="信息时间" Foreground="White"/>
+                            </DataGridTemplateColumn.Header>
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <TextBlock Margin="0,5,0,5" Text="{Binding AlarmTime}" Foreground="#a70909" FontSize="16" HorizontalAlignment="Center"/>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTemplateColumn Width="*">
+                            <DataGridTemplateColumn.Header>
+                                <TextBlock Text="详细描述" Foreground="White"/>
+                            </DataGridTemplateColumn.Header>
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <TextBlock Margin="0,5,0,5" Text="{Binding AlarmMs}" Foreground="#a70909" FontSize="16" HorizontalAlignment="Center"/>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                    </DataGrid.Columns>
+                </DataGrid>
+            </GroupBox>
+        </StackPanel>
+
+        <StackPanel Grid.Column="2"  Margin="0,10,0,0">
+            <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="460" Width="450" Header="2 号档口" Style="{DynamicResource  from}" Tag="Start">
+                <StackPanel>
+                    <GroupBox Header="设备运行情况" Margin="20,10,0,0"/>
+                    <Grid Height="160" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="停止">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
+                        </StackPanel>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日刷卡数</TextBlock>
+                        </StackPanel>
+                    </Grid>
+                    <GroupBox Header="当前操作信息" Margin="20,10,0,0"/>
+                    <Grid Height="160">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardNameBefore_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">前一位刷卡人</TextBlock>
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="{Binding ViewData.SplitMeals_CreditCardName_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前刷卡人</TextBlock>
+                        </StackPanel>
+                    </Grid>
+                </StackPanel>
+
+            </GroupBox>
+            <GroupBox Margin="0,20,10,0" Height="480" Width="450" Header="今日菜品列表"  Style="{DynamicResource  from}"  Tag="Start">
+                <ListBox ItemsSource="{Binding ViewData.SplitMeals_CookType_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <WrapPanel>
+                                <Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
+                                    <TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
+                                </Border>
+                            </WrapPanel>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+            </GroupBox>
+        </StackPanel>
+    </Grid>
+
 </UserControl>
\ No newline at end of file
diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index 0f73c836..04f363c3 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -4,12 +4,12 @@
 
     <!--通用配置-->
     <!--<add key="ClientId" value="43"/>-->
-    <add key="IsEnableTest" value="false"/>
+    <add key="IsEnableTest" value="true"/>
 
     <!--测试环境-->
-    <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
+    <add key="apollouri" value="http://10.2.1.21:28080/"/>
     <add key="AppId" value="test1_HostComputer"/>
-    <add key ="Namespaces" value="DEV.test1.Config"/>-->
+    <add key ="Namespaces" value="DEV.test1.Config"/>
 
     <!--开发环境-->
     <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
@@ -17,9 +17,9 @@
     <add key ="Namespaces" value="DEV.Config"/>-->
 
     <!--正式环境-->
-    <add key="apollouri" value="http://47.108.65.220:28080/"/>
+    <!--<add key="apollouri" value="http://47.108.65.220:28080/"/>
     <add key="appid" value="hostcomputer"/>
-    <add key ="namespaces" value="test1.config"/>
+    <add key ="namespaces" value="test1.config"/>-->
 
     <!--阿里云上报启动方式:API 或者 LOCAL-->
     <!--API  :通过客户端ID,调用接口查询“设备连接信息”-->

From c79f7b12f5954178e9767bc7b5f83a73a4903f2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Mon, 13 Feb 2023 16:56:04 +0800
Subject: [PATCH 04/96] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88MORKS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BPASmartClient.Business.csproj            |   2 +-
 .../BPASmartClient.CustomResource.csproj      |   2 +-
 .../BPASmartClient.Device.csproj              |   2 +-
 .../BPASmartClient.DosingSystemSingle.csproj  |   2 +-
 .../BPASmartClient.JXJFoodSmallStation.csproj |   2 +-
 .../BPASmartClient.Model.csproj               |   2 +-
 .../BPASmartClient.MorkF.csproj               |   2 +-
 .../BPASmartClient.MorkMW.csproj              |   2 +-
 .../BPASmartClient.MorkS.csproj               |   2 +-
 BPASmartClient.MorkSUpgradedVer/Alarm.cs      |  74 ++
 .../BPASmartClient.MorkSUpgradedVer.csproj    |  35 +
 .../Control_MorkSUpgradedVer.cs               | 755 ++++++++++++++++++
 BPASmartClient.MorkSUpgradedVer/DataServer.cs |  51 ++
 BPASmartClient.MorkSUpgradedVer/DeviceData.cs | 193 +++++
 .../GVL_MorkSUpgradedVer.cs                   | 322 ++++++++
 .../GlobalUsing.cs                            |  26 +
 .../Model/Global.cs                           |  13 +
 .../Model/MorksPar.cs                         |  16 +
 .../Model/ParSet.cs                           |  29 +
 .../Model/WritePar.cs                         |  14 +
 .../OrderLocInfo.cs                           |  23 +
 .../View/Debug.xaml                           | 117 +++
 .../View/Debug.xaml.cs                        |  30 +
 .../View/Monitor.xaml                         | 242 ++++++
 .../View/Monitor.xaml.cs                      |  28 +
 .../View/ParSet.xaml                          | 130 +++
 .../View/ParSet.xaml.cs                       |  28 +
 .../ViewModel/DebugViewModel.cs               |  79 ++
 .../ViewModel/MonitorViewModel.cs             |  25 +
 .../ViewModel/ParSetViewModel.cs              |  49 ++
 BPASmartClient/BPASmartClient.csproj          |   3 +-
 .../BPASmartClient.DosingSystem.csproj        |   2 +-
 SmartClient.sln                               |  25 +-
 33 files changed, 2315 insertions(+), 12 deletions(-)
 create mode 100644 BPASmartClient.MorkSUpgradedVer/Alarm.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/BPASmartClient.MorkSUpgradedVer.csproj
 create mode 100644 BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/DataServer.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/DeviceData.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/GlobalUsing.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/Model/Global.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/Model/ParSet.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/Model/WritePar.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/OrderLocInfo.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/View/Debug.xaml
 create mode 100644 BPASmartClient.MorkSUpgradedVer/View/Debug.xaml.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/View/Monitor.xaml
 create mode 100644 BPASmartClient.MorkSUpgradedVer/View/Monitor.xaml.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml
 create mode 100644 BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/ViewModel/DebugViewModel.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/ViewModel/MonitorViewModel.cs
 create mode 100644 BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs

diff --git a/BPASmartClient.Business/BPASmartClient.Business.csproj b/BPASmartClient.Business/BPASmartClient.Business.csproj
index 87d1b161..25dfbd1c 100644
--- a/BPASmartClient.Business/BPASmartClient.Business.csproj
+++ b/BPASmartClient.Business/BPASmartClient.Business.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="BPA.ApolloClient" Version="1.0.12" />
     <PackageReference Include="BPA.Helper" Version="1.0.33" />
-    <PackageReference Include="BPA.Message" Version="1.0.84" />
+    <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
index b728b8dd..609d0a2a 100644
--- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
+++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
@@ -410,7 +410,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.Helper" Version="1.0.28" />
-    <PackageReference Include="BPA.Message" Version="1.0.84" />
+    <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
   </ItemGroup>
diff --git a/BPASmartClient.Device/BPASmartClient.Device.csproj b/BPASmartClient.Device/BPASmartClient.Device.csproj
index 91f97e5b..2cc1541a 100644
--- a/BPASmartClient.Device/BPASmartClient.Device.csproj
+++ b/BPASmartClient.Device/BPASmartClient.Device.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Message" Version="1.0.84" />
+    <PackageReference Include="BPA.Message" Version="1.0.86" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj b/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj
index 86b5d8c8..46d83b78 100644
--- a/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj
+++ b/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj
@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.Helper" Version="1.0.33" />
-    <PackageReference Include="BPA.Message" Version="1.0.84" />
+    <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
diff --git a/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj b/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
index 113ea061..6753d0ad 100644
--- a/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
+++ b/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
@@ -14,7 +14,7 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Message" Version="1.0.84" />
+    <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
diff --git a/BPASmartClient.Model/BPASmartClient.Model.csproj b/BPASmartClient.Model/BPASmartClient.Model.csproj
index 660a436c..1c8949a9 100644
--- a/BPASmartClient.Model/BPASmartClient.Model.csproj
+++ b/BPASmartClient.Model/BPASmartClient.Model.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Message" Version="1.0.84" />
+    <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
   </ItemGroup>
 
diff --git a/BPASmartClient.MorkF/BPASmartClient.MorkF.csproj b/BPASmartClient.MorkF/BPASmartClient.MorkF.csproj
index e7ac07e7..d4750439 100644
--- a/BPASmartClient.MorkF/BPASmartClient.MorkF.csproj
+++ b/BPASmartClient.MorkF/BPASmartClient.MorkF.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Message" Version="1.0.84" />
+    <PackageReference Include="BPA.Message" Version="1.0.86" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BPASmartClient.MorkMW/BPASmartClient.MorkMW.csproj b/BPASmartClient.MorkMW/BPASmartClient.MorkMW.csproj
index 8d76ab31..2397e6bc 100644
--- a/BPASmartClient.MorkMW/BPASmartClient.MorkMW.csproj
+++ b/BPASmartClient.MorkMW/BPASmartClient.MorkMW.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Message" Version="1.0.84" />
+    <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="BPA.Models" Version="1.0.38" />
     <PackageReference Include="CommunityToolkit.Common" Version="8.0.0" />
   </ItemGroup>
diff --git a/BPASmartClient.MorkS/BPASmartClient.MorkS.csproj b/BPASmartClient.MorkS/BPASmartClient.MorkS.csproj
index 59a477af..7b7a7d77 100644
--- a/BPASmartClient.MorkS/BPASmartClient.MorkS.csproj
+++ b/BPASmartClient.MorkS/BPASmartClient.MorkS.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Message" Version="1.0.84" />
+    <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="BPA.Models" Version="1.0.38" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
     <PackageReference Include="System.Speech" Version="6.0.0" />
diff --git a/BPASmartClient.MorkSUpgradedVer/Alarm.cs b/BPASmartClient.MorkSUpgradedVer/Alarm.cs
new file mode 100644
index 00000000..0f786f85
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/Alarm.cs
@@ -0,0 +1,74 @@
+using BPASmartClient.Device;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkSUpgradedVer
+{
+    public class Alarm : IAlarm
+    {
+        /// <summary>
+        /// 煮面机温度过低
+        /// </summary>
+        [Alarm("煮面机温度过低")]
+        public bool MachineLowTemperature { get; set; }
+
+        /// <summary>
+        /// 大碗数量不足
+        /// </summary>
+        [Alarm("大碗数量不足")]
+        public bool Supply1_LossBowl { get; set; }
+
+        /// <summary>
+        /// 一次性碗数量不足
+        /// </summary>
+        [Alarm("一次性碗数量不足")]
+        public bool Supply2_LossBowl { get; set; }
+
+        /// <summary>
+        /// 设备未初始化
+        /// </summary>
+        [Alarm("设备未初始化")]
+        public bool DeviceNoInit { get; set; }
+
+        /// <summary>
+        /// 移碗丝杆未初始化
+        /// </summary>
+        [Alarm("移碗丝杆未初始化")]
+        public bool MoveScrewRodNoInit { get; set; }
+
+        /// <summary>
+        /// 供碗1未初始化
+        /// </summary>
+        [Alarm("供碗1未初始化")]
+        public bool SacrificialVesselNoInit { get; set; }
+
+        /// <summary>
+        /// 气缸推杆未初始化
+        /// </summary>
+        [Alarm("气缸推杆未初始化")]
+        public bool CylinderNoInit { get; set; }
+
+        /// <summary>
+        /// 煮面机初未初始化
+        /// </summary>
+        [Alarm("煮面机初未初始化")]
+        public bool NoodleCookerNoInit { get; set; }
+
+        /// <summary>
+        /// 机器人未初始化
+        /// </summary>
+        [Alarm("机器人未初始化")]
+        public bool RobotNoInit { get; set; }
+
+        /// <summary>
+        /// 料仓未初始化
+        /// </summary>
+        [Alarm("料仓未初始化")]
+        public bool SiloNoInit { get; set; }
+
+
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/BPASmartClient.MorkSUpgradedVer.csproj b/BPASmartClient.MorkSUpgradedVer/BPASmartClient.MorkSUpgradedVer.csproj
new file mode 100644
index 00000000..3b7fef9c
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/BPASmartClient.MorkSUpgradedVer.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BPA.Message" Version="1.0.86" />
+    <PackageReference Include="BPA.Models" Version="1.0.38" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BPASmartClient.Business\BPASmartClient.Business.csproj" />
+    <ProjectReference Include="..\BPASmartClient.CustomResource\BPASmartClient.CustomResource.csproj" />
+    <ProjectReference Include="..\BPASmartClient.Device\BPASmartClient.Device.csproj" />
+    <ProjectReference Include="..\BPASmartClient.EventBus\BPASmartClient.EventBus.csproj" />
+    <ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" />
+    <ProjectReference Include="..\BPASmartClient.MORKSM.BK.PLC\BPASmartClient.PLC.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="View\Debug.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="View\Monitor.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="View\ParSet.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
new file mode 100644
index 00000000..f20d6c65
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -0,0 +1,755 @@
+using System;
+using System.Collections.Generic;
+using BPA.Message.Enum;
+using BPASmartClient.Device;
+using BPASmartClient.EventBus;
+using BPASmartClient.Model;
+using BPASmartClient.Peripheral;
+using static BPASmartClient.EventBus.EventBus;
+using BPASmartClient.Helper;
+using System.Threading;
+using BPASmartClient.Message;
+using BPA.Message;
+using System.Linq;
+using BPASmartClient.Model.PLC;
+using System.Threading.Tasks;
+using System.Reflection;
+using BPASmartClient.MorkSUpgradedVer.Model;
+using System.Collections.ObjectModel;
+using BPASmartClient.MorkSUpgradedVer.ViewModel;
+using BPASmartClient.Business;
+using BPASmartClient.Model.小炒机;
+using BPA.Models;
+using System.Windows.Forms;
+using System.Media;
+
+namespace BPASmartClient.MorkSUpgradedVer
+{
+    public class Control_MorkSUpgradedVer : BaseDevice
+    {
+        public override DeviceClientType DeviceType => DeviceClientType.MORKS;
+        GVL_MorkSUpgradedVer mORKS = new GVL_MorkSUpgradedVer();
+        Alarm alarm = new Alarm();
+
+        public override void DoMain()
+        {
+            MonitorViewModel.DeviceId = DeviceId;
+            ServerInit();
+            DataParse();
+            Json<MorksPar>.Read();
+            Json<OrderStatistics>.Read();
+            if (Json<MorksPar>.Data.parSets == null) Json<MorksPar>.Data.parSets = new ObservableCollection<ParSet>();
+            if (Json<MorksPar>.Data.parSets.Count < 6)
+            {
+                Json<MorksPar>.Data.parSets.Clear();
+                for (int i = 0; i < 6; i++)
+                {
+                    Json<MorksPar>.Data.parSets.Add(new ParSet()
+                    {
+                        CheckBoxContext = $"煮面口{i + 1}屏蔽",
+                        Minute = 1,
+                        Second = 0,
+                        IsShield = false,
+                        TextBlockContext = $"煮面口{i + 1}时间设定"
+                    });
+                }
+            }
+
+            ActionManage.GetInstance.Register(new Action<object[]>((o) =>
+            {
+                if (o.Length > 0)
+                {
+                    Random rd = new Random();
+                    ThreadManage.GetInstance().StartLong(new Action(() =>
+                    {
+                        int NoodleLoc = (int)o[0] == 0 ? rd.Next(1, 6) : (int)o[0];
+                        int BowlLoc = (int)o[1] == 0 ? rd.Next(10, 12) : (int)o[1];
+
+                        string guid = new Guid().ToString();
+
+                        mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { Loc = (ushort)NoodleLoc, SuborderId = guid });
+                        MessageLog.GetInstance.Show($"添加订单：面条位置【{NoodleLoc}】");
+
+                        mORKS.TakeBowlTask.Enqueue(new OrderLocInfo() { Loc = (ushort)BowlLoc, SuborderId = guid });
+                        MessageLog.GetInstance.Show($"添加订单：碗位置【{BowlLoc}】");
+                        Thread.Sleep(60000);
+                    }), "ForOrder");
+                }
+            }), "EnableForOrder");
+
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is WritePar writePar) WriteData(writePar.Address, writePar.Value);
+            }), "WriteVW");
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is WritePar writePar) WriteData(writePar.Address, writePar.Value);
+            }), "WriteBools");
+            ActionManage.GetInstance.Register(new Action(() => { DeviceInit(); }), "InitDevice");
+        }
+
+        public override void ResetProgram()
+        {
+            mORKS = null;
+            mORKS = new GVL_MorkSUpgradedVer();
+        }
+
+        public override void Stop()
+        {
+
+        }
+
+        private void ServerInit()
+        {
+            //物料信息
+            EventBus.EventBus.GetInstance().Subscribe<MaterialDeliveryEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
+             {
+                 if (@event == null) return;
+                 if (@event is MaterialDeliveryEvent material)
+                 {
+                     orderMaterialDelivery = material.orderMaterialDelivery;
+                 }
+             });
+
+            //配方数据信息
+            EventBus.EventBus.GetInstance().Subscribe<RecipeBomEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
+            {
+                if (@event == null) return;
+                if (@event is RecipeBomEvent recipe)
+                {
+                    recipeBoms = recipe.recipeBoms;
+                }
+            });
+
+
+        }
+
+        private void OrderChange(string subid, ORDER_STATUS oRDER_STATUS)
+        {
+            var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
+            string goodName = string.Empty;
+            string SortNum = string.Empty;
+            if (res != null)
+            {
+                goodName = res.MorkOrder.GoodsName;
+                SortNum = res.MorkOrder.SortNum.ToString();
+            }
+
+            EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+
+            var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
+            if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
+            {
+                if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
+                {
+                    DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
+                    DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
+                    {
+                        Status = oRDER_STATUS,
+                        GoodName = goodName,
+                        SortNum = SortNum,
+                        StopTime = DateTime.Now.ToString("HH:mm:ss")
+                    });
+                }
+                else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
+                {
+                    var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
+                    if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
+                }
+                else
+                {
+                    DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
+                }
+            }
+            else
+            {
+                DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
+                {
+                    Status = oRDER_STATUS,
+                    GoodName = goodName,
+                    SortNum = SortNum,
+                    StartTime = DateTime.Now.ToString("HH:mm:ss")
+                });
+            }
+        }
+
+        private void GetStatus(string key, Action<object> action)
+        {
+            if (peripheralStatus.ContainsKey(key))
+            {
+                if (peripheralStatus[key] != null)
+                {
+                    action?.Invoke(peripheralStatus[key]);
+                }
+            }
+        }
+
+        public override void ReadData()
+        {
+            DataServer.GetInstance.morkS.Alarm.Clear();
+            alarms.ForEach(item =>
+            {
+                DataServer.GetInstance.morkS.Alarm.Add(new AlarmModel()
+                {
+                    AlarmTime = $"{item.Date} {item.Time}",
+                    AlarmMs = item.Info
+                });
+            });
+
+            GetStatus("M0.1", new Action<object>((obj) =>
+             {
+                 if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 7)
+                 {
+                     mORKS.InitComplete = bools[0];
+                     mORKS.MoveScrewRodInitCom = bools[1];
+                     mORKS.SacrificialVesselInitCom = bools[2];
+                     mORKS.CylinderInitCom = bools[3];
+                     mORKS.NoodleCookerInitCom = bools[4];
+                     mORKS.RobotInitCom = bools[5];
+                     mORKS.SiloInitCom = bools[6];
+
+                     alarm.DeviceNoInit = mORKS.InitComplete;
+                     alarm.MoveScrewRodNoInit = mORKS.MoveScrewRodInitCom;
+                     alarm.SacrificialVesselNoInit = mORKS.SacrificialVesselInitCom;
+                     alarm.CylinderNoInit = mORKS.CylinderInitCom;
+                     alarm.NoodleCookerNoInit = mORKS.NoodleCookerInitCom;
+                     alarm.RobotNoInit = mORKS.RobotInitCom;
+                     alarm.SiloNoInit = mORKS.SiloInitCom;
+                 }
+             }));
+
+            GetStatus("M10.0", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 2)
+                {
+                    mORKS.AllowInvertedFace = bools[0];
+                    mORKS.DiningComplete = bools[1];
+                }
+            }));
+
+            GetStatus("M10.4", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+                {
+                    mORKS.DropBowlMechanismStatus = bools[0];
+                }
+            }));
+
+            GetStatus("M12.2", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+                {
+                    mORKS.FixedFlag = bools[0];
+                }
+            }));
+
+            GetStatus("M13.5", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+                {
+                    mORKS.SiloInPlace = bools[0];
+                }
+            }));
+
+            GetStatus("M16.7", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+                {
+                    mORKS.RobotTakeNoodleCom = bools[0];
+                }
+            }));
+
+            GetStatus("M17.4", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+                {
+                    mORKS.RobotStatus = bools[0];
+                }
+            }));
+
+            GetStatus("M18.0", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 5)
+                {
+                    mORKS.SmallBowlYesOrNoCheck = bools[0];
+                    mORKS.LargeBowYesOrNoCheck = bools[1];
+                    mORKS.TurntableLowPosition = bools[2];
+                    mORKS.TurntableHighPosition = bools[3];
+                    alarm.Supply2_LossBowl = !mORKS.SmallBowlYesOrNoCheck;
+                    alarm.Supply1_LossBowl = !mORKS.LargeBowYesOrNoCheck;
+                }
+            }));
+
+            GetStatus("VW17", new Action<object>((obj) =>
+            {
+                if (obj is ushort[] ushorts && ushorts.Length > 0 && ushorts.Length <= 1)
+                {
+                    mORKS.CookNoodleCom[0] = ushorts[0].GetBitValue(1);
+                    mORKS.CookNoodleCom[1] = ushorts[0].GetBitValue(2);
+                    mORKS.CookNoodleCom[2] = ushorts[0].GetBitValue(3);
+                    mORKS.CookNoodleCom[3] = ushorts[0].GetBitValue(4);
+                    mORKS.CookNoodleCom[4] = ushorts[0].GetBitValue(5);
+                    mORKS.CookNoodleCom[5] = ushorts[0].GetBitValue(6);
+                    mORKS.Heating = ushorts[0].GetBitValue(15);
+                    mORKS.TemperatureReaches = ushorts[0].GetBitValue(16);
+
+                    alarm.MachineLowTemperature = !mORKS.TemperatureReaches;
+                }
+
+            }));
+
+            GetStatus("VW770", new Action<object>((obj) =>
+            {
+                if (obj is ushort[] ushorts && ushorts.Length > 0 && ushorts.Length <= 1)
+                {
+                    mORKS.CurrentFeedbackLoc = ushorts[0];
+                }
+
+            }));
+        }
+
+        /// <summary>
+        /// 数据解析
+        /// </summary>
+        private void DataParse()
+        {
+            EventBus.EventBus.GetInstance().Subscribe<DoOrderEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBackHandle)
+             {
+                 if (@event == null) return;
+                 if (@event is DoOrderEvent order)
+                 {
+                     mORKS.doOrderEvents.Add(order);
+                     if (order.MorkOrder.GoodBatchings == null) return;
+                     if (mORKS.HistorySuborderId.Contains(order.MorkOrder.SuborderId)) return;
+                     OrderCount++;
+                     if (DateTime.Now.Subtract(Json<OrderStatistics>.Data.StatisticsTime).Days != 0)
+                         Json<OrderStatistics>.Data.Count = 0;
+                     Json<OrderStatistics>.Data.StatisticsTime = DateTime.Now;
+                     Json<OrderStatistics>.Data.Count++;
+                     Json<OrderStatistics>.Save();
+                     OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT);
+                     DeviceProcessLogShow($"接收到{OrderCount}次订单，订单ID：{order.MorkOrder.SuborderId}");
+                     mORKS.HistorySuborderId.Add(order.MorkOrder.SuborderId);
+                     foreach (var item in order.MorkOrder.GoodBatchings)
+                     {
+                         var res = orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId);
+                         if (res != null)
+                         {
+                             if (ushort.TryParse(res.BatchingLoc, out ushort loc))
+                             {
+                                 if (loc >= 1 && loc <= 5)
+                                 {
+                                     if (mORKS.RBTakeNoodleTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                                         mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { GoodName = order.MorkOrder.GoodsName, Loc = ushort.Parse(res.BatchingLoc), SuborderId = order.MorkOrder.SuborderId, BatchingId = res.BatchingId });
+                                 }
+                                 else if (loc >= 10 && loc <= 11)
+                                 {
+                                     int index = 0;
+                                     if (recipeBoms != null)
+                                     {
+                                         index = Array.FindIndex(recipeBoms.RecipeIds?.ToArray(), p => p.RecipeId == order.MorkOrder.RecipeId);
+                                         index++;
+                                     }
+                                     if (mORKS.TakeBowlTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                                         mORKS.TakeBowlTask.Enqueue(new OrderLocInfo()
+                                         {
+                                             BatchingId = res.BatchingId,
+                                             GoodName = order.MorkOrder.GoodsName,
+                                             Loc = ushort.Parse(res.BatchingLoc),
+                                             SuborderId = order.MorkOrder.SuborderId,
+                                             RecipeNumber = (index >= 1 && index <= 10) ? (ushort)index : (ushort)0
+                                         });
+                                 }
+                             }
+                         }
+                     }
+                 }
+             });
+        }
+
+        public override void MainTask()
+        {
+            mORKS.AllowRun = mORKS.InitComplete;
+            if (Json<KeepDataBase>.Data.IsVerify)
+                IsHealth = mORKS.InitComplete;
+            else
+                IsHealth = true;
+
+            TakeBowlTask();
+
+            TakeNoodleTask();
+
+            OutNoodleTask();
+
+            SingleDetect();
+
+            TurntableControl();
+        }
+
+        private void BowlControl(OrderLocInfo orderLocInfo)
+        {
+            if (orderLocInfo.Loc >= 10 && orderLocInfo.Loc <= 11)
+            {
+                mORKS.TakeBowlId = orderLocInfo.SuborderId;
+                mORKS.TakeBowName = orderLocInfo.GoodName;
+                TakeBowlControl(orderLocInfo.Loc);
+                OrderChange(mORKS.TakeBowlId, ORDER_STATUS.COOKING);
+                DeviceProcessLogShow($"订单【{mORKS.TakeBowlId}】执行取碗控制,位置:[{orderLocInfo.Loc}]");
+                mORKS.TakeBowlInterlock = true;
+            }
+        }
+
+        /// <summary>
+        /// 取碗控制
+        /// </summary>
+        private void TakeBowlTask()
+        {
+            if (mORKS.AllowRun && mORKS.TakeBowlTask.Count > 0 && !mORKS.DropBowlMechanismStatus && !mORKS.TakeBowlInterlock)
+            {
+                DeviceProcessLogShow("开始取碗流程");
+                ushort BowLoc = 0;
+                var res = orderMaterialDelivery?.BatchingInfo?.Where(p => p.BatchingId == mORKS.TakeBowlTask.ElementAt(0).BatchingId).ToList();
+                if (res == null || res?.Count == 0)
+                {
+                    if (mORKS.TakeBowlTask.TryDequeue(out OrderLocInfo orderLocInfo)) BowlControl(orderLocInfo);
+                }
+                else
+                {
+                    foreach (var item in res)
+                    {
+                        if (ushort.TryParse(item.BatchingLoc, out ushort loc))
+                        {
+                            if (loc == 10 && !mORKS.SmallBowlYesOrNoCheck)
+                            {
+                                BowLoc = loc;
+                                break;
+                            }
+                            else if (loc == 11 && !mORKS.LargeBowYesOrNoCheck)
+                            {
+                                BowLoc = loc;
+                                break;
+                            }
+                        }
+                    }
+
+                    if (BowLoc >= 10 && BowLoc <= 11)
+                    {
+                        if (mORKS.TakeBowlTask.TryDequeue(out OrderLocInfo orderLocInfo))
+                        {
+                            orderLocInfo.Loc = BowLoc;
+                            BowlControl(orderLocInfo);
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 转台控制
+        /// </summary>
+        private void TurntableControl()
+        {
+            if (Global.EnableLocalSimOrder)
+            {
+                //不做轮询，直接取面，模拟订单使用
+                if (mORKS.SiloInPlace && !mORKS.Feeding && mORKS.InitComplete && !mORKS.AllowTakeNoodle && mORKS.RBTakeNoodleTask.Count > 0)
+                {
+                    if (mORKS.TurntableLowPosition)
+                    {
+                        TurntableStart(mORKS.RBTakeNoodleTask.ElementAt(0).Loc);
+                        mORKS.TurntableLocLists.Clear();
+                        mORKS.AllowTakeNoodle = true;
+                        DeviceProcessLogShow($"控制机器人去转台【{mORKS.RBTakeNoodleTask.ElementAt(0).Loc}】号位置取面");
+                    }
+                }
+            }
+            else
+            {
+                //正常轮询
+                if (mORKS.SiloInPlace && !mORKS.Feeding && mORKS.InitComplete && !mORKS.AllowTakeNoodle && mORKS.RBTakeNoodleTask.Count > 0)
+                {
+                    var result = orderMaterialDelivery.BatchingInfo.Where(p => p.BatchingId == mORKS.RBTakeNoodleTask.ElementAt(0).BatchingId).ToList();
+                    if (result != null)
+                    {
+                        var res = result.FirstOrDefault(P => P.BatchingLoc == mORKS.CurrentFeedbackLoc.ToString());
+                        if (mORKS.TurntableLowPosition && res != null)
+                        {
+                            TurntableStart(mORKS.CurrentFeedbackLoc);
+                            mORKS.TurntableLocLists.Clear();
+                            mORKS.AllowTakeNoodle = true;
+                            DeviceProcessLogShow($"控制机器人去转台【{mORKS.CurrentFeedbackLoc}】号位置取面");
+                        }
+                        else
+                        {
+                            if (!mORKS.TurntableInterlock)
+                            {
+                                foreach (var item in result)
+                                {
+                                    if (ushort.TryParse(item.BatchingLoc, out ushort loc))
+                                    {
+                                        if (mORKS.CurrentFeedbackLoc != loc && !mORKS.TurntableLocLists.Contains(loc))
+                                        {
+                                            if (!mORKS.TurntableLowPosition)
+                                            {
+                                                //WriteData("M32.7", false);
+                                                DeviceProcessLogShow($"执行了转台启动互锁信号复位");
+                                            }
+                                            TurntableStart(loc);
+                                            DeviceProcessLogShow($"没有物料检测的启动转台控制,转台位置：[{loc}]");
+                                            break;
+                                        }
+                                        else if (mORKS.CurrentFeedbackLoc == loc && !mORKS.TurntableLocLists.Contains(loc)) mORKS.TurntableLocLists.Add(loc);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else DeviceProcessLogShow("未找到可用的物料信息");
+                }
+            }
+
+            //补料中检测
+            if (RTrig.GetInstance("mORKS.Feeding").Start(mORKS.Feeding))
+            {
+                mORKS.AllowTakeNoodle = false;
+                mORKS.TakeNoodleInterlock = false;
+            }
+
+            //转台到位检测
+            if (RTrig.GetInstance("TurntableInPlace").Start(mORKS.SiloInPlace && mORKS.CurrentLoc == mORKS.CurrentFeedbackLoc))
+            {
+                mORKS.CurrentLoc = 0;
+                mORKS.TurntableInterlock = false;
+                DeviceProcessLogShow("转台到位检测");
+            }
+
+            //补料完成检测
+            if (RTrig.GetInstance("FeedComplete").Start(mORKS.FeedComplete))
+            {
+                if (!mORKS.AllowTakeNoodle && mORKS.TurntableLocLists.Count > 0)
+                {
+                    mORKS.TurntableLocLists.Clear();
+                    mORKS.TurntableInterlock = false;
+                    DeviceProcessLogShow("补料完成检测");
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// 取面任务
+        /// </summary>
+        private void TakeNoodleTask()
+        {
+            //取面控制
+            if (mORKS.AllowRun && mORKS.RobotStatus && !mORKS.Feeding && !mORKS.RobotTaskInterlock && mORKS.AllowTakeNoodle && mORKS.SiloInPlace && !mORKS.TakeNoodleInterlock && mORKS.RBTakeNoodleTask.Count > 0)
+            {
+                int loc = Array.FindIndex(mORKS.NoodleCookerStatus, p => p == false);//查找煮面炉空闲位置
+                if (loc >= 0 && loc <= 5)
+                {
+                    if (!Json<MorksPar>.Data.parSets.ElementAt(loc).IsShield)//检查该煮面篮是否被屏蔽
+                    {
+                        if (mORKS.RBTakeNoodleTask.TryDequeue(out OrderLocInfo orderLocInfo))
+                        {
+                            mORKS.CookNodelId[loc] = orderLocInfo.SuborderId;
+                            mORKS.NoodleCookerStatus[loc] = true;
+                            SetFallNoodleLoc((ushort)(loc + 1));
+                            //机器人开始取面
+                            OrderChange(orderLocInfo.SuborderId, ORDER_STATUS.COOKING);
+                            DeviceProcessLogShow($"订单【{orderLocInfo.SuborderId}】,机器人倒面至【{loc + 1}】号煮面栏");
+                            //写入煮面时间
+                            List<ushort> values = new List<ushort>();
+                            values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
+                            values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
+                            WriteData($"VW{320 + (loc * 4)}", values.ToArray());
+                            mORKS.TakeNoodleInterlock = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 出餐控制
+        /// </summary>
+        private void OutNoodleTask()
+        {
+            if (mORKS.AllowInvertedFace && mORKS.RobotTaskInterlock && !mORKS.TakeNoodleInterlock && mORKS.RobotStatus)
+            {
+                int loc = Array.FindIndex(mORKS.CookNodelId, p => p == mORKS.IngredientsCompleteId && p.Length > 0);
+                if (loc >= 0 && loc <= 5)
+                {
+                    if (mORKS.CookNoodleCom[loc])
+                    {
+                        SetTakeNoodleLoc((ushort)(loc + 1));
+                        mORKS.NoodleCookerStatus[loc] = false;
+                        WriteData($"VW260", 0);//设置出汤时间
+                        OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_COOK);
+                        DeviceProcessLogShow($"订单【{mORKS.OutMealId}】制作完成");
+                        mORKS.CookCompleteFlatBit = true;
+                        mORKS.OutMealId = mORKS.IngredientsCompleteId;
+                        mORKS.OutMealName = mORKS.IngredientsCompleteName;
+                        mORKS.IngredientsCompleteId = string.Empty;
+                        mORKS.CookNodelId[loc] = string.Empty;
+                        DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{mORKS.OutMealId}");
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 信号检测
+        /// </summary>
+        private void SingleDetect()
+        {
+            //允许倒面信号检测
+            if (RTrig.GetInstance("AllowFallNoodle").Start(mORKS.AllowInvertedFace))
+            {
+                mORKS.IngredientsCompleteId = mORKS.TakeBowlId;
+                mORKS.IngredientsCompleteName = mORKS.TakeBowName;
+                mORKS.TakeBowlId = string.Empty;
+                mORKS.TakeBowName = string.Empty;
+                DeviceProcessLogShow($"碗到位，允许到面,{mORKS.IngredientsCompleteId}");
+                mORKS.TakeBowlInterlock = false;
+            }
+
+            //取餐完成逻辑处理
+            if (Delay.GetInstance("CompleteChange1").Start(!mORKS.DiningComplete, 1) && mORKS.CookCompleteFlatBit == true)
+            {
+                OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
+                DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成");
+                mORKS.CookCompleteFlatBit = false;
+                mORKS.OutMealId = string.Empty;
+                mORKS.OutMealName = string.Empty;
+            }
+
+            //机器人取面完成信号检测
+            if (RTrig.GetInstance("TakeNoodleComplete").Start(mORKS.RobotTakeNoodleCom))
+            {
+                mORKS.TakeNoodleInterlock = false;
+                mORKS.AllowTakeNoodle = false;
+                mORKS.TurntableInterlock = false;
+                DeviceProcessLogShow("机器人取面完成信号检测");
+            }
+
+            int OutMealRequstCount = mORKS.CookNoodleCom.Where(p => p == true).ToList().Count;
+            int mlCount = mORKS.NoodleCookerStatus.Where(p => p == true).ToList().Count;
+            int index = Array.FindIndex(mORKS.CookNodelId, p => p == mORKS.IngredientsCompleteId);
+
+            bool isok = index >= 0 && index < mORKS.CookNoodleCom.Length && mORKS.CookNoodleCom[index];
+
+            mORKS.PriorityJudgment = Delay.GetInstance("取餐优先级判断").Start(mORKS.TurntableLocLists.Count > 0 && !mORKS.TurntableLowPosition, 4);
+            //mORKS.RobotTaskInterlock = OutMealRequstCount > 0 && mORKS.AllowInvertedFace && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
+            mORKS.RobotTaskInterlock = isok && mORKS.AllowInvertedFace && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
+
+
+        }
+        /// <summary>
+        /// 语音提醒取餐
+        /// </summary>
+        /// <param name="meal"></param>
+        private void WaitMeaLSpeak(string meal)
+        {
+            //VoiceAPI.m_SystemPlayWav(@"Vioce\电子提示音.wav");
+            //Thread.Sleep(1000);
+            //if (meal != null) mORKS.speech.Speak(meal);
+            //VoiceAPI.m_SystemPlayWav(@"Vioce\取餐通知.wav");
+        }
+
+        #region PLC 控制函数
+
+        private void WriteData(string address, object value)
+        {
+            EventBus.EventBus.GetInstance().Publish(new WriteModel() { DeviceId = DeviceId, Address = address, Value = value });
+        }
+
+        /// <summary>
+        /// 设备初始化
+        /// </summary>
+        public async void DeviceInit()
+        {
+            WriteData("M0.0", true);
+            await Task.Delay(1000);
+            WriteData("M0.0", false);
+        }
+
+        /// <summary>
+        /// 取碗控制
+        /// </summary>
+        /// <param name="loc"></param>
+        private void TakeBowlControl(ushort loc)
+        {
+            if (loc == 10)//一次性碗
+            {
+                WriteData("M9.1", true);
+            }
+            else if (loc == 11)//大碗
+            {
+                WriteData("M9.0", true);
+            }
+        }
+
+        /// <summary>
+        /// 启动转台
+        /// </summary>
+        /// <param name="loc"></param>
+        private void TurntableStart(ushort loc)
+        {
+            if (loc >= 1 && loc <= 5)
+            {
+                mORKS.CurrentLoc = loc;
+                mORKS.TurntableInterlock = true;
+                mORKS.TurntableLocLists.Add(loc);
+                WriteData($"M13.{loc - 1}", true);
+            }
+        }
+
+        /// <summary>
+        /// 设置倒面位置
+        /// </summary>
+        /// <param name="loc"></param>
+        private void SetFallNoodleLoc(ushort loc)
+        {
+            if (loc >= 1 && loc <= 6)
+                WriteData($"M14.{loc - 1}", true);
+        }
+
+        /// <summary>
+        /// 设置取面位置
+        /// </summary>
+        /// <param name="loc"></param>
+        private void SetTakeNoodleLoc(ushort loc)
+        {
+            if (loc >= 1 && loc <= 6)
+                WriteData($"M16.{loc - 1}", true);
+        }
+
+
+
+        public override void SimOrder()
+        {
+            EventBus.EventBus.GetInstance().Subscribe<MorksSimorderModel>(0, delegate (IEvent @event, EventCallBackHandle callBackHandle)
+            {
+                if (@event != null && @event is MorksSimorderModel msm)
+                {
+                    string guid = Guid.NewGuid().ToString();
+                    if (msm.NoodleLoc >= 1 && msm.NoodleLoc <= 5)
+                    {
+                        mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { Loc = (ushort)msm.NoodleLoc, SuborderId = guid });
+                        MessageLog.GetInstance.Show($"添加订单：面条位置【{(ushort)msm.NoodleLoc}】");
+                    }
+
+                    if (msm.Bowloc >= 10 && msm.Bowloc <= 11)
+                    {
+                        mORKS.TakeBowlTask.Enqueue(new OrderLocInfo() { Loc = (ushort)msm.Bowloc, SuborderId = guid });
+                        MessageLog.GetInstance.Show($"添加订单：碗位置【{(ushort)msm.Bowloc}】");
+                    }
+
+                }
+            });
+        }
+        #endregion
+
+
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/DataServer.cs b/BPASmartClient.MorkSUpgradedVer/DataServer.cs
new file mode 100644
index 00000000..2e8a97a7
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/DataServer.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using BPASmartClient.MQTT;
+using BPA.Message;
+using BPASmartClient.Model;
+
+namespace BPASmartClient.MorkSUpgradedVer
+{
+    public class DataServer
+    {
+
+        private volatile static DataServer _Instance;
+        public static DataServer GetInstance => _Instance ?? (_Instance = new DataServer());
+        private DataServer() { }
+
+        public ScreenModelMorkS morkS { get; set; } = new ScreenModelMorkS();
+
+        MQTTProxy mQTTProxy = new MQTTProxy();
+        public void Init()
+        {
+            mQTTProxy.Connected = new Action(() =>
+            {
+                mQTTProxy.Subscrib(ScreenTOPIC.GetInstance.GetTopic(ScreenDeviceType.煮面机));
+                ThreadManage.GetInstance().StartLong(new Action(() =>
+                {
+                    morkS.MorkS_OrderCount = Json<OrderStatistics>.Data.Count;
+                    SendScreenDataModel sendScreenDataModel = new SendScreenDataModel();
+                    sendScreenDataModel.Name = ScreenDeviceType.煮面机;
+                    sendScreenDataModel.Value = morkS.ToJSON();
+                    mQTTProxy.Publish(ScreenTOPIC.GetInstance.GetTopic(ScreenDeviceType.煮面机), sendScreenDataModel.ToJSON());
+                    Thread.Sleep(100);
+                }), "海科食堂大屏监听");
+            });
+            mQTTProxy.Connect("UserName", "Password", "Host", 1883, $"MORKS 设备监听数据{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+        }
+
+        //订单信息（正在制作，等待制作，制作完成）
+        //煮面炉上下状态（6个煮面炉上或下）
+        //温度状态（煮面炉温度是否到达）
+        //料仓位置（当前料仓在几号位置）
+        //料仓上下物料检测
+        //落碗机构缺碗检测
+        //机器人状态
+        //当日订单总量
+        //报警信息
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/DeviceData.cs b/BPASmartClient.MorkSUpgradedVer/DeviceData.cs
new file mode 100644
index 00000000..e2c2888c
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/DeviceData.cs
@@ -0,0 +1,193 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace BPASmartClient.MorkSUpgradedVer
+{
+    public class DeviceData : IStatus
+    {
+        /// <summary>
+        /// 初始化启动
+        /// </summary>
+        [VariableMonitor("初始化启动", "M0.0", "320")]
+        public bool InitStart { get; set; }
+
+        /// <summary>
+        /// 初始化完成
+        /// </summary>
+        [VariableMonitor("初始化完成", "M0.1", "321")]
+        public bool InitComplete { get; set; }
+
+        /// <summary>
+        /// 移碗丝杆初始化完成
+        /// </summary>
+        [VariableMonitor("移碗丝杆初始化完成", "M0.2", "322")]
+        public bool MoveScrewRodInitCom { get; set; }
+
+        /// <summary>
+        /// 供碗1初始化完成
+        /// </summary>
+        [VariableMonitor("供碗1初始化完成", "M0.3", "323")]
+        public bool SacrificialVesselInitCom { get; set; }
+
+        /// <summary>
+        /// 气缸推杆初始化完成
+        /// </summary>
+        [VariableMonitor("气缸推杆初始化完成", "M0.4", "324")]
+        public bool CylinderInitCom { get; set; }
+
+        /// <summary>
+        /// 煮面机初始化完成
+        /// </summary>
+        [VariableMonitor("煮面机初始化完成", "M0.5", "325")]
+        public bool NoodleCookerInitCom { get; set; }
+
+        /// <summary>
+        /// 机器人初始化完成
+        /// </summary>
+        [VariableMonitor("机器人初始化完成", "M0.6", "326")]
+        public bool RobotInitCom { get; set; }
+
+        /// <summary>
+        /// 料仓初始化完成
+        /// </summary>
+        [VariableMonitor("料仓初始化完成", "M0.7", "327")]
+        public bool SiloInitCom { get; set; }
+
+        /// <summary>
+        /// 故障复位/停止
+        /// </summary>
+        [VariableMonitor("故障复位/停止", "M1.0", "328")]
+        public bool FaultResetOrStop { get; set; }
+
+        /// <summary>
+        /// 落碗1，大碗
+        /// </summary>
+        [VariableMonitor("落碗1，大碗", "M9.0", "392")]
+        public bool DropBowlOne { get; set; }
+
+        /// <summary>
+        /// 落碗2，一次性碗
+        /// </summary>
+        [VariableMonitor("落碗2，一次性碗", "M9.1", "393")]
+        public bool DropBowlTow { get; set; }
+
+        /// <summary>
+        /// 允许倒面
+        /// </summary>
+        [VariableMonitor("允许倒面", "M10.0", "400")]
+        public bool AllowInvertedFace { get; set; }
+
+        /// <summary>
+        /// 出餐完成
+        /// </summary>
+        [VariableMonitor("出餐完成", "M10.1", "401")]
+        public bool DiningComplete { get; set; }
+
+        /// <summary>
+        /// 落碗机构状态，1:忙碌 0:空闲
+        /// </summary>
+        [VariableMonitor("落碗机构状态，1:忙碌 0:空闲", "M10.4", "404")]
+        public bool DropBowlMechanismStatus { get; set; }
+
+        /// <summary>
+        /// 定位标志,1:忙碌 0:空闲
+        /// </summary>
+        [VariableMonitor("定位标志,1:忙碌 0:空闲", "M12.2", "418")]
+        public bool FixedFlag { get; set; }
+
+        /// <summary>
+        /// 定位启动
+        /// </summary>
+        [VariableMonitor("定位启动", "M12.3", "419")]
+        public bool FixedStart { get; set; }
+
+        /// <summary>
+        /// 料仓到位
+        /// </summary>
+        [VariableMonitor("料仓到位", "M13.5", "429")]
+        public bool SiloInPlace { get; set; }
+
+        /// <summary>
+        /// 机器人料仓取面完成
+        /// </summary>
+        [VariableMonitor("机器人去料仓取面完成", "M16.7", "455")]
+        public bool RobotTakeNoodleCom { get; set; }
+
+        /// <summary>
+        /// 机器人状态
+        /// </summary>
+        [VariableMonitor("机器人状态", "M17.4", "460")]
+        public bool RobotStatus { get; set; }
+
+        /// <summary>
+        /// 一次性碗有无检测
+        /// </summary>
+        [VariableMonitor("一次性碗有无检测", "M18.0", "464")]
+        public bool SmallBowlYesOrNoCheck { get; set; }
+
+        /// <summary>
+        /// 大碗有无检测
+        /// </summary>
+        [VariableMonitor("大碗有无检测", "M18.1", "465")]
+        public bool LargeBowYesOrNoCheck { get; set; }
+
+        /// <summary>
+        /// 转台高位
+        /// </summary>
+        [VariableMonitor("转台高位", "M18.2", "466")]
+        public bool TurntableHighPosition { get; set; }
+
+        /// <summary>
+        /// 转台低位
+        /// </summary>
+        [VariableMonitor("转台低位", "M18.3", "467")]
+        public bool TurntableLowPosition { get; set; }
+
+        /// <summary>
+        /// 煮面完成
+        /// </summary>
+        [VariableMonitor("煮面完成", "V17.0")]
+        public bool[] CookNoodleCom { get; set; } = new bool[6];
+
+        /// <summary>
+        /// 本地/远程
+        /// </summary>
+        [VariableMonitor("本地/远程", "V18.0")]
+        public bool LocalOrRemote { get; set; }
+
+        /// <summary>
+        /// 温度到达
+        /// </summary>
+        [VariableMonitor("温度到达", "V18.7")]
+        public bool TemperatureReaches { get; set; }
+
+        /// <summary>
+        /// 加热中
+        /// </summary>
+        [VariableMonitor("加热中", "V18.6")]
+        public bool Heating { get; set; }
+
+        /// <summary>
+        /// 转台当前位置
+        /// </summary>
+        [VariableMonitor("转台当前位置", "VW770")]
+        public ushort CurrentLoc { get; set; }
+
+        /// <summary>
+        /// 补料完成
+        /// </summary>
+        [VariableMonitor("补料完成", "M101.6", "1134")]
+        public bool FeedComplete { get; set; }
+
+        /// <summary>
+        /// 补料中
+        /// </summary>
+        [VariableMonitor("补料中", "M102.6", "1142")]
+        public bool Feeding { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
new file mode 100644
index 00000000..0957bda6
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
@@ -0,0 +1,322 @@
+using BPASmartClient.Device;
+using BPASmartClient.Model;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkSUpgradedVer
+{
+    public class GVL_MorkSUpgradedVer : IStatus
+    {
+        #region 临时变量
+        /// <summary>
+        /// 允许运行
+        /// </summary>
+        [VariableMonitor("允许运行")]
+        public bool AllowRun { get; set; }
+
+        /// <summary>
+        /// 优先级判断
+        /// </summary>
+        [VariableMonitor("优先级判断条件")]
+        public bool PriorityJudgment { get; set; }
+
+        /// <summary>
+        /// 机器人任务互锁信号,false:取面，true:出餐
+        /// </summary>
+        [VariableMonitor("机器人任务互锁信号")]
+        public bool RobotTaskInterlock { get; set; }
+
+        /// <summary>
+        /// 取碗互锁信号
+        /// </summary>
+        [VariableMonitor("取碗互锁信号")]
+        public bool TakeBowlInterlock { get; set; }
+
+        /// <summary>
+        /// 取面互锁信号
+        /// </summary>
+        [VariableMonitor("取面互锁信号")]
+        public bool TakeNoodleInterlock { get; set; }
+
+        /// <summary>
+        /// 出面中
+        /// </summary>
+        [VariableMonitor("出面中")]
+        public bool OutNoodleing { get; set; }
+
+        /// <summary>
+        /// 允许取面
+        /// </summary>
+        [VariableMonitor("允许取面")]
+        public bool AllowTakeNoodle { get; set; }
+
+        /// <summary>
+        /// 转台互锁信号
+        /// </summary>
+        [VariableMonitor("转台互锁信号")]
+        public bool TurntableInterlock { get; set; }
+
+
+        /// <summary>
+        /// 煮面炉状态,True:忙碌，false:空闲
+        /// </summary>
+        [VariableMonitor("煮面炉状态")]
+        public bool[] NoodleCookerStatus { get; set; } = new bool[6];
+
+        /// <summary>
+        /// 转台当前启动位置
+        /// </summary>
+        [VariableMonitor("转台当前启动位置")]
+        public ushort CurrentLoc { get; set; } = 0;
+
+        /// <summary>
+        /// 制作完成标志
+        /// </summary>
+        [VariableMonitor("制作完成标志")]
+        public bool CookCompleteFlatBit { get; set; }
+        #endregion
+
+        #region 列表数据
+        /// <summary>
+        /// 机器人取面位置队列
+        /// </summary>
+        public ConcurrentQueue<OrderLocInfo> RBTakeNoodleTask { get; set; } = new ConcurrentQueue<OrderLocInfo>();
+
+        /// <summary>
+        /// 出碗队列
+        /// </summary>
+        public ConcurrentQueue<OrderLocInfo> TakeBowlTask { get; set; } = new ConcurrentQueue<OrderLocInfo>();
+
+
+        public List<DoOrderEvent> doOrderEvents { get; set; } = new List<DoOrderEvent>();
+
+        public List<string> HistorySuborderId { get; set; } = new List<string>();
+        #endregion
+
+        #region 订单ID记录
+        /// <summary>
+        /// 取碗订单ID
+        /// </summary>
+        public string TakeBowlId { get; set; } = string.Empty;
+        /// <summary>
+        /// 取碗订单名称
+        /// </summary>
+        public string TakeBowName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 配料完成订单ID
+        /// </summary>
+        public string IngredientsCompleteId { get; set; } = string.Empty;
+        /// <summary>
+        /// 配料完成订单名称
+        /// </summary>
+        public string IngredientsCompleteName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 煮面口对应的订单ID
+        /// </summary>
+        public string[] CookNodelId { get; set; } = new string[6] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, };
+
+        /// <summary>
+        /// 出餐订单ID
+        /// </summary>
+        public string OutMealId { get; set; } = string.Empty;
+        /// <summary>
+        /// 出餐订单名称
+        /// </summary>
+        public string OutMealName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 转台位置轮询
+        /// </summary>
+        public List<ushort> TurntableLocLists { get; set; } = new List<ushort>();
+
+        #endregion
+
+        #region device Data
+        /// <summary>
+        /// 初始化启动
+        /// </summary>
+        [VariableMonitor("初始化启动", "M0.0", "320")]
+        public bool InitStart { get; set; }
+
+        /// <summary>
+        /// 初始化完成
+        /// </summary>
+        [VariableMonitor("初始化完成", "M0.1", "321")]
+        public bool InitComplete { get; set; }
+
+        /// <summary>
+        /// 移碗丝杆初始化完成
+        /// </summary>
+        [VariableMonitor("移碗丝杆初始化完成", "M0.2", "322")]
+        public bool MoveScrewRodInitCom { get; set; }
+
+        /// <summary>
+        /// 供碗1初始化完成
+        /// </summary>
+        [VariableMonitor("供碗1初始化完成", "M0.3", "323")]
+        public bool SacrificialVesselInitCom { get; set; }
+
+        /// <summary>
+        /// 气缸推杆初始化完成
+        /// </summary>
+        [VariableMonitor("气缸推杆初始化完成", "M0.4", "324")]
+        public bool CylinderInitCom { get; set; }
+
+        /// <summary>
+        /// 煮面机初始化完成
+        /// </summary>
+        [VariableMonitor("煮面机初始化完成", "M0.5", "325")]
+        public bool NoodleCookerInitCom { get; set; }
+
+        /// <summary>
+        /// 机器人初始化完成
+        /// </summary>
+        [VariableMonitor("机器人初始化完成", "M0.6", "326")]
+        public bool RobotInitCom { get; set; }
+
+        /// <summary>
+        /// 料仓初始化完成
+        /// </summary>
+        [VariableMonitor("料仓初始化完成", "M0.7", "327")]
+        public bool SiloInitCom { get; set; }
+
+        /// <summary>
+        /// 故障复位/停止
+        /// </summary>
+        [VariableMonitor("故障复位/停止", "M1.0", "328")]
+        public bool FaultResetOrStop { get; set; }
+
+        /// <summary>
+        /// 落碗1，大碗
+        /// </summary>
+        [VariableMonitor("落碗1，大碗", "M9.0", "392")]
+        public bool DropBowlOne { get; set; }
+
+        /// <summary>
+        /// 落碗2，一次性碗
+        /// </summary>
+        [VariableMonitor("落碗2，一次性碗", "M9.1", "393")]
+        public bool DropBowlTow { get; set; }
+
+        /// <summary>
+        /// 允许倒面
+        /// </summary>
+        [VariableMonitor("允许倒面", "M10.0", "400")]
+        public bool AllowInvertedFace { get; set; }
+
+        /// <summary>
+        /// 出餐完成
+        /// </summary>
+        [VariableMonitor("出餐完成", "M10.1", "401")]
+        public bool DiningComplete { get; set; }
+
+        /// <summary>
+        /// 落碗机构状态，1:忙碌 0:空闲
+        /// </summary>
+        [VariableMonitor("落碗机构状态，1:忙碌 0:空闲", "M10.4", "404")]
+        public bool DropBowlMechanismStatus { get; set; }
+
+        /// <summary>
+        /// 定位标志,1:忙碌 0:空闲
+        /// </summary>
+        [VariableMonitor("定位标志,1:忙碌 0:空闲", "M12.2", "418")]
+        public bool FixedFlag { get; set; }
+
+        /// <summary>
+        /// 定位启动
+        /// </summary>
+        [VariableMonitor("定位启动", "M12.3", "419")]
+        public bool FixedStart { get; set; }
+
+        /// <summary>
+        /// 料仓到位
+        /// </summary>
+        [VariableMonitor("料仓到位", "M13.5", "429")]
+        public bool SiloInPlace { get; set; }
+
+        /// <summary>
+        /// 机器人料仓取面完成
+        /// </summary>
+        [VariableMonitor("机器人去料仓取面完成", "M16.7", "455")]
+        public bool RobotTakeNoodleCom { get; set; }
+
+        /// <summary>
+        /// 机器人状态
+        /// </summary>
+        [VariableMonitor("机器人状态", "M17.4", "460")]
+        public bool RobotStatus { get; set; }
+
+        /// <summary>
+        /// 一次性碗有无检测
+        /// </summary>
+        [VariableMonitor("一次性碗有无检测", "M18.0", "464")]
+        public bool SmallBowlYesOrNoCheck { get; set; }
+
+        /// <summary>
+        /// 大碗有无检测
+        /// </summary>
+        [VariableMonitor("大碗有无检测", "M18.1", "465")]
+        public bool LargeBowYesOrNoCheck { get; set; }
+
+        /// <summary>
+        /// 转台高位
+        /// </summary>
+        [VariableMonitor("转台高位", "M18.2", "466")]
+        public bool TurntableHighPosition { get; set; }
+
+        /// <summary>
+        /// 转台低位
+        /// </summary>
+        [VariableMonitor("转台低位", "M18.3", "467")]
+        public bool TurntableLowPosition { get; set; }
+
+        /// <summary>
+        /// 煮面完成
+        /// </summary>
+        [VariableMonitor("煮面完成")]
+        public bool[] CookNoodleCom { get; set; } = new bool[6];
+
+        /// <summary>
+        /// 本地/远程
+        /// </summary>
+        [VariableMonitor("本地/远程")]
+        public bool LocalOrRemote { get; set; }
+
+        /// <summary>
+        /// 温度到达
+        /// </summary>
+        [VariableMonitor("温度到达")]
+        public bool TemperatureReaches { get; set; }
+
+        /// <summary>
+        /// 加热中
+        /// </summary>
+        [VariableMonitor("加热中")]
+        public bool Heating { get; set; }
+
+        /// <summary>
+        /// 转台当前位置
+        /// </summary>
+        [VariableMonitor("转台当前位置", "VW770", "870")]
+        public ushort CurrentFeedbackLoc { get; set; }
+
+        /// <summary>
+        /// 补料完成
+        /// </summary>
+        [VariableMonitor("补料完成", "M101.6", "1134")]
+        public bool FeedComplete { get; set; }
+
+        /// <summary>
+        /// 补料中
+        /// </summary>
+        [VariableMonitor("补料中", "M102.6", "1142")]
+        public bool Feeding { get; set; }
+        #endregion
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/GlobalUsing.cs b/BPASmartClient.MorkSUpgradedVer/GlobalUsing.cs
new file mode 100644
index 00000000..bb45abd5
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/GlobalUsing.cs
@@ -0,0 +1,26 @@
+global using System;
+global using System.Collections.Generic;
+global using BPA.Message.Enum;
+global using BPASmartClient.Device;
+global using BPASmartClient.EventBus;
+global using BPASmartClient.Model;
+global using BPASmartClient.Peripheral;
+global using static BPASmartClient.EventBus.EventBus;
+global using BPASmartClient.Helper;
+global using System.Threading;
+global using BPASmartClient.Message;
+global using BPA.Message;
+global using System.Linq;
+global using BPASmartClient.Model.PLC;
+global using System.Threading.Tasks;
+global using System.Reflection;
+global using BPASmartClient.MorkSUpgradedVer.Model;
+global using System.Collections.ObjectModel;
+global using BPASmartClient.MorkSUpgradedVer.ViewModel;
+global using BPASmartClient.Business;
+global using BPASmartClient.Model.小炒机;
+global using BPA.Models;
+global using System.Windows.Forms;
+global using System.Media;
+
+
diff --git a/BPASmartClient.MorkSUpgradedVer/Model/Global.cs b/BPASmartClient.MorkSUpgradedVer/Model/Global.cs
new file mode 100644
index 00000000..60fcc290
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/Model/Global.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkSUpgradedVer.Model
+{
+    public class Global
+    {
+        public static bool EnableLocalSimOrder { get; set; }
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs b/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs
new file mode 100644
index 00000000..ef2c0cb5
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs
@@ -0,0 +1,16 @@
+using BPASmartClient.Model;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace BPASmartClient.MorkSUpgradedVer.Model
+{
+    internal class MorksPar
+    {
+        public ObservableCollection<ParSet> parSets { get; set; } = new ObservableCollection<ParSet>();
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/Model/ParSet.cs b/BPASmartClient.MorkSUpgradedVer/Model/ParSet.cs
new file mode 100644
index 00000000..03261db1
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/Model/ParSet.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.Model
+{
+    public class ParSet 
+    {
+        public ushort Minute { get { return _mMinute; } set { _mMinute = value; } }
+        private ushort _mMinute;
+
+        public ushort Second { get { return _mSecond; } set { _mSecond = value; } }
+        private ushort _mSecond;
+
+
+        public bool IsShield { get { return _mIsShield; } set { _mIsShield = value; } }
+        private bool _mIsShield;
+
+
+        public string TextBlockContext { get { return _mTextBlockContext; } set { _mTextBlockContext = value; } }
+        private string _mTextBlockContext;
+
+        public string CheckBoxContext { get { return _mCheckBoxContext; } set { _mCheckBoxContext = value; } }
+        private string _mCheckBoxContext;
+
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/Model/WritePar.cs b/BPASmartClient.MorkSUpgradedVer/Model/WritePar.cs
new file mode 100644
index 00000000..320f399a
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/Model/WritePar.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkSUpgradedVer.Model
+{
+    public class WritePar
+    {
+        public string Address { get; set; }
+        public object Value { get; set; }
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/OrderLocInfo.cs b/BPASmartClient.MorkSUpgradedVer/OrderLocInfo.cs
new file mode 100644
index 00000000..823c6985
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/OrderLocInfo.cs
@@ -0,0 +1,23 @@
+using BPA.Message;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkSUpgradedVer
+{
+    public class OrderLocInfo
+    {
+        public string SuborderId { get; set; }
+        public ushort Loc { get; set; }
+        public ushort RecipeNumber { get; set; }
+        public int BatchingId { get; set; }
+        public string GoodName { get; set; }
+
+        public int RecipeId { get; set; }
+
+        public List<int> Recipes { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/View/Debug.xaml b/BPASmartClient.MorkSUpgradedVer/View/Debug.xaml
new file mode 100644
index 00000000..971e808f
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/View/Debug.xaml
@@ -0,0 +1,117 @@
+<UserControl
+    x:Class="BPASmartClient.MorkSUpgradedVer.View.Debug"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.MorkSUpgradedVer.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.MorkSUpgradedVer.ViewModel"
+    Name="调试界面"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:DebugViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <Style x:Key="TextboxStyle" TargetType="TextBox">
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="{StaticResource TitleBorderColor}" />
+            <Setter Property="Width" Value="150" />
+            <Setter Property="BorderBrush" Value="{StaticResource TitleBorderColor}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="CaretBrush" Value="Aqua" />
+        </Style>
+        <Style x:Key="CheckBox" TargetType="CheckBox">
+            <Setter Property="Foreground" Value="Aqua" />
+            <Setter Property="FontSize" Value="16" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="Margin" Value="10,0" />
+            <Setter Property="IsChecked" Value="False" />
+        </Style>
+    </UserControl.Resources>
+
+    <Grid Margin="20">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+        <StackPanel>
+            <StackPanel Margin="10,0,0,20" Orientation="Horizontal">
+                <TextBlock
+                    FontSize="18"
+                    Foreground="{StaticResource TitleBorderColor}"
+                    Text="面条位置：" />
+                <TextBox Style="{StaticResource TextboxStyle}" Text="{Binding NoodleLoc}" />
+                <CheckBox
+                    Background="White"
+                    Content="随机面条位置"
+                    IsChecked="{Binding IsNoodPositon}"
+                    Style="{StaticResource CheckBox}" />
+
+            </StackPanel>
+
+            <StackPanel Margin="10,0,0,20" Orientation="Horizontal">
+                <TextBlock
+                    FontSize="18"
+                    Foreground="{StaticResource TitleBorderColor}"
+                    Text="面碗位置：" />
+                <TextBox Style="{StaticResource TextboxStyle}" Text="{Binding BowlLoc}" />
+                <CheckBox
+                    Background="White"
+                    Content="随机面碗位置"
+                    IsChecked="{Binding IsBowPositon}"
+                    Style="{StaticResource CheckBox}" />
+                <CheckBox
+                    Background="White"
+                    Command="{Binding EnableLacalSimOrder}"
+                    Content="启用本地模拟功能"
+                    IsChecked="{Binding LocalSimOrder}"
+                    Style="{StaticResource CheckBox}" />
+            </StackPanel>
+
+            <StackPanel Orientation="Horizontal">
+                <Button
+                    Grid.Row="0"
+                    Width="170"
+                    HorizontalAlignment="Left"
+                    Command="{Binding SimOrderRandomCommand}"
+                    Content="启动随机模拟订单"
+                    Style="{StaticResource ButtonStyle}"
+                    Visibility="{Binding VisibilitySimOrder}" />
+                <Button
+                    Grid.Row="0"
+                    Width="170"
+                    HorizontalAlignment="Left"
+                    Command="{Binding SimOrderRandomCloseCommand}"
+                    Content="关闭随机模拟订单"
+                    Style="{StaticResource ButtonStyle}"
+                    Visibility="{Binding VisibilitySimOrder}" />
+                <Button
+                    Grid.Row="0"
+                    Width="130"
+                    HorizontalAlignment="Left"
+                    Command="{Binding SimOrderCommand}"
+                    Content="模拟订单"
+                    Style="{StaticResource ButtonStyle}"
+                    Visibility="{Binding VisibilitySimOrder}" />
+                <Button
+                    Grid.Row="0"
+                    Width="120"
+                    HorizontalAlignment="Left"
+                    Command="{Binding InitCommand}"
+                    Content="初始化设备"
+                    Style="{StaticResource ButtonStyle}" />
+            </StackPanel>
+        </StackPanel>
+
+
+
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.MorkSUpgradedVer/View/Debug.xaml.cs b/BPASmartClient.MorkSUpgradedVer/View/Debug.xaml.cs
new file mode 100644
index 00000000..1cd819ad
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/View/Debug.xaml.cs
@@ -0,0 +1,30 @@
+using BPASmartClient.MorkSUpgradedVer.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.MorkSUpgradedVer.View
+{
+    /// <summary>
+    /// Debug.xaml 的交互逻辑
+    /// </summary>
+    public partial class Debug : System.Windows.Controls.UserControl
+    {
+        public Debug()
+        {
+            InitializeComponent();
+        }
+
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/View/Monitor.xaml b/BPASmartClient.MorkSUpgradedVer/View/Monitor.xaml
new file mode 100644
index 00000000..03b96940
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/View/Monitor.xaml
@@ -0,0 +1,242 @@
+<UserControl
+    x:Class="BPASmartClient.MorkSUpgradedVer.View.Monitor"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.MorkSUpgradedVer.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.MorkSUpgradedVer.ViewModel"
+    Name="监控画面"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:MonitorViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <!--<convert:TextDisplayConvert x:Key="textDisplayConvert" />
+                    <convert:IsEnableConvert x:Key="isEnableConvert" />
+                    <convert:AnalogAlarmConvert x:Key="analogAlarmConvert" />
+                    <convert:DiscreteAlarmConvert x:Key="discreteAlarmConvert" />
+                    <convert:AlarmTypeTextConvert x:Key="alarmTypeTextConvert" />-->
+                    <SolidColorBrush x:Key="BorderSolid" Color="#5523CACA" />
+                    <SolidColorBrush x:Key="FontColor" Color="#FF2AB2E7" />
+                    <SolidColorBrush x:Key="TitleFontColor" Color="#ddd" />
+                    <SolidColorBrush x:Key="CursorColor" Color="Aqua" />
+                    <SolidColorBrush x:Key="TitleBorderColor" Color="#FF2AB2E7" />
+
+                    <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="18" />
+                        <Setter Property="Foreground" Value="{StaticResource TextBlockForeground}" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                        <Setter Property="HorizontalAlignment" Value="Center" />
+                    </Style>
+
+                    <Style x:Key="TextBoxStyle" TargetType="TextBox">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="22" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Foreground" Value="{StaticResource TextBlockForeground}" />
+                        <Setter Property="BorderBrush" Value="#FF23CACA" />
+                        <Setter Property="CaretBrush" Value="Aqua" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="30" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+        <!--#region 表格标题栏设置-->
+        <Grid Background="#dd2AB2E7">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="0.3*" />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition Width="0.7*" />
+                <ColumnDefinition Width="0.7*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                Grid.Column="0"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="{StaticResource TitleFontColor}"
+                Text="ID" />
+
+            <Grid Grid.Column="1">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Foreground="{StaticResource TitleFontColor}"
+                    Text="变量名" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>
+
+            <TextBlock
+                Grid.Column="2"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="{StaticResource TitleFontColor}"
+                Text="PLC 地址" />
+
+
+            <Grid Grid.Column="3">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Foreground="{StaticResource TitleFontColor}"
+                    Text="注释" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="1,0,0,0"
+                    Cursor="SizeWE" />
+            </Grid>
+
+
+
+            <Grid Grid.Column="4">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Foreground="{StaticResource TitleFontColor}"
+                    Text="Modbus TCP 地址" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>
+
+            <TextBlock
+                Grid.Column="5"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="{StaticResource TitleFontColor}"
+                Text="当前值" />
+
+        </Grid>
+        <!--#endregion-->
+
+        <!--#region 表格数据显示-->
+        <ScrollViewer
+            Grid.Row="1"
+            HorizontalScrollBarVisibility="Hidden"
+            VerticalScrollBarVisibility="Hidden">
+            <ItemsControl ItemsSource="{Binding variableMonitors}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Grid x:Name="gr" Height="30">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="0.3*" />
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="0.7*" />
+                                <ColumnDefinition Width="0.7*" />
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock
+                                Grid.Column="0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                FontSize="14"
+                                Foreground="{StaticResource FontColor}"
+                                Text="{Binding Id}" />
+
+                            <Grid Grid.Column="1">
+                                <TextBlock
+                                    Margin="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    FontSize="14"
+                                    Foreground="{StaticResource FontColor}"
+                                    Text="{Binding VarName}" />
+                                <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
+                            </Grid>
+
+
+                            <TextBlock
+                                Grid.Column="2"
+                                Margin="5,0,0,0"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                FontSize="14"
+                                Foreground="{StaticResource FontColor}"
+                                Text="{Binding PLCAddress}" />
+
+                            <Grid Grid.Column="3">
+                                <TextBlock
+                                    Margin="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    FontSize="14"
+                                    Foreground="{StaticResource FontColor}"
+                                    Text="{Binding Notes}" />
+                                <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,0,0" />
+                            </Grid>
+
+                            <Grid Grid.Column="4">
+                                <TextBlock
+                                    Margin="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    FontSize="14"
+                                    Foreground="{StaticResource FontColor}"
+                                    Text="{Binding ModbusTcpAddress}" />
+                                <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
+                            </Grid>
+
+                            <TextBlock
+                                Grid.Column="5"
+                                Margin="5,0,0,0"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                FontSize="14"
+                                Foreground="{StaticResource FontColor}"
+                                Text="{Binding CurrentValue}" />
+
+                            <Border
+                                Grid.ColumnSpan="8"
+                                BorderBrush="{StaticResource BorderSolid}"
+                                BorderThickness="1" />
+
+                        </Grid>
+
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                            </Trigger>
+                        </DataTemplate.Triggers>
+
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </ScrollViewer>
+        <!--#endregion-->
+
+
+    </Grid>
+
+</UserControl>
diff --git a/BPASmartClient.MorkSUpgradedVer/View/Monitor.xaml.cs b/BPASmartClient.MorkSUpgradedVer/View/Monitor.xaml.cs
new file mode 100644
index 00000000..85719274
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/View/Monitor.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.MorkSUpgradedVer.View
+{
+    /// <summary>
+    /// Monitor.xaml 的交互逻辑
+    /// </summary>
+    public partial class Monitor : System.Windows.Controls.UserControl
+    {
+        public Monitor()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml b/BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml
new file mode 100644
index 00000000..eb833a3a
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml
@@ -0,0 +1,130 @@
+<UserControl
+    x:Class="BPASmartClient.MorkSUpgradedVer.View.ParSet"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.MorkSUpgradedVer.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.MorkSUpgradedVer.ViewModel"
+    Name="参数设置界面"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:ParSetViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="18" />
+                        <Setter Property="Foreground" Value="{StaticResource TextBlockForeground}" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                        <Setter Property="HorizontalAlignment" Value="Center" />
+                    </Style>
+
+                    <Style x:Key="TextBoxStyle" TargetType="TextBox">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="22" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Foreground" Value="{StaticResource TextBlockForeground}" />
+                        <Setter Property="BorderBrush" Value="#FF23CACA" />
+                        <Setter Property="CaretBrush" Value="Aqua" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+
+    </UserControl.Resources>
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="35" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+
+            <TextBlock Style="{StaticResource TextBlockStyle}" Text="请点击按钮保存参数：" />
+
+            <pry:IcoButton
+                Grid.Column="5"
+                Width="140"
+                HorizontalAlignment="Left"
+                Command="{Binding SaveInfoCommand}"
+                Content="保存配置"
+                FontSize="16"
+                IcoText="&#xe936;"
+                Style="{StaticResource IcoButtonStyle}">
+                <pry:IcoButton.Foreground>
+                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                        <GradientStop Color="#FFBB662A" />
+                        <GradientStop Offset="1" Color="White" />
+                    </LinearGradientBrush>
+                </pry:IcoButton.Foreground>
+            </pry:IcoButton>
+
+
+        </StackPanel>
+
+        <!--  参数放置面板  -->
+        <Grid Grid.Row="2">
+            <ItemsControl ItemsSource="{Binding parSets}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="{Binding TextBlockContext}" />
+                            <TextBox
+                                Width="100"
+                                Margin="10,0,0,0"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                BorderBrush="#FF23CACA"
+                                CaretBrush="Aqua"
+                                FontFamily="楷体"
+                                FontSize="21"
+                                Foreground="#ff34f7f7"
+                                Text="{Binding Minute}" />
+                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="（分）" />
+                            <TextBox
+                                Width="100"
+                                Margin="0,10"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                BorderBrush="#FF23CACA"
+                                CaretBrush="Aqua"
+                                FontFamily="楷体"
+                                FontSize="21"
+                                Foreground="#ff34f7f7"
+                                Text="{Binding Second}" />
+                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="（秒）" />
+
+                            <CheckBox
+                                Height="20"
+                                Margin="10"
+                                VerticalAlignment="Center"
+                                Background="#FF2AB2E7"
+                                Content="{Binding CheckBoxContext}"
+                                FontSize="14"
+                                Foreground="#00c2f4"
+                                IsChecked="{Binding IsShield}"
+                                Template="{StaticResource CbTemplate}" />
+
+                        </StackPanel>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+
+        </Grid>
+
+    </Grid>
+
+
+</UserControl>
diff --git a/BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml.cs b/BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml.cs
new file mode 100644
index 00000000..c3b5620b
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.MorkSUpgradedVer.View
+{
+    /// <summary>
+    /// ParSet.xaml 的交互逻辑
+    /// </summary>
+    public partial class ParSet : System.Windows.Controls.UserControl
+    {
+        public ParSet()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkSUpgradedVer/ViewModel/DebugViewModel.cs
new file mode 100644
index 00000000..3316d1d9
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/ViewModel/DebugViewModel.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BPASmartClient.Helper;
+using BPASmartClient.Model;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using BPASmartClient.EventBus;
+using BPASmartClient.MorkSUpgradedVer.Model;
+using System.Windows;
+using BPASmartClient.Message;
+
+namespace BPASmartClient.MorkSUpgradedVer.ViewModel
+{
+    public class DebugViewModel : ObservableObject
+    {
+        public DebugViewModel()
+        {
+            InitCommand = new RelayCommand(() => { 
+                ActionManage.GetInstance.Send("InitDevice"); 
+                ActionManage.GetInstance.Send("初始化设定煮面时间"); 
+            });
+            SimOrderCommand = new RelayCommand(() =>
+            {
+                new MorksSimorderModel() { Bowloc = this.BowlLoc, NoodleLoc = this.NoodleLoc }.Publish();
+               
+            });
+            SimOrderRandomCommand = new RelayCommand(() =>
+            {
+                int NoodPosition = 0;
+                int BowPosion = 0;
+                NoodPosition = IsNoodPositon == true ? 0 : NoodleLoc;
+                BowPosion = IsBowPositon == true ? 0 : BowlLoc;
+                ActionManage.GetInstance.Send("EnableForOrder", new object[] { NoodPosition, BowPosion });
+            });
+            SimOrderRandomCloseCommand = new RelayCommand(() =>
+            {
+                ThreadManage.GetInstance().StopTask("ForOrder");
+                MessageLog.GetInstance.Show("停止模拟随机订单");
+            });
+            EnableLacalSimOrder = new RelayCommand(() =>
+            {
+                Global.EnableLocalSimOrder = LocalSimOrder;
+                VisibilitySimOrder = LocalSimOrder == true ? Visibility.Visible : Visibility.Collapsed;
+            });
+            VisibilitySimOrder = LocalSimOrder == true? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public RelayCommand InitCommand { get; set; }
+
+        public RelayCommand SimOrderCommand { get; set; }
+
+        public RelayCommand SimOrderRandomCommand { get; set; }
+
+        public RelayCommand SimOrderRandomCloseCommand { get; set; }
+
+        public RelayCommand EnableLacalSimOrder { get; set; }
+        public int NoodleLoc { get { return _mNoodleLoc; } set { _mNoodleLoc = value; OnPropertyChanged(); } }
+        private int _mNoodleLoc = 1;
+
+
+        public int BowlLoc { get { return _mBowlLoc; } set { _mBowlLoc = value; OnPropertyChanged(); } }
+        private int _mBowlLoc = 10;
+
+        public bool IsNoodPositon { get { return _isNoodPositon; } set { _isNoodPositon = value; OnPropertyChanged(); } }
+        private bool _isNoodPositon = false;
+
+        public bool IsBowPositon { get { return _isBowPositon; } set { _isBowPositon = value; OnPropertyChanged(); } }
+        private bool _isBowPositon = false;
+
+        public bool LocalSimOrder { get { return _localSimOrder; } set { _localSimOrder = value; OnPropertyChanged(); } }
+        private bool _localSimOrder = Global.EnableLocalSimOrder;
+
+        public Visibility VisibilitySimOrder { get { return _visibilitySimOrder; } set { _visibilitySimOrder = value; OnPropertyChanged(); } }
+        private Visibility _visibilitySimOrder;
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkSUpgradedVer/ViewModel/MonitorViewModel.cs
new file mode 100644
index 00000000..365ee581
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/ViewModel/MonitorViewModel.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BPASmartClient.Business;
+using BPASmartClient.Device;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.MorkSUpgradedVer.ViewModel
+{
+    public class MonitorViewModel : ObservableObject
+    {
+        public MonitorViewModel()
+        {
+
+        }
+
+        public static int DeviceId { get; set; }
+
+        public ObservableCollection<VariableMonitor> variableMonitors { get; set; } = Plugin.GetInstance()?.GetPlugin<DeviceMgr>()?.GetDevices()?.FirstOrDefault(p => p.DeviceId == DeviceId)?.variableMonitors;
+
+    }
+}
diff --git a/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs
new file mode 100644
index 00000000..0aa320c6
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BPASmartClient.Helper;
+using BPASmartClient.Model;
+using BPASmartClient.MorkSUpgradedVer.Model;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+
+namespace BPASmartClient.MorkSUpgradedVer.ViewModel
+{
+    public class ParSetViewModel : ObservableObject
+    {
+        public ParSetViewModel()
+        {
+            SaveInfoCommand = new RelayCommand(SaveSettingData);
+
+            ActionManage.GetInstance.Register(SaveSettingData, "初始化设定煮面时间");
+            
+        }
+
+        public RelayCommand SaveInfoCommand { get; set; }
+
+        public ObservableCollection<ParSet> parSets { get; set; } = Json<MorksPar>.Data.parSets;
+
+        private void SaveSettingData()
+        {
+            List<ushort> values = new List<ushort>();
+            values.Clear();
+
+            List<bool> bools = new List<bool>();
+            bools.Clear();
+
+            for (int i = 0; i < Json<MorksPar>.Data.parSets.Count; i++)
+            {
+                values.Clear();
+                values.Add(Json<MorksPar>.Data.parSets[i].Minute);
+                values.Add(Json<MorksPar>.Data.parSets[i].Second);
+                bools.Add(Json<MorksPar>.Data.parSets[i].IsShield);
+                ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = $"VW{116 + (i * 6)}", Value = values.ToArray() });
+            }
+            ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M260.0", Value = bools.ToArray() });
+            Json<MorksPar>.Save();
+        }
+    }
+}
diff --git a/BPASmartClient/BPASmartClient.csproj b/BPASmartClient/BPASmartClient.csproj
index f1d75a84..b1233974 100644
--- a/BPASmartClient/BPASmartClient.csproj
+++ b/BPASmartClient/BPASmartClient.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Message" Version="1.0.84" />
+    <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
   </ItemGroup>
 
@@ -35,6 +35,7 @@
     <ProjectReference Include="..\BPASmartClient.MorkF\BPASmartClient.MorkF.csproj" />
     <ProjectReference Include="..\BPASmartClient.MorkMW\BPASmartClient.MorkMW.csproj" />
     <ProjectReference Include="..\BPASmartClient.MorkM\BPASmartClient.MorkM.csproj" />
+    <ProjectReference Include="..\BPASmartClient.MorkSUpgradedVer\BPASmartClient.MorkSUpgradedVer.csproj" />
     <ProjectReference Include="..\BPASmartClient.MorkS\BPASmartClient.MorkS.csproj" />
     <ProjectReference Include="..\BPASmartClient.Morkt.JAKA.JC\BPASmartClient.MorkTJAKAJC.csproj" />
     <ProjectReference Include="..\BPASmartClient.MorkT.Lebai.JC\BPASmartClient.MorkTLebaiJC.csproj" />
diff --git a/DosingSystem/BPASmartClient.DosingSystem.csproj b/DosingSystem/BPASmartClient.DosingSystem.csproj
index 79ca5779..9616088a 100644
--- a/DosingSystem/BPASmartClient.DosingSystem.csproj
+++ b/DosingSystem/BPASmartClient.DosingSystem.csproj
@@ -22,7 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.Helper" Version="1.0.28" />
-    <PackageReference Include="BPA.Message" Version="1.0.84" />
+    <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
diff --git a/SmartClient.sln b/SmartClient.sln
index 2dd4ef5d..7546aa88 100644
--- a/SmartClient.sln
+++ b/SmartClient.sln
@@ -202,7 +202,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.DosingSystem
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "设备监控", "设备监控", "{106E84C1-CAC5-4F14-9E31-201D3202C9FD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.MaxWokControl", "BPASmartClient.MaxWokControl\BPASmartClient.MaxWokControl.csproj", "{888382C0-6750-4E81-BED3-0F38775DCCCB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MaxWokControl", "BPASmartClient.MaxWokControl\BPASmartClient.MaxWokControl.csproj", "{888382C0-6750-4E81-BED3-0F38775DCCCB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.MorkSUpgradedVer", "BPASmartClient.MorkSUpgradedVer\BPASmartClient.MorkSUpgradedVer.csproj", "{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1898,6 +1900,26 @@ Global
 		{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|x64.Build.0 = Release|Any CPU
 		{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|x86.ActiveCfg = Release|Any CPU
 		{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|x86.Build.0 = Release|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Debug|ARM.Build.0 = Debug|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Debug|x64.Build.0 = Debug|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Debug|x86.Build.0 = Debug|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Release|ARM.Build.0 = Release|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Release|ARM64.Build.0 = Release|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Release|x64.ActiveCfg = Release|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Release|x64.Build.0 = Release|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Release|x86.ActiveCfg = Release|Any CPU
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1992,6 +2014,7 @@ Global
 		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
 		{106E84C1-CAC5-4F14-9E31-201D3202C9FD} = {7BE13E55-D8B1-4232-AE63-8BF122633297}
 		{888382C0-6750-4E81-BED3-0F38775DCCCB} = {106E84C1-CAC5-4F14-9E31-201D3202C9FD}
+		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC}

From cae9181627c17d9a94294ae7bc495dfb5013b910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Wed, 15 Feb 2023 17:29:20 +0800
Subject: [PATCH 05/96] =?UTF-8?q?=E7=85=AE=E9=9D=A2=E6=9C=BA=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Control_MorkSUpgradedVer.cs               | 102 +++++++++++-------
 .../GVL_MorkSUpgradedVer.cs                   |  14 ++-
 BPASmartClient/App.config                     |  24 ++---
 3 files changed, 88 insertions(+), 52 deletions(-)

diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index f20d6c65..1cc13130 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -22,6 +22,7 @@ using BPASmartClient.Model.小炒机;
 using BPA.Models;
 using System.Windows.Forms;
 using System.Media;
+//using BPA.Helper;
 
 namespace BPASmartClient.MorkSUpgradedVer
 {
@@ -200,6 +201,7 @@ namespace BPASmartClient.MorkSUpgradedVer
              {
                  if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 7)
                  {
+                     Initing = !bools[0];
                      mORKS.InitComplete = bools[0];
                      mORKS.MoveScrewRodInitCom = bools[1];
                      mORKS.SacrificialVesselInitCom = bools[2];
@@ -208,13 +210,13 @@ namespace BPASmartClient.MorkSUpgradedVer
                      mORKS.RobotInitCom = bools[5];
                      mORKS.SiloInitCom = bools[6];
 
-                     alarm.DeviceNoInit = mORKS.InitComplete;
-                     alarm.MoveScrewRodNoInit = mORKS.MoveScrewRodInitCom;
-                     alarm.SacrificialVesselNoInit = mORKS.SacrificialVesselInitCom;
-                     alarm.CylinderNoInit = mORKS.CylinderInitCom;
-                     alarm.NoodleCookerNoInit = mORKS.NoodleCookerInitCom;
-                     alarm.RobotNoInit = mORKS.RobotInitCom;
-                     alarm.SiloNoInit = mORKS.SiloInitCom;
+                     alarm.DeviceNoInit = !mORKS.InitComplete;
+                     alarm.MoveScrewRodNoInit = !mORKS.MoveScrewRodInitCom;
+                     alarm.SacrificialVesselNoInit = !mORKS.SacrificialVesselInitCom;
+                     alarm.CylinderNoInit = !mORKS.CylinderInitCom;
+                     alarm.NoodleCookerNoInit = !mORKS.NoodleCookerInitCom;
+                     alarm.RobotNoInit = !mORKS.RobotInitCom;
+                     alarm.SiloNoInit = !mORKS.SiloInitCom;
                  }
              }));
 
@@ -284,12 +286,23 @@ namespace BPASmartClient.MorkSUpgradedVer
             {
                 if (obj is ushort[] ushorts && ushorts.Length > 0 && ushorts.Length <= 1)
                 {
-                    mORKS.CookNoodleCom[0] = ushorts[0].GetBitValue(1);
-                    mORKS.CookNoodleCom[1] = ushorts[0].GetBitValue(2);
-                    mORKS.CookNoodleCom[2] = ushorts[0].GetBitValue(3);
-                    mORKS.CookNoodleCom[3] = ushorts[0].GetBitValue(4);
-                    mORKS.CookNoodleCom[4] = ushorts[0].GetBitValue(5);
-                    mORKS.CookNoodleCom[5] = ushorts[0].GetBitValue(6);
+                    var tt = ushorts.UshortsToBytes(true).BytesToUshorts();
+
+                    for (byte i = 0; i < 6; i++)
+                    {
+                        if (RTrig.GetInstance($"CookNoodleCom{i + 1}").Start(tt[0].GetBitValue((byte)(i + 1))))
+                        {
+                            if (!string.IsNullOrEmpty(mORKS.CookNodelId[i]))
+                                mORKS.CookNoodleCom[i] = true;
+                        }
+                    }
+
+                    //mORKS.CookNoodleCom[0] = tt[0].GetBitValue(1);
+                    //mORKS.CookNoodleCom[1] = tt[0].GetBitValue(2);
+                    //mORKS.CookNoodleCom[2] = tt[0].GetBitValue(3);
+                    //mORKS.CookNoodleCom[3] = tt[0].GetBitValue(4);
+                    //mORKS.CookNoodleCom[4] = tt[0].GetBitValue(5);
+                    //mORKS.CookNoodleCom[5] = tt[0].GetBitValue(6);
                     mORKS.Heating = ushorts[0].GetBitValue(15);
                     mORKS.TemperatureReaches = ushorts[0].GetBitValue(16);
 
@@ -306,6 +319,10 @@ namespace BPASmartClient.MorkSUpgradedVer
                 }
 
             }));
+
+            mORKS.TakeBowlTaskCount = mORKS.TakeBowlTask.Count;
+            mORKS.RBTakeNoodleTaskCount = mORKS.RBTakeNoodleTask.Count;
+
         }
 
         /// <summary>
@@ -406,7 +423,6 @@ namespace BPASmartClient.MorkSUpgradedVer
         {
             if (mORKS.AllowRun && mORKS.TakeBowlTask.Count > 0 && !mORKS.DropBowlMechanismStatus && !mORKS.TakeBowlInterlock)
             {
-                DeviceProcessLogShow("开始取碗流程");
                 ushort BowLoc = 0;
                 var res = orderMaterialDelivery?.BatchingInfo?.Where(p => p.BatchingId == mORKS.TakeBowlTask.ElementAt(0).BatchingId).ToList();
                 if (res == null || res?.Count == 0)
@@ -419,12 +435,12 @@ namespace BPASmartClient.MorkSUpgradedVer
                     {
                         if (ushort.TryParse(item.BatchingLoc, out ushort loc))
                         {
-                            if (loc == 10 && !mORKS.SmallBowlYesOrNoCheck)
+                            if (loc == 10 && mORKS.SmallBowlYesOrNoCheck)
                             {
                                 BowLoc = loc;
                                 break;
                             }
-                            else if (loc == 11 && !mORKS.LargeBowYesOrNoCheck)
+                            else if (loc == 11 && mORKS.LargeBowYesOrNoCheck)
                             {
                                 BowLoc = loc;
                                 break;
@@ -491,7 +507,7 @@ namespace BPASmartClient.MorkSUpgradedVer
                                         {
                                             if (!mORKS.TurntableLowPosition)
                                             {
-                                                //WriteData("M32.7", false);
+                                                //WriteData("M32.7", false); 定位完成复位
                                                 DeviceProcessLogShow($"执行了转台启动互锁信号复位");
                                             }
                                             TurntableStart(loc);
@@ -518,7 +534,7 @@ namespace BPASmartClient.MorkSUpgradedVer
             //转台到位检测
             if (RTrig.GetInstance("TurntableInPlace").Start(mORKS.SiloInPlace && mORKS.CurrentLoc == mORKS.CurrentFeedbackLoc))
             {
-                mORKS.CurrentLoc = 0;
+
                 mORKS.TurntableInterlock = false;
                 DeviceProcessLogShow("转台到位检测");
             }
@@ -544,25 +560,31 @@ namespace BPASmartClient.MorkSUpgradedVer
             //取面控制
             if (mORKS.AllowRun && mORKS.RobotStatus && !mORKS.Feeding && !mORKS.RobotTaskInterlock && mORKS.AllowTakeNoodle && mORKS.SiloInPlace && !mORKS.TakeNoodleInterlock && mORKS.RBTakeNoodleTask.Count > 0)
             {
-                int loc = Array.FindIndex(mORKS.NoodleCookerStatus, p => p == false);//查找煮面炉空闲位置
-                if (loc >= 0 && loc <= 5)
+                if (mORKS.CurrentLoc == mORKS.CurrentFeedbackLoc)
                 {
-                    if (!Json<MorksPar>.Data.parSets.ElementAt(loc).IsShield)//检查该煮面篮是否被屏蔽
+                    int loc = Array.FindIndex(mORKS.NoodleCookerStatus, p => p == false);//查找煮面炉空闲位置
+                    if (loc >= 0 && loc <= 5)
                     {
-                        if (mORKS.RBTakeNoodleTask.TryDequeue(out OrderLocInfo orderLocInfo))
+                        if (!Json<MorksPar>.Data.parSets.ElementAt(loc).IsShield)//检查该煮面篮是否被屏蔽
                         {
-                            mORKS.CookNodelId[loc] = orderLocInfo.SuborderId;
-                            mORKS.NoodleCookerStatus[loc] = true;
-                            SetFallNoodleLoc((ushort)(loc + 1));
-                            //机器人开始取面
-                            OrderChange(orderLocInfo.SuborderId, ORDER_STATUS.COOKING);
-                            DeviceProcessLogShow($"订单【{orderLocInfo.SuborderId}】,机器人倒面至【{loc + 1}】号煮面栏");
-                            //写入煮面时间
-                            List<ushort> values = new List<ushort>();
-                            values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
-                            values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
-                            WriteData($"VW{320 + (loc * 4)}", values.ToArray());
-                            mORKS.TakeNoodleInterlock = true;
+                            if (mORKS.RBTakeNoodleTask.TryDequeue(out OrderLocInfo orderLocInfo))
+                            {
+                                //写入煮面时间
+                                List<ushort> values = new List<ushort>();
+                                values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
+                                values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
+                                WriteData($"VW{324 + (loc * 4)}", values.ToArray());
+
+                                mORKS.CurrentLoc = 0;
+                                mORKS.CookNodelId[loc] = orderLocInfo.SuborderId;
+                                mORKS.NoodleCookerStatus[loc] = true;
+                                SetFallNoodleLoc((ushort)(loc + 1));
+                                //机器人开始取面
+                                OrderChange(orderLocInfo.SuborderId, ORDER_STATUS.COOKING);
+                                DeviceProcessLogShow($"订单【{orderLocInfo.SuborderId}】,机器人倒面至【{loc + 1}】号煮面栏");
+
+                                mORKS.TakeNoodleInterlock = true;
+                            }
                         }
                     }
                 }
@@ -583,15 +605,16 @@ namespace BPASmartClient.MorkSUpgradedVer
                     {
                         SetTakeNoodleLoc((ushort)(loc + 1));
                         mORKS.NoodleCookerStatus[loc] = false;
-                        WriteData($"VW260", 0);//设置出汤时间
-                        OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_COOK);
-                        DeviceProcessLogShow($"订单【{mORKS.OutMealId}】制作完成");
+                        WriteData($"VW260", (ushort)0);//设置出汤时间
+                        OrderChange(mORKS.IngredientsCompleteId, ORDER_STATUS.COMPLETED_COOK);
+                        DeviceProcessLogShow($"订单【{mORKS.IngredientsCompleteId}】制作完成");
                         mORKS.CookCompleteFlatBit = true;
                         mORKS.OutMealId = mORKS.IngredientsCompleteId;
                         mORKS.OutMealName = mORKS.IngredientsCompleteName;
                         mORKS.IngredientsCompleteId = string.Empty;
                         mORKS.CookNodelId[loc] = string.Empty;
                         DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{mORKS.OutMealId}");
+                        mORKS.CookNoodleCom[loc] = false;
                     }
                 }
             }
@@ -614,10 +637,11 @@ namespace BPASmartClient.MorkSUpgradedVer
             }
 
             //取餐完成逻辑处理
-            if (Delay.GetInstance("CompleteChange1").Start(!mORKS.DiningComplete, 1) && mORKS.CookCompleteFlatBit == true)
+            if (RTrig.GetInstance("CompleteChange1").Start(mORKS.DiningComplete) && mORKS.CookCompleteFlatBit == true)
             {
                 OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
                 DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成");
+                WriteData("M10.1", false);
                 mORKS.CookCompleteFlatBit = false;
                 mORKS.OutMealId = string.Empty;
                 mORKS.OutMealName = string.Empty;
@@ -721,7 +745,7 @@ namespace BPASmartClient.MorkSUpgradedVer
         private void SetTakeNoodleLoc(ushort loc)
         {
             if (loc >= 1 && loc <= 6)
-                WriteData($"M16.{loc - 1}", true);
+                WriteData($"M15.{loc - 1}", true);
         }
 
 
diff --git a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
index 0957bda6..159574ed 100644
--- a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
@@ -78,6 +78,18 @@ namespace BPASmartClient.MorkSUpgradedVer
         /// </summary>
         [VariableMonitor("制作完成标志")]
         public bool CookCompleteFlatBit { get; set; }
+
+        /// <summary>
+        /// 取碗任务数量
+        /// </summary>
+        [VariableMonitor("取碗任务数量")]
+        public int TakeBowlTaskCount { get; set; }
+
+        /// <summary>
+        /// 取面任务数量
+        /// </summary>
+        [VariableMonitor("取面任务数量")]
+        public int RBTakeNoodleTaskCount { get; set; }
         #endregion
 
         #region 列表数据
@@ -108,7 +120,7 @@ namespace BPASmartClient.MorkSUpgradedVer
         public string TakeBowName { get; set; } = string.Empty;
 
         /// <summary>
-        /// 配料完成订单ID
+        /// 允许倒面位置ID
         /// </summary>
         public string IngredientsCompleteId { get; set; } = string.Empty;
         /// <summary>
diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index 04f363c3..9c45fe12 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -4,12 +4,12 @@
 
     <!--通用配置-->
     <!--<add key="ClientId" value="43"/>-->
-    <add key="IsEnableTest" value="true"/>
+    <add key="IsEnableTest" value="false"/>
 
     <!--测试环境-->
-    <add key="apollouri" value="http://10.2.1.21:28080/"/>
+    <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
     <add key="AppId" value="test1_HostComputer"/>
-    <add key ="Namespaces" value="DEV.test1.Config"/>
+    <add key ="Namespaces" value="DEV.test1.Config"/>-->
 
     <!--开发环境-->
     <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
@@ -17,9 +17,9 @@
     <add key ="Namespaces" value="DEV.Config"/>-->
 
     <!--正式环境-->
-    <!--<add key="apollouri" value="http://47.108.65.220:28080/"/>
+    <add key="apollouri" value="http://47.108.65.220:28080/"/>
     <add key="appid" value="hostcomputer"/>
-    <add key ="namespaces" value="test1.config"/>-->
+    <add key ="namespaces" value="test1.config"/>
 
     <!--阿里云上报启动方式:API 或者 LOCAL-->
     <!--API  :通过客户端ID,调用接口查询“设备连接信息”-->
@@ -29,7 +29,7 @@
     <add key="DeviceName" value="qsqdzklb"/>
     <add key="DeviceSecret" value="e2b300892c3e21469c8dc6c7c5c4430d"/>
     <add key="PasswordBox" value="6WrKhYmTIhLV7g24jIH/lg=="/>
-    
+
 
     <!--外设配置-->
     <add key="COM_Coffee" value="COM3"/>
@@ -39,12 +39,12 @@
     <add key="IceCream_CXB_Threshold" value="90"/>
     <add key="COM_ICChip" value="COM6"/>
     <add key="BAUD_IChip" value="9600"/>
-	  
-	<!--大屏MQTT-->
-	  <add key="MQTT_DevieScreem_IP" value="171.221.208.23"/>
-	  <add key="MQTT_DevieScreem_Port" value="11883"/>
-	  <add key="MQTT_DevieScreem_User" value="admin"/>
-	  <add key="MQTT_DevieScreem_Password" value="public1"/>
+
+    <!--大屏MQTT-->
+    <add key="MQTT_DevieScreem_IP" value="171.221.208.23"/>
+    <add key="MQTT_DevieScreem_Port" value="11883"/>
+    <add key="MQTT_DevieScreem_User" value="admin"/>
+    <add key="MQTT_DevieScreem_Password" value="public1"/>
 
 
   </appSettings>

From 24a7495fb68da6017ae417ac0b2aa26886e34380 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Wed, 15 Feb 2023 19:35:20 +0800
Subject: [PATCH 06/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.JAKA/JakaMachine.cs            |  20 +-
 .../Model/GVL_BigStation.cs                   |   2 +
 .../Model/HK_PLC/HKDeviceStatus.cs            |   1 +
 .../Model/ProcessControl.cs                   | 340 +++++--
 .../Model/RawMaterial/RecipeData.cs           |  10 +
 .../View/RecipeInfosView.xaml                 |   2 +-
 .../View/RecipeReceiveView.xaml               | 114 ++-
 .../View/RecipeSendDownView.xaml              | 127 ++-
 .../View/SiemensRecipeSendDownView.xaml       |   4 +-
 .../View/StockBinRawMaterialView.xaml         |   1 -
 .../ViewModel/ManualFlowViewModel.cs          |   1 +
 .../ViewModel/RecipeInfosViewModel.cs         |  31 +-
 .../SiemensRecipeSendDownViewModel.cs         |   1 -
 .../ViewModel/StockBinRawMaterialViewModel.cs |   4 +
 .../App.xaml.cs                               |   8 +-
 .../BPASmartClient.JXJFoodSmallStation.csproj |   7 +
 .../Model/GVL_SmallStation.cs                 |   4 +
 .../Model/HK_PLC/PlcReadAddressDB3.cs         |  15 +
 .../Model/ProcessControl.cs                   |  90 +-
 .../Model/RawMaterial/DevicePar.cs            |   2 +
 .../Model/RawMaterial/RawMaterialStockBin.cs  |  29 +
 .../View/ManualFlowView.xaml                  |  44 +-
 .../View/StockBinRawMaterialView.xaml         | 138 +++
 .../View/StockBinRawMaterialView.xaml.cs      |  28 +
 .../ViewModel/ManualFlowViewModel.cs          |  53 ++
 .../ViewModel/StockBinRawMaterialViewModel.cs |  55 ++
 .../BPASmartClient.JakaRobot.csproj           |   1 +
 BPASmartClient.JakaRobot/JaKaHelper.cs        |  69 +-
 .../BPASmartClient.MilkTeaCube.csproj         |  14 +
 .../MilkTeaCubeMachine.cs                     |  90 ++
 .../BPASmartClient.MilkTeaCubeHelper.csproj   |   9 +
 BPASmartClient.MilkTeaCubeHelper/Class1.cs    |   8 +
 .../奶茶味魔方/MilkTeaCubeEvent.cs       |  13 +
 .../电夹爪/GripperEvent.cs                 |  10 +
 .../电夹爪/WriteGripper.cs                 |  14 +
 .../节卡机器人/JakaModel.cs              | 107 ++-
 BPASmartClient.MorkBF/Control_MorkBF.cs       | 433 +++++----
 BPASmartClient.MorkBF/GVL_MorkBF.cs           |   8 +-
 BPASmartClient.MorkS3/Alarm.cs                | 204 ++++
 .../BPASmartClient.MorkS3.csproj              |  28 +
 BPASmartClient.MorkS3/Control_Morks.cs        | 891 ++++++++++++++++++
 BPASmartClient.MorkS3/DataServer.cs           |  52 +
 BPASmartClient.MorkS3/GVL_MORKS.cs            | 376 ++++++++
 .../Model/Global.cs                           |   6 +-
 BPASmartClient.MorkS3/Model/MorksPar.cs       |  16 +
 BPASmartClient.MorkS3/Model/ParSet.cs         |  29 +
 BPASmartClient.MorkS3/Model/WritePar.cs       |  14 +
 BPASmartClient.MorkS3/OrderLocInfo.cs         |  23 +
 BPASmartClient.MorkS3/View/Debug.xaml         | 117 +++
 BPASmartClient.MorkS3/View/Debug.xaml.cs      |  30 +
 BPASmartClient.MorkS3/View/Monitor.xaml       | 242 +++++
 BPASmartClient.MorkS3/View/Monitor.xaml.cs    |  28 +
 BPASmartClient.MorkS3/View/ParSet.xaml        | 130 +++
 BPASmartClient.MorkS3/View/ParSet.xaml.cs     |  28 +
 .../ViewModel/DebugViewModel.cs               |  79 ++
 .../ViewModel/MonitorViewModel.cs             |  25 +
 .../ViewModel/ParSetViewModel.cs              |  49 +
 BPASmartClient.MorkS3/VoiceAPI.cs             |  42 +
 .../BPASmartClient.MorkT_BarCounter.csproj    |   5 +
 .../Control_MorkT_BarCounter.cs               | 862 ++++++-----------
 BPASmartClient.MorkT_BarCounter/GVL_MorkT.cs  |  26 +-
 .../PolymerBatching.cs                        |  25 +-
 .../View/DebugView.xaml                       | 506 ++--------
 .../View/TestView.xaml                        | 439 +++++++++
 .../View/TestView.xaml.cs                     |  37 +
 .../ViewModel/DebugViewModel.cs               | 404 ++------
 .../ViewModel/TestViewModel.cs                | 386 ++++++++
 .../Control_MorkT_Container.cs                |   2 +-
 .../Control_MORKJC.cs                         |  16 +-
 .../BPASmartClient.RobotGripper.csproj        |  15 +
 .../RobotGripperMachine.cs                    |  50 +
 .../ScreenSplitMealsControl1ViewModel.cs      |   2 +-
 .../ScreenALLControlViewModel.cs              |   1 +
 .../RobotGripperHelper.cs                     |  77 ++
 DosingSystem/App.xaml.cs                      |   4 +-
 DosingSystem/Model/DeviceInquire.cs           |  17 +-
 .../Model/par/{LocaPar.cs => LocalRecipe.cs}  |   2 +-
 DosingSystem/View/NewRecipeView.xaml.cs       |   2 +-
 DosingSystem/View/RecipeSettingsView.xaml.cs  |   2 +-
 .../ViewModel/ChangeDeviceNameViewModel.cs    |   6 +-
 DosingSystem/ViewModel/NewRecipeViewModel.cs  |  24 +-
 .../ViewModel/RecipeControlViewModel.cs       |  12 +-
 .../ViewModel/RecipeSettingsViewModel.cs      |  12 +-
 SmartClient.sln                               |  71 +-
 84 files changed, 5536 insertions(+), 1785 deletions(-)
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RawMaterialStockBin.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml
 create mode 100644 BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs
 create mode 100644 BPASmartClient.MilkTeaCube/BPASmartClient.MilkTeaCube.csproj
 create mode 100644 BPASmartClient.MilkTeaCube/MilkTeaCubeMachine.cs
 create mode 100644 BPASmartClient.MilkTeaCubeHelper/BPASmartClient.MilkTeaCubeHelper.csproj
 create mode 100644 BPASmartClient.MilkTeaCubeHelper/Class1.cs
 create mode 100644 BPASmartClient.Model/奶茶味魔方/MilkTeaCubeEvent.cs
 create mode 100644 BPASmartClient.Model/电夹爪/GripperEvent.cs
 create mode 100644 BPASmartClient.Model/电夹爪/WriteGripper.cs
 create mode 100644 BPASmartClient.MorkS3/Alarm.cs
 create mode 100644 BPASmartClient.MorkS3/BPASmartClient.MorkS3.csproj
 create mode 100644 BPASmartClient.MorkS3/Control_Morks.cs
 create mode 100644 BPASmartClient.MorkS3/DataServer.cs
 create mode 100644 BPASmartClient.MorkS3/GVL_MORKS.cs
 rename BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcWriteAddressDB7.cs => BPASmartClient.MorkS3/Model/Global.cs (52%)
 create mode 100644 BPASmartClient.MorkS3/Model/MorksPar.cs
 create mode 100644 BPASmartClient.MorkS3/Model/ParSet.cs
 create mode 100644 BPASmartClient.MorkS3/Model/WritePar.cs
 create mode 100644 BPASmartClient.MorkS3/OrderLocInfo.cs
 create mode 100644 BPASmartClient.MorkS3/View/Debug.xaml
 create mode 100644 BPASmartClient.MorkS3/View/Debug.xaml.cs
 create mode 100644 BPASmartClient.MorkS3/View/Monitor.xaml
 create mode 100644 BPASmartClient.MorkS3/View/Monitor.xaml.cs
 create mode 100644 BPASmartClient.MorkS3/View/ParSet.xaml
 create mode 100644 BPASmartClient.MorkS3/View/ParSet.xaml.cs
 create mode 100644 BPASmartClient.MorkS3/ViewModel/DebugViewModel.cs
 create mode 100644 BPASmartClient.MorkS3/ViewModel/MonitorViewModel.cs
 create mode 100644 BPASmartClient.MorkS3/ViewModel/ParSetViewModel.cs
 create mode 100644 BPASmartClient.MorkS3/VoiceAPI.cs
 create mode 100644 BPASmartClient.MorkT_BarCounter/View/TestView.xaml
 create mode 100644 BPASmartClient.MorkT_BarCounter/View/TestView.xaml.cs
 create mode 100644 BPASmartClient.MorkT_BarCounter/ViewModel/TestViewModel.cs
 create mode 100644 BPASmartClient.RobotGripper/BPASmartClient.RobotGripper.csproj
 create mode 100644 BPASmartClient.RobotGripper/RobotGripperMachine.cs
 create mode 100644 BPASmartClient.SerialPort/RobotGripperHelper.cs
 rename DosingSystem/Model/par/{LocaPar.cs => LocalRecipe.cs} (93%)

diff --git a/BPASmartClient.JAKA/JakaMachine.cs b/BPASmartClient.JAKA/JakaMachine.cs
index a93c39cb..e45b477d 100644
--- a/BPASmartClient.JAKA/JakaMachine.cs
+++ b/BPASmartClient.JAKA/JakaMachine.cs
@@ -17,18 +17,22 @@ namespace BPASmartClient.JAKA
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
                 IsConnected = jaKaHelper.IsConnected;
-                if (!IsConnected) IsWork = false;
-                while (IsConnected)
+                if (!IsConnected)
+                {
+                    IsWork = false;
+                }
+                if (IsConnected)
                 {
                     IsWork = true;
                     if (status != null)
                     {
-                        SetStatus("GetProgramStatus", (int)jaKaHelper.GetProgramStatus());
-                        SetStatus("Get_RobotAO1", jaKaHelper.Get_RobotAO1());
-                        SetStatus("Get_RobotDI0", jaKaHelper.Get_RobotDI(0));
-                        SetStatus("Get_RobotDI1", jaKaHelper.Get_RobotDI(1));
-                        SetStatus("Get_RobotDI2", jaKaHelper.Get_RobotDI(2));
-                        SetStatus("Get_RobotDI3", jaKaHelper.Get_RobotDI(3));
+                        SetStatus("Get_JakaRobotProgramStatus", (int)jaKaHelper.GetProgramStatus());
+                        SetStatus("Get_JakaRobotAO1", Convert.ToInt32(jaKaHelper.Get_RobotAO1()));
+                        SetStatus("Get_JakaRobotDI0", jaKaHelper.Get_RobotDI(0));
+                        SetStatus("Get_JakaRobotDI1", jaKaHelper.Get_RobotDI(1));
+                        SetStatus("Get_JakaRobotDI2", jaKaHelper.Get_RobotDI(2));
+                        SetStatus("Get_JakaRobotDI3", jaKaHelper.Get_RobotDI(3));
+                        SetStatus("Get_JakaRobotDI5", jaKaHelper.Get_RobotDI(5));
                     }
                     Thread.Sleep(500);
                 }
diff --git a/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs b/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs
index 6e2d1570..476ffcf6 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs
@@ -47,6 +47,8 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// 是否处于手动下发配方
         /// </summary>
         public static bool IsUseLocalRecipe { get; set; } = false;
+
+        public static bool BarrelWasherSign { get; set; }
         /// <summary>
         /// 订单请求
         /// </summary>
diff --git a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
index 74f34914..aa60f2d7 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
@@ -64,6 +64,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
                 {
                     HK_PLC_S7.Write("DB99.DBW2.0",Convert.ToInt16(recipe.TrayCode));
                     HK_PLC_S7.Write("DB99.DBW4.0", Convert.ToInt16(recipe.TrayCode));
+                    MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号DB99.DBW2.0：{recipe.TrayCode}，下发完成");
                     for (int barrel = 1; barrel < 6; barrel++)
                     {
                         if (barrel != 3)//桶的编号不为3 只为1，2，4，5号桶 
diff --git a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
index 843db9cb..52566728 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
@@ -261,28 +261,28 @@ namespace BPASmartClient.JXJFoodBigStation.Model
             {
                 foreach (var data in LocalRecipes)
                 {
-                    if (LocalRecipeQueue1.Count == 0 && !LocalRecipeQueue2.Contains(data.RecipeCode) && !LocalRecipeQueue3.Contains(data.RecipeCode) && !LocalRecipeQueue4.Contains(data.RecipeCode))
+                    if (LocalRecipeQueue1.Count == 0 && !LocalRecipeQueue2.Contains(data.RecipeCode) && !LocalRecipeQueue3.Contains(data.RecipeCode) && !LocalRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1)
                     {
                         if (!(LocalRecipeQueue1.Contains(data.RecipeCode)))
                         {
                             LocalRecipeQueue1.Enqueue(data.RecipeCode);
                         }
                     }
-                    else if (LocalRecipeQueue2.Count == 0 && !LocalRecipeQueue1.Contains(data.RecipeCode) && !LocalRecipeQueue3.Contains(data.RecipeCode) && !LocalRecipeQueue4.Contains(data.RecipeCode))
+                    else if (LocalRecipeQueue2.Count == 0 && !LocalRecipeQueue1.Contains(data.RecipeCode) && !LocalRecipeQueue3.Contains(data.RecipeCode) && !LocalRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe2)
                     {
                         if (!(LocalRecipeQueue2.Contains(data.RecipeCode)))
                         {
                             LocalRecipeQueue2.Enqueue(data.RecipeCode);
                         }
                     }
-                    else if (LocalRecipeQueue3.Count == 0 && !LocalRecipeQueue1.Contains(data.RecipeCode) && !LocalRecipeQueue2.Contains(data.RecipeCode) && !LocalRecipeQueue4.Contains(data.RecipeCode))
+                    else if (LocalRecipeQueue3.Count == 0 && !LocalRecipeQueue1.Contains(data.RecipeCode) && !LocalRecipeQueue2.Contains(data.RecipeCode) && !LocalRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe3)
                     {
                         if (!(LocalRecipeQueue3.Contains(data.RecipeCode)))
                         {
                             LocalRecipeQueue3.Enqueue(data.RecipeCode);
                         }
                     }
-                    else if (LocalRecipeQueue4.Count == 0 && !LocalRecipeQueue1.Contains(data.RecipeCode) && !LocalRecipeQueue2.Contains(data.RecipeCode) && !LocalRecipeQueue3.Contains(data.RecipeCode))
+                    else if (LocalRecipeQueue4.Count == 0 && !LocalRecipeQueue1.Contains(data.RecipeCode) && !LocalRecipeQueue2.Contains(data.RecipeCode) && !LocalRecipeQueue3.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe4)
                     {
                         if (!(LocalRecipeQueue4.Contains(data.RecipeCode)))
                         {
@@ -297,6 +297,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                 LocalRecipeQueue2.Clear();
                 LocalRecipeQueue3.Clear();
                 LocalRecipeQueue4.Clear();
+                GVL_BigStation.BarrelWasherSign = false;
                 GVL_BigStation.Recipe1DosingStatus = 0;
                 GVL_BigStation.Recipe2DosingStatus = 0;
                 GVL_BigStation.Recipe3DosingStatus = 0;
@@ -340,20 +341,43 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.IsAllowIssueRecipe1 && GVL_BigStation.Recipe1DosingStatus == 0 && Inplace)//配方1是否允许下发配发
                     {
-                        HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
-                        GVL_BigStation.Recipe1DosingStatus = 1;
-                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                        if (LocalRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            if (!GVL_BigStation.BarrelWasherSign)
+                            {
+                                GVL_BigStation.BarrelWasherSign = true;
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+
+                                HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
+                                GVL_BigStation.Recipe1DosingStatus = 1;
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            }
+                        }
+                        else 
+                        {
+                            HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
+                            GVL_BigStation.Recipe1DosingStatus = 1;
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                        }
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe1 && GVL_BigStation.Recipe1DosingStatus == 1)
                     {
-                        GVL_BigStation.Recipe1DosingStatus = 2;
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", false);
                         StockBinParReset();
+                        GVL_BigStation.Recipe1DosingStatus = 2;
                         MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
                     }
                     if (GVL_BigStation.Recipe1DosingStatus == 2 && HKDevice.PlcRead.Recipe1DosingFinish)
                     {
+                        if (LocalRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            GVL_BigStation.BarrelWasherSign = false;
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶复位
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶信号复位");
+                        }
                         GVL_BigStation.Recipe1DosingStatus = 3; 
                         switch (trayCode)
                         {
@@ -480,10 +504,27 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.IsAllowIssueRecipe2 && GVL_BigStation.Recipe2DosingStatus == 0 &&Inplace)//配方2是否允许下发配发
                     {
-                        HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", true);
-                        GVL_BigStation.Recipe2DosingStatus = 1;
-                        MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
+                        if (LocalRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            if (!GVL_BigStation.BarrelWasherSign)
+                            {
+                                GVL_BigStation.BarrelWasherSign = true;
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+
+                                HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", true);
+                                GVL_BigStation.Recipe2DosingStatus = 1;
+                                MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
+                            }
+                        }
+                        else
+                        {
+                            HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", true);
+                            GVL_BigStation.Recipe2DosingStatus = 1;
+                            MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
+                        }
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe2 && GVL_BigStation.Recipe2DosingStatus == 1)
                     {
@@ -494,6 +535,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (GVL_BigStation.Recipe2DosingStatus == 2 && HKDevice.PlcRead.Recipe2DosingFinish)
                     {
+                        if (LocalRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            GVL_BigStation.BarrelWasherSign = false;
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶复位
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶信号复位");
+                        }
                         switch (trayCode)
                         {
                             case 1:
@@ -620,10 +667,27 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.IsAllowIssueRecipe3 && GVL_BigStation.Recipe3DosingStatus == 0 && Inplace)//配方3是否允许下发配发
                     {
-                        HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
-                        GVL_BigStation.Recipe3DosingStatus = 1;
-                        MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
+                        if (LocalRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            if (!GVL_BigStation.BarrelWasherSign)
+                            {
+                                GVL_BigStation.BarrelWasherSign = true;
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+
+                                HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
+                                GVL_BigStation.Recipe3DosingStatus = 1;
+                                MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
+                            }
+                        }
+                        else 
+                        {
+                            HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
+                            GVL_BigStation.Recipe3DosingStatus = 1;
+                            MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
+                        }
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe3 && GVL_BigStation.Recipe3DosingStatus == 1)
                     {
@@ -634,6 +698,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.Recipe3DosingFinish && GVL_BigStation.Recipe3DosingStatus == 2)
                     {
+                        if (LocalRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            GVL_BigStation.BarrelWasherSign = false;
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶复位
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶信号复位");
+                        }
                         switch (trayCode)
                         {
                             case 1:
@@ -761,10 +831,27 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.IsAllowIssueRecipe4 && GVL_BigStation.Recipe4DosingStatus == 0 && Inplace)//配方4是否允许下发配发
                     {
-                        HKDevice.StockBinPar(LocalRecipes.ElementAt(index)); 
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
-                        GVL_BigStation.Recipe4DosingStatus = 1;
-                        MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
+                        if (LocalRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            if (!GVL_BigStation.BarrelWasherSign)
+                            {
+                                GVL_BigStation.BarrelWasherSign = true;
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+
+                                HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
+                                GVL_BigStation.Recipe4DosingStatus = 1;
+                                MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
+                            }
+                        }
+                        else 
+                        {
+                            HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
+                            GVL_BigStation.Recipe4DosingStatus = 1;
+                            MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
+                        }
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe4 && GVL_BigStation.Recipe4DosingStatus == 1)
                     {
@@ -775,6 +862,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (GVL_BigStation.Recipe4DosingStatus == 2 && HKDevice.PlcRead.Recipe4DosingFinish)
                     {
+                        if (LocalRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            GVL_BigStation.BarrelWasherSign = false;
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶复位
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶信号复位");
+                        }
                         switch (trayCode)
                         {
                             case 1:
@@ -875,7 +968,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
             {
                 foreach (var data in SiemensRecipes)
                 {
-                    if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode))
+                    if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1)
                     {
                         if (!(SiemensRecipeQueue1.Contains(data.RecipeCode)))
                         {
@@ -910,7 +1003,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             }
                         }
                     }
-                    else if (SiemensRecipeQueue2.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode))
+                    else if (SiemensRecipeQueue2.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe2)
                     {
                         if (!(SiemensRecipeQueue2.Contains(data.RecipeCode)))
                         {
@@ -945,7 +1038,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             }
                         }
                     }
-                    else if (SiemensRecipeQueue3.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode))
+                    else if (SiemensRecipeQueue3.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe3)
                     {
                         if (!(SiemensRecipeQueue3.Contains(data.RecipeCode))) 
                         {
@@ -980,7 +1073,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             }
                         }
                     }
-                    else if (SiemensRecipeQueue4.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode))
+                    else if (SiemensRecipeQueue4.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe4)
                     {
                         if (!(SiemensRecipeQueue4.Contains(data.RecipeCode))) 
                         {
@@ -1023,6 +1116,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                 SiemensRecipeQueue2.Clear();
                 SiemensRecipeQueue3.Clear();
                 SiemensRecipeQueue4.Clear();
+                GVL_BigStation.BarrelWasherSign = false;
                 GVL_BigStation.Recipe1DosingStatus = 0;
                 GVL_BigStation.Recipe2DosingStatus = 0;
                 GVL_BigStation.Recipe3DosingStatus = 0;
@@ -1057,14 +1151,16 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                     MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
                                 }
                                 GVL_BigStation.Recipe1DosingStatus = 0;
-                                SiemensRecipeQueue1.TryDequeue(out code);
-                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX320.2", false);
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
-                                MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
+                                while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false ) 
+                                {
+                                    SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                                    SiemensRecipeQueue1.TryDequeue(out code);
+                                    MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
+                                }
                             }
                             if (SiemensRecipeQueue2.Contains(code))
                             {
-                                GVL_BigStation.Recipe2DosingStatus = 0;
                                 App.Current.Dispatcher.Invoke(() =>
                                 {
                                     Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);
@@ -1080,10 +1176,13 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                     MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
                                 }
                                 GVL_BigStation.Recipe2DosingStatus = 0;
-                                SiemensRecipeQueue2.TryDequeue(out code);
-                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX320.2", false);
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
-                                MessageNotify.GetInstance.ShowRunLog($"队列2，西门子取消订单完成，订单号：{code}");
+                                while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                                {
+                                    SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                                    SiemensRecipeQueue2.TryDequeue(out code);
+                                    MessageNotify.GetInstance.ShowRunLog($"队列2，西门子取消订单完成，订单号：{code}");
+                                }
                             }
                             if (SiemensRecipeQueue3.Contains(code))
                             {
@@ -1102,11 +1201,14 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 {
                                     MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
                                 }
-                                GVL_BigStation.Recipe3DosingStatus = 0;
-                                SiemensRecipeQueue3.TryDequeue(out code);
-                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX320.2", false);
+                                GVL_BigStation.Recipe3DosingStatus = 0; 
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
-                                MessageNotify.GetInstance.ShowRunLog($"队列3，西门子取消订单完成，订单号：{code}");
+                                while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                                {
+                                    SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                                    SiemensRecipeQueue3.TryDequeue(out code);
+                                    MessageNotify.GetInstance.ShowRunLog($"队列3，西门子取消订单完成，订单号：{code}");
+                                }
                             }
                             if (SiemensRecipeQueue4.Contains(code))
                             {
@@ -1126,10 +1228,13 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                     MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
                                 }
                                 GVL_BigStation.Recipe4DosingStatus = 0;
-                                SiemensRecipeQueue4.TryDequeue(out code);
-                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX320.2", false);
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
-                                MessageNotify.GetInstance.ShowRunLog($"队列4，西门子取消订单完成，订单号：{code}");
+                                while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                                {
+                                    SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                                    SiemensRecipeQueue4.TryDequeue(out code);
+                                    MessageNotify.GetInstance.ShowRunLog($"队列4，西门子取消订单完成，订单号：{code}");
+                                }
                             }
                             GVL_BigStation.Order_Cancel = false;
                             GVL_BigStation.Order_CancelRecipeCode = "";
@@ -1149,19 +1254,24 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             {
                                 MessageNotify.GetInstance.ShowRunLog($"订单取消异常，订单号：{GVL_BigStation.Order_CancelRecipeCode}");
                             }
-
                             GVL_BigStation.Order_Cancel = false;
                             GVL_BigStation.Order_CancelRecipeCode = "";
-                            SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX320.2", false);
                             SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
+                            while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                            }
                         }
                     }
                     else
                     {
                         GVL_BigStation.Order_Cancel = false;
                         GVL_BigStation.Order_CancelRecipeCode = "";
-                        SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX320.2", false);
                         SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
+                        while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                        {
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                        }
                         MessageNotify.GetInstance.ShowRunLog($"西门子取消订单,但未找到订单:{GVL_BigStation.Order_CancelRecipeCode}");
                     }
                 }
@@ -1180,7 +1290,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     switch (trayCode)
                     {
                         case 1:
-                            Inplace = HKDevice.PlcRead.Tray1InPlace;
+                            Inplace = HKDevice.PlcRead.Tray1InPlace;//上位机给plc发送AGV到位信号，plc固定托盘后反馈托盘是否到位
                             break;
                         case 2:
                             Inplace = HKDevice.PlcRead.Tray2InPlace;
@@ -1199,16 +1309,31 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.IsAllowIssueRecipe1 && GVL_BigStation.Recipe1DosingStatus == 0 && Inplace)//配方1是否允许下发配发
                     {
-                        GVL_BigStation.DosingRecipe1Time = DateTime.Now;
-                        HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
-                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel) 
+                        
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
-                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+                            if (!GVL_BigStation.BarrelWasherSign)
+                            {
+                                GVL_BigStation.BarrelWasherSign = true;
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+                                
+                                GVL_BigStation.DosingRecipe1Time = DateTime.Now;
+                                HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
+                                GVL_BigStation.Recipe1DosingStatus = 1;
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            }
+                        }
+                        else 
+                        {
+                            GVL_BigStation.DosingRecipe1Time = DateTime.Now;
+                            HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
+                            GVL_BigStation.Recipe1DosingStatus = 1;
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
                         }
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
-                        GVL_BigStation.Recipe1DosingStatus = 1;
-                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                       
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe1 && GVL_BigStation.Recipe1DosingStatus == 1)
                     {
@@ -1219,6 +1344,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (GVL_BigStation.Recipe1DosingStatus == 2 && HKDevice.PlcRead.Recipe1DosingFinish)
                     {
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            GVL_BigStation.BarrelWasherSign = false;
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                        }
                         GVL_BigStation.Recipe1DosingFinish = true;
                         GVL_BigStation.Recipe1DosingStatus = 3;
                         MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
@@ -1350,28 +1481,47 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         default:
                             break;
                     }
-                    if (HKDevice.PlcRead.IsAllowIssueRecipe2 && GVL_BigStation.Recipe2DosingStatus == 0 && Inplace)//配方2是否允许下发配发
+                    if (HKDevice.PlcRead.IsAllowIssueRecipe2 && GVL_BigStation.Recipe2DosingStatus == 0 && Inplace )//配方2是否允许下发配发
                     {
-                        GVL_BigStation.DosingRecipe2Time = DateTime.Now;
-                        HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
-                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+                            if (!GVL_BigStation.BarrelWasherSign)
+                            {
+                                GVL_BigStation.BarrelWasherSign = true;
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+
+                                GVL_BigStation.DosingRecipe2Time = DateTime.Now;
+                                HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", true);
+                                GVL_BigStation.Recipe2DosingStatus = 1;
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            }
+                        }
+                        else 
+                        {
+                            GVL_BigStation.DosingRecipe2Time = DateTime.Now;
+                            HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", true);
+                            GVL_BigStation.Recipe2DosingStatus = 1;
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
                         }
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", true);
-                        GVL_BigStation.Recipe2DosingStatus = 1;
-                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe2 && GVL_BigStation.Recipe2DosingStatus == 1)
                     {
-                        GVL_BigStation.Recipe2DosingStatus = 2;
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", false);
                         StockBinParReset();
+                        GVL_BigStation.Recipe2DosingStatus = 2;
                         MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
                     }
                     if (GVL_BigStation.Recipe2DosingStatus == 2 && HKDevice.PlcRead.Recipe2DosingFinish)
                     {
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            GVL_BigStation.BarrelWasherSign = false;
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                        }
                         GVL_BigStation.Recipe2DosingFinish = true;
                         GVL_BigStation.Recipe2DosingStatus = 3;
                         MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
@@ -1505,26 +1655,44 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.IsAllowIssueRecipe3 && GVL_BigStation.Recipe3DosingStatus == 0 && Inplace)//配方3是否允许下发配发
                     {
-                        GVL_BigStation.DosingRecipe3Time = DateTime.Now;
-                        HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
-                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+                            if (!GVL_BigStation.BarrelWasherSign)//其他配方在洗桶时，等待其他配方洗完，在发送数据
+                            {
+                                GVL_BigStation.BarrelWasherSign = true;
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+                                GVL_BigStation.DosingRecipe3Time = DateTime.Now;
+                                HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
+                                GVL_BigStation.Recipe3DosingStatus = 1;
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            }
+                        }
+                        else 
+                        {
+                            GVL_BigStation.DosingRecipe3Time = DateTime.Now;
+                            HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
+                            GVL_BigStation.Recipe3DosingStatus = 1;
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
                         }
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
-                        GVL_BigStation.Recipe3DosingStatus = 1;
-                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe3 && GVL_BigStation.Recipe3DosingStatus == 1)
                     {
-                        GVL_BigStation.Recipe3DosingStatus = 2;
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", false);
                         StockBinParReset();
+                        GVL_BigStation.Recipe3DosingStatus = 2;
                         MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
                     }
                     if (HKDevice.PlcRead.Recipe3DosingFinish && GVL_BigStation.Recipe3DosingStatus == 2)
                     {
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            GVL_BigStation.BarrelWasherSign = false;
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                        }
                         GVL_BigStation.Recipe3DosingFinish = true;
                         GVL_BigStation.Recipe3DosingStatus = 3;
                         MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
@@ -1658,16 +1826,28 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.IsAllowIssueRecipe4 && GVL_BigStation.Recipe4DosingStatus == 0 && Inplace)//配方4是否允许下发配发
                     {
-                        GVL_BigStation.DosingRecipe4Time = DateTime.Now;
-                        HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
-                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+                            if (!GVL_BigStation.BarrelWasherSign)//其他配方在洗桶时，等待其他配方洗完，在发送数据
+                            {
+                                GVL_BigStation.BarrelWasherSign = true;
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+                                GVL_BigStation.DosingRecipe4Time = DateTime.Now;
+                                HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
+                                GVL_BigStation.Recipe4DosingStatus = 1;
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            }
+                        }
+                        else
+                        {
+                            GVL_BigStation.DosingRecipe4Time = DateTime.Now;
+                            HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
+                            GVL_BigStation.Recipe4DosingStatus = 1;
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
                         }
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
-                        GVL_BigStation.Recipe4DosingStatus = 1;
-                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe4 && GVL_BigStation.Recipe4DosingStatus == 1)
                     {
@@ -1678,6 +1858,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (GVL_BigStation.Recipe4DosingStatus == 2 && HKDevice.PlcRead.Recipe4DosingFinish)
                     {
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            GVL_BigStation.BarrelWasherSign = false;
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                        }
                         GVL_BigStation.Recipe1DosingFinish = true;
                         GVL_BigStation.Recipe4DosingStatus = 3;
                         MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
@@ -1803,8 +1989,8 @@ namespace BPASmartClient.JXJFoodBigStation.Model
             RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0005", RawMaterialLocation = 3 });//榨菜丁
             RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0018", RawMaterialLocation = 4 });//炸豌豆
             RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0019", RawMaterialLocation = 5 });//高水分糍粑海椒
-            RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0033", RawMaterialLocation = 6 });//辣豆瓣*/
-            /*RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0030", RawMaterialLocation = 11 });//备用生姜
+            RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0033", RawMaterialLocation = 6 });//辣豆瓣
+            RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0030", RawMaterialLocation = 11 });//备用生姜
             RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0012", RawMaterialLocation = 12 });//豆豉细粒*/
             foreach (var material in RawMaterialsInfo)
             {
diff --git a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs
index 873e398e..dc05bc4f 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs
@@ -28,8 +28,18 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         public int TrayCode { get { return _mTrayCode; } set { _mTrayCode = value; OnPropertyChanged(); } }
         private int _mTrayCode;
 
+        /// <summary>
+        /// 配方类型是否为洗桶
+        /// </summary>
+        public string OrderType { get { return _mOrderType; } set { _mOrderType = value; OnPropertyChanged(); } }
+        private string _mOrderType;
+
+        /// <summary>
+        /// 配方类型是否为洗桶
+        /// </summary>
         public bool IsWashingBarrel { get { return _mIsWashingBarrel; } set { _mIsWashingBarrel = value; OnPropertyChanged(); } }
         private bool _mIsWashingBarrel;
+
         /// <summary>
         /// 原料数据
         /// </summary>
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml
index 63e35bc1..0d22968d 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml
@@ -289,8 +289,8 @@
                         <RowDefinition/>
                     </Grid.RowDefinitions>
                     <StackPanel Orientation="Horizontal"  HorizontalAlignment="Center" Margin="0,4,0,0">
+                        <CheckBox Content="是否洗桶" FontSize="16" Foreground="#FF2AB2E7" Height="30" Width="180" Margin="0,0,10,0" IsChecked="{Binding IsWashingBarrel}"/>
                         <Button Content="添加原料" Width="180" Margin="0,0,10,0"  Height="30" Background="Transparent" BorderBrush="#FF2AB2E7" Foreground="#FF2AB2E7" Cursor="Hand" Command="{Binding AddRecipe}" ></Button>
-                        <Button Content="清除原料" Height="30" Width="180" Margin="0,0,10,0" Command="{Binding ClearRawMaterial}" Cursor="Hand"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="0,4,0,0" HorizontalAlignment="Center">
                         <Button Content="确认" Margin="0,0,10,0" Height="30" Width="180"  Background="Transparent" BorderBrush="#FF2AB2E7" Foreground="#FF2AB2E7" Command="{Binding Comfirm}"></Button>
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
index ef78e4b8..1c3603c8 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
@@ -226,36 +226,116 @@
                         Margin="5">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="30" />
-                                <RowDefinition Height="20" />
-                                <RowDefinition Height="128" />
+                                <RowDefinition Height="25" />
+                                <RowDefinition Height="25" />
+                                <RowDefinition Height="25" />
+                                <RowDefinition Height="25" />
+                                <RowDefinition Height="58" />
                                 <RowDefinition Height="2" />
                                 <RowDefinition Height="40" />
                             </Grid.RowDefinitions>
-
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition></ColumnDefinition>
+                                <ColumnDefinition></ColumnDefinition>
+                            </Grid.ColumnDefinitions>
                             <Image
-                            Grid.RowSpan="5"
+                            Grid.RowSpan="8"
+                            Grid.ColumnSpan="2"
                             Source="/BPASmartClient.CustomResource;component/Image/配方背景/竖背景框.png"
                             Stretch="Fill" />
 
                             <TextBlock
                             Grid.Row="0"
+                            Grid.ColumnSpan="2"
+                            FontSize="14"
+                            Margin="5,0,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Foreground="#FF2AB2E7"
+                            Text="配方信息" />
+                            
+                            <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
                             Margin="2,5,0,0"
                             HorizontalAlignment="Center"
-                            VerticalAlignment="Top"
-                            FontSize="18"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#FF2AB2E7"
+                            Text="配方名称：" />
+                            
+                            <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
                             Foreground="#FF2AB2E7"
                             Text="{Binding RecipeName}" />
 
                             <TextBlock
-                            Grid.Row="1"
-                            FontSize="16"
-                            Margin="5,0,0,0"
-                            VerticalAlignment="Top"
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
                             Foreground="#FF2AB2E7"
-                            Text="配方信息：" />
+                            Text="配方编号：" />
 
-                            <ScrollViewer
+                            <TextBlock
                             Grid.Row="2"
+                            Grid.Column="1"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding RecipeCode}" />
+                            
+                            <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#FF2AB2E7"
+                            Text="托盘编号：" />
+
+                            <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding TrayCode}" />
+
+                            <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#FF2AB2E7"
+                            Text="订单类型：" />
+
+                            <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding OrderType}" />
+                            
+                            <!--<ScrollViewer
+                            Grid.Row="5"
                             VerticalAlignment="Top"
                             Background="Transparent"
                             HorizontalScrollBarVisibility="Hidden"
@@ -299,12 +379,11 @@
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
-
-
-                            </ScrollViewer>
+                            </ScrollViewer>-->
 
                             <Image
-                            Grid.Row="3"
+                            Grid.Row="6"
+                            Grid.ColumnSpan="2"
                             Width="{Binding ElementName=tt, Path=ActualWidth}"
                             Height="2"
                             VerticalAlignment="Bottom"
@@ -313,7 +392,8 @@
 
                             <Grid
                             Name="gr"
-                            Grid.Row="4"
+                            Grid.Row="7"
+                            Grid.ColumnSpan="2"
                             Height="30"
                             Margin="0,0,0,10"
                             VerticalAlignment="Bottom"
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
index 446f7695..fe52930c 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
@@ -448,34 +448,115 @@
                             Margin="5">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="30" />
-                                <RowDefinition Height="20" />
-                                <RowDefinition Height="128" />
+                                <RowDefinition Height="25" />
+                                <RowDefinition Height="25" />
+                                <RowDefinition Height="25" />
+                                <RowDefinition Height="25" />
+                                <RowDefinition Height="58" />
                                 <RowDefinition Height="2" />
                                 <RowDefinition Height="40" />
                             </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition></ColumnDefinition>
+                                <ColumnDefinition></ColumnDefinition>
+                            </Grid.ColumnDefinitions>
                             <Image
-                                Grid.RowSpan="5"
-                                Source="/BPASmartClient.CustomResource;component/Image/配方背景/竖背景框.png"
-                                Stretch="Fill" />
+                            Grid.RowSpan="8"
+                            Grid.ColumnSpan="2"
+                            Source="/BPASmartClient.CustomResource;component/Image/配方背景/竖背景框.png"
+                            Stretch="Fill" />
 
                             <TextBlock
-                                Grid.Row="0"
-                                Margin="2,5,0,0"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Top"
-                                FontSize="18"
-                                Foreground="#FF2AB2E7"
-                                Text="{Binding RecipeName}" />
+                            Grid.Row="0"
+                            Grid.ColumnSpan="2"
+                            FontSize="14"
+                            Margin="5,0,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Foreground="#FF2AB2E7"
+                            Text="配方信息" />
 
                             <TextBlock
-                                Grid.Row="1"
-                                FontSize="16"
-                                Margin="5,0,0,0"
-                                VerticalAlignment="Top"
-                                Foreground="#FF2AB2E7"
-                                Text="配方信息：" />
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#FF2AB2E7"
+                            Text="配方名称：" />
 
-                            <ScrollViewer
+                            <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding RecipeName}" />
+
+                            <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#FF2AB2E7"
+                            Text="配方编号：" />
+
+                            <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding RecipeCode}" />
+
+                            <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#FF2AB2E7"
+                            Text="托盘编号：" />
+
+                            <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding TrayCode}" />
+
+                            <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#FF2AB2E7"
+                            Text="订单类型：" />
+
+                            <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding OrderType}" />
+
+                            <!--<ScrollViewer
                             Grid.Row="2"
                             VerticalAlignment="Top"
                             Background="Transparent"
@@ -519,11 +600,12 @@
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
-                            </ScrollViewer>
+                            </ScrollViewer>-->
 
                            
                             <Image
-                                Grid.Row="3"
+                                Grid.Row="6"
+                                Grid.ColumnSpan="2"
                                 Width="{Binding ElementName=tt, Path=ActualWidth}"
                                 Height="2"
                                 VerticalAlignment="Bottom"
@@ -532,7 +614,8 @@
 
                             <Grid
                                 Name="gr"
-                                Grid.Row="4"
+                                Grid.Row="7"
+                                Grid.ColumnSpan="2"
                                 Height="30"
                                 Margin="0,0,0,10"
                                 VerticalAlignment="Bottom"
diff --git a/BPASmartClient.JXJFoodBigStation/View/SiemensRecipeSendDownView.xaml b/BPASmartClient.JXJFoodBigStation/View/SiemensRecipeSendDownView.xaml
index 945d9bdc..0e61653d 100644
--- a/BPASmartClient.JXJFoodBigStation/View/SiemensRecipeSendDownView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/SiemensRecipeSendDownView.xaml
@@ -455,8 +455,8 @@
                                     <RowDefinition></RowDefinition>
                                 </Grid.RowDefinitions>
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition></ColumnDefinition>
-                                    <ColumnDefinition></ColumnDefinition>
+                                    <ColumnDefinition Width="3*"></ColumnDefinition>
+                                    <ColumnDefinition Width="7*"></ColumnDefinition>
                                 </Grid.ColumnDefinitions>
 
                                 <TextBlock 
diff --git a/BPASmartClient.JXJFoodBigStation/View/StockBinRawMaterialView.xaml b/BPASmartClient.JXJFoodBigStation/View/StockBinRawMaterialView.xaml
index 1b7d9435..dd78dd20 100644
--- a/BPASmartClient.JXJFoodBigStation/View/StockBinRawMaterialView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/StockBinRawMaterialView.xaml
@@ -23,7 +23,6 @@
                 <pry:IcoButton
                     Margin="10"
                     Command="{Binding UpdateRawMaterial}"
-                    IcoText="&#xe68e;"
                     Content="新增数据"
                     FontSize="28"
                     Foreground="Aqua"
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
index 53f9bf86..89b8a58f 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
@@ -47,6 +47,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
             ClearAllRecipe = new RelayCommand(() => 
             {
                 Json<RemoteRecipe>.Data.Recipes.Clear();
+                GVL_BigStation.SiemensSendRecipeStatus = 0;
             });
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
index 34da58d1..9c1ecc13 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
@@ -11,6 +11,8 @@ using BPASmartClient.JXJFoodBigStation.Model;
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.JXJFoodBigStation.Model.Siemens;
 using System.Windows.Forms;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
@@ -29,7 +31,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                     RecipeName = rm.RecipeName;
                     RecipeCode = rm.RecipeCode;
                     TrayCode = rm.TrayCode;
-
+                    IsWashingBarrel = rm.IsWashingBarrel;
                     foreach (var item in rm.RawMaterial)
                     {
                         item.RawMaterialCount = (short)Array.FindIndex(ProcessControl.GetInstance.RawMaterialsInfo.ToArray(), p => p.RawMaterialName == item.RawMaterialName);
@@ -65,8 +67,18 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                         var res = Json<LocalRecipe>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == recipeCode);
                         if (res == null)
                         {
-                            Json<LocalRecipe>.Data.Recipes.Add(new RecipeData { RecipeCode = recipeCode, RawMaterial= RawMaterialsInfo,RecipeName=RecipeName,TrayCode=TrayCode});
+                            if (IsWashingBarrel)
+                            {
+                                Json<LocalRecipe>.Data.Recipes.Add(new RecipeData { RecipeCode = recipeCode,RecipeName = RecipeName, TrayCode = TrayCode, IsWashingBarrel = IsWashingBarrel });
+                                if (RawMaterialsInfo.Count > 0)
+                                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Info, App.MainWindow, "提示", $"订单类型为洗桶，不保存原料信息");
+                            }
+                            else
+                            {
+                                Json<LocalRecipe>.Data.Recipes.Add(new RecipeData { RecipeCode = recipeCode, RawMaterial = RawMaterialsInfo, RecipeName = RecipeName, TrayCode = TrayCode, IsWashingBarrel = IsWashingBarrel });
+                            }
                             Json<LocalRecipe>.Save();
+                            NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"配方保存完成");
                         }
                         else
                         {
@@ -88,15 +100,16 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                     }
                     bom.RecipeName = RecipeName;
                     bom.TrayCode = TrayCode;
+                    bom.IsWashingBarrel = IsWashingBarrel;
+                    if (IsWashingBarrel) 
+                    {
+                        bom.RawMaterial.Clear();
+                    }
                     Json<LocalRecipe>.Save();
                     ActionManage.GetInstance.Send("CloseRecipeInfosView");
                 }
             });
 
-            ClearRawMaterial = new RelayCommand(() => {
-                RawMaterialsInfo.Clear();
-            });
-
             RemoveRecipe = new RelayCommand<short>((index) => {
                 var res = RawMaterialsInfo.FirstOrDefault(p => p.RawMaterialCount == index);
                 if (res != null)
@@ -114,16 +127,16 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
 
         public int SelectIndex { get { return _mSelectIndex; } set { _mSelectIndex = value; OnPropertyChanged(); } }
         private int _mSelectIndex;
-
+        public bool IsWashingBarrel { get { return _mIsWashingBarrel; } set { _mIsWashingBarrel = value; OnPropertyChanged(); } }
+        private bool _mIsWashingBarrel;
         
+
         public RelayCommand ReturnPage { get; set; }
 
         public RelayCommand AddRecipe { get; set; }
 
         public RelayCommand Comfirm { get; set; }
 
-        public RelayCommand ClearRawMaterial { get; set; }
-
         public RelayCommand<short> RemoveRecipe { get; set; }
 
         public ObservableCollection<RawMaterial> RawMaterialsInfo { get; set; } = new ObservableCollection<RawMaterial>() ;
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/SiemensRecipeSendDownViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/SiemensRecipeSendDownViewModel.cs
index bb7da1f3..fd2f38f0 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/SiemensRecipeSendDownViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/SiemensRecipeSendDownViewModel.cs
@@ -17,7 +17,6 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
         public ObservableCollection<RecipeData> Recipes { get; set; } = Json<RemoteRecipe>.Data.Recipes;
         public SiemensRecipeSendDownViewModel()
         {
-                
         }
     }
 }
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/StockBinRawMaterialViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/StockBinRawMaterialViewModel.cs
index ba4fdc95..f5ade366 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/StockBinRawMaterialViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/StockBinRawMaterialViewModel.cs
@@ -34,6 +34,10 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
             SaveRawMaterialPara = new RelayCommand(() => 
             {
                 Json<RawMaterialData>.Save();
+                foreach (var item in Json<RawMaterialData>.Data.RawMaterial) 
+                {
+                    MessageNotify.GetInstance.ShowUserLog($"料仓位置:"+ item.RawMaterialLocation+ ",物料编码:" + item.RawMaterialName);
+                }
                 MessageNotify.GetInstance.ShowUserLog($"原料与料仓对应关系保存成功");
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"原料与料仓对应关系保存成功");
             });
diff --git a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
index 1015cbd3..191917d2 100644
--- a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
@@ -138,7 +138,13 @@ namespace BPASmartClient.JXJFoodSmallStation
                 AssemblyName = "BPASmartClient.JXJFoodSmallStation",
                 ToggleWindowPath = "View.SystemParView"
             });
-            
+            ParSet.Add(new SubMenumodel()
+            {
+                SubMenuName = "原料与料仓对应设置",
+                SubMenuPermission = new Permission[] { Permission.管理员 },
+                AssemblyName = "BPASmartClient.JXJFoodSmallStation",
+                ToggleWindowPath = "View.StockBinRawMaterialView"
+            });
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
             {
                 MainMenuIcon = "&#xe62d;",
diff --git a/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj b/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
index 113ea061..17229774 100644
--- a/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
+++ b/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
@@ -32,6 +32,9 @@
     <Compile Update="View\ManualFlowView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="View\StockBinRawMaterialView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -57,6 +60,10 @@
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="View\StockBinRawMaterialView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="View\SystemParView.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <SubType>Designer</SubType>
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
index 5625b98f..6e50873a 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
@@ -142,6 +142,10 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// 系统运行状态
         /// </summary>
         public static bool SystemRunStatus { get; set; } = false;
+        /// <summary>
+        /// 系统运行状态
+        /// </summary>
+        public static int Time { get; set; } = 1000;
         #endregion
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
new file mode 100644
index 00000000..ec42c683
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
+{
+    public class PlcReadAddressDB3
+    {
+        public bool[] VarBool { get; set; } =new bool[17];
+        public Single[] BarrelPos { get; set; } = new Single[8];
+        public bool[] IsAllowDosing { get; set; } = new bool[8];
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index ae9b499f..bf45b196 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -1,6 +1,7 @@
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.Helper;
 using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
+using BPASmartClient.JXJFoodSmallStation.Model.RawMaterial;
 using BPASmartClient.JXJFoodSmallStation.Model.Siemens;
 using BPASmartClient.JXJFoodSmallStation.Model.WindSend;
 using BPASmartClient.Modbus;
@@ -30,6 +31,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// 原料的名称和料仓的位置对应
         /// </summary>
         public Dictionary<string, short> RawMaterialsNamePos = new Dictionary<string, short>();
+        public ObservableCollection<RawMaterialStockBin> RawMaterialsInfo => Json<DevicePar>.Data.rawMaterialStockBin;
         /// <summary>
         /// 配方队列
         /// </summary>
@@ -51,7 +53,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         public void Init()
         {
             testData();
-            for (int i = 0; i < 16; i++)
+            /*for (int i = 0; i < 16; i++)
             {
                 if (DeviceInquire.GetInstance.GetDevice(i).DeviceName != null)
                 {
@@ -60,7 +62,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         RawMaterialsNamePos.Add(DeviceInquire.GetInstance.GetDevice(i).DeviceName, (short)DeviceInquire.GetInstance.GetDevice(i).deviceStatus.DeviceNum);
                     }
                 }
-            }
+            }*/
             ActionManage.GetInstance.CancelRegister("SiemensRecipeRecive");
             ActionManage.GetInstance.Register(new Action<object>((res) =>
             {
@@ -88,6 +90,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     }
                                     else
                                     {
+                                        MessageNotify.GetInstance.ShowRunLog($"原料：{recipe.Material[i].Material_Name}，不在配料表");
                                         //MessageNotify.GetInstance.AlarmLog("配方名称与本地不符合");
                                     }
                                 }
@@ -170,6 +173,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             {
                 Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
                 GVL_SmallStation.SiemensSendRecipeStatus = 0;
+
                 MessageNotify.GetInstance.ShowRunLog("系统流程复位，等待西门子重新下发订单");
             }), "BPASystemReset",true);
 
@@ -347,7 +351,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             }), "西门子配发下发流程处理", true);
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                if (!HKDevice.IsConnected)
+                if (HKDevice.IsConnected)
                 {
                     ManualOpen();
                     ManualClose();
@@ -380,6 +384,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
                             if (index == 8) address = "DB5.DBX0.7";
                             HKDevice.HK_PLC_S7.Write<bool>(address, true);
+                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：true");
                         }
                     }
                     else if (o.ToString().Contains("阻挡气缸"))
@@ -409,18 +414,22 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     else if (o.ToString().Contains("进料桶顶升气缸"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX3.6", false);//默认顶升
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：false");
                     }
                     else if (o.ToString().Contains("出料桶顶升气缸1"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX3.7", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：true");
                     }
                     else if (o.ToString().Contains("出料桶顶升气缸2"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.0", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：true");
                     }
                     else if (o.ToString().Contains("出料桶顶升气缸3"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.1", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：true");
                     }
                     else if (o.ToString().Contains("托盘气缸1_1"))
                     {
@@ -455,6 +464,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
                             if (index == 8) address = "DB5.DBX0.7";
                             HKDevice.HK_PLC_S7.Write<bool>(address, false);
+                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：false");
                         }
                     }
                     else if (o.ToString().Contains("阻挡气缸"))
@@ -484,18 +494,22 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     else if (o.ToString().Contains("进料桶顶升气缸"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX3.6", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：true");
                     }
                     else if (o.ToString().Contains("出料桶顶升气缸1"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX3.7", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：false");
                     }
                     else if (o.ToString().Contains("出料桶顶升气缸2"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.0", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：false");
                     }
                     else if (o.ToString().Contains("出料桶顶升气缸3"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.1", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：false");
                     }
                     else if (o.ToString().Contains("托盘气缸1_1"))
                     {
@@ -524,11 +538,11 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             if (HKDevice.IsConnected)
             {
                 GVL_SmallStation.Station1HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX0.7");//工站1 有货架
-                GVL_SmallStation.Station2HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.0");//工站1 有货架
-                if (RTrig.GetInstance("WindSendDosingCompleToHKPLC").Start(GVL_SmallStation.WindSendDosingComple))
+                GVL_SmallStation.Station2HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.0");//工站2 有货架
+                if (GVL_SmallStation.WindSendDosingComple)
                 {
-                    GVL_SmallStation.WindSendDosingComple = false;
                     HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.7", true);
+                    GVL_SmallStation.WindSendDosingComple = false;
                     MessageNotify.GetInstance.ShowRunLog("风送配料完成信号，发给产线plc信号");
                 }
                 if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1")) 
@@ -787,10 +801,13 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
                                 }
                                 GVL_SmallStation.GetInstance.RecipeStatusID = 0;
-                                RecipeQueueTray1.TryDequeue(out code);
-                                SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX440.1", false);
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
-                                MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
+                                while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX440.1") == false)
+                                {
+                                    SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
+                                    RecipeQueueTray1.TryDequeue(out code);
+                                    MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
+                                }
                             }
                             else if (RecipeQueueTray2.Contains(code))
                             {
@@ -817,10 +834,13 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
                                 }
                                 GVL_SmallStation.GetInstance.RecipeStatusID = 0;
-                                RecipeQueueTray2.TryDequeue(out code);
-                                SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX440.1", false);
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
-                                MessageNotify.GetInstance.ShowRunLog($"队列2，西门子取消订单完成，订单号：{code}");
+                                while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX440.1") == false)
+                                {
+                                    SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
+                                    RecipeQueueTray2.TryDequeue(out code);
+                                    MessageNotify.GetInstance.ShowRunLog($"队列2，西门子取消订单完成，订单号：{code}");
+                                }
                             }
                             GVL_SmallStation.Order_Cancel = false;
                             GVL_SmallStation.Order_CancelRecipeCode = "";
@@ -843,16 +863,22 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
 
                             GVL_SmallStation.Order_Cancel = false;
                             GVL_SmallStation.Order_CancelRecipeCode = "";
-                            SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX440.1", false);
-                            SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true); 
+                            while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
+                            }
                         }
                     }
                     else
                     {
                         GVL_SmallStation.Order_Cancel = false;
                         GVL_SmallStation.Order_CancelRecipeCode = "";
-                        SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX440.1", false);
                         SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
+                        while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
+                        {
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
+                        }
                         MessageNotify.GetInstance.ShowRunLog($"西门子取消订单,但未找到订单:{code}");
                     }
                 }
@@ -1003,6 +1029,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 int i = GVL_SmallStation.GetInstance.DosingTray1Loc;
                                 if (DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3)
                                 {
+                                    Thread.Sleep(GVL_SmallStation.Time);
                                     MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成");
                                     int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
                                     RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
@@ -1186,6 +1213,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             }
                             if (GVL_SmallStation.GetInstance.DosingTray2 == true && GVL_SmallStation.GetInstance.DosingTray1 == false && GVL_SmallStation.GetInstance.DosingTray2Loc > 0 && GVL_SmallStation.GetInstance.DosingTray2Loc < 16)
                             {
+                                Thread.Sleep(GVL_SmallStation.Time);
                                 int i = GVL_SmallStation.GetInstance.DosingTray2Loc;
                                 if (RTrig.GetInstance("Tray2StatusDevice" + i).Start(DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3))
                                 {
@@ -1274,19 +1302,29 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }
         }
-        private void testData()
+        public void testData()
         {
-            RawMaterialsNamePos.Add("0051", 3);
-            RawMaterialsNamePos.Add("0052", 4);
-            RawMaterialsNamePos.Add("0054", 5);
-            RawMaterialsNamePos.Add("0057", 6);
-            RawMaterialsNamePos.Add("0050", 8);
-            RawMaterialsNamePos.Add("0048", 13);
-
-            RawMaterialsNamePos.Add("0036", 13);//I+G
-            RawMaterialsNamePos.Add("0037", 13);//味精
-            RawMaterialsNamePos.Add("0038", 13);//白糖
+            //RawMaterialsNamePos.Add("0051", 3);
+            //RawMaterialsNamePos.Add("0052", 4);
+            //RawMaterialsNamePos.Add("0054", 5);
+            //RawMaterialsNamePos.Add("0057", 6);
+            //RawMaterialsNamePos.Add("0050", 8);
+            //RawMaterialsNamePos.Add("0048", 13);
 
+            //RawMaterialsNamePos.Add("0036", 13);//I+G
+            //RawMaterialsNamePos.Add("0037", 13);//味精
+            //RawMaterialsNamePos.Add("0038", 13);//白糖
+            RawMaterialsNamePos.Clear();
+            foreach (var material in RawMaterialsInfo)
+            {
+                if (!string.IsNullOrEmpty(material.RawMaterialName))
+                {
+                    if (!RawMaterialsNamePos.ContainsKey(material.RawMaterialName))
+                    {
+                        RawMaterialsNamePos.Add(material.RawMaterialName, (short)material.RawMaterialLocation);
+                    }
+                }
+            }
 
         }
 
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs
index 3e686249..bf29ce35 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using System.Collections.ObjectModel;
 using BPASmartClient.JXJFoodSmallStation.Model.Par;
+using BPASmartClient.JXJFoodSmallStation.Model.RawMaterial;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model
 {
@@ -14,5 +15,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         public ObservableCollection<DeviceParMode> deviceParModels { get; set; } = new ObservableCollection<DeviceParMode>();
         public ConnectParMode deviceConnectPar { get { return _mdeviceConnectPar; } set { _mdeviceConnectPar = value; OnPropertyChanged(); } }
         private ConnectParMode _mdeviceConnectPar = new ConnectParMode();
+        public ObservableCollection<RawMaterialStockBin> rawMaterialStockBin { get; set; } = new ObservableCollection<RawMaterialStockBin>();
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RawMaterialStockBin.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RawMaterialStockBin.cs
new file mode 100644
index 00000000..1cd90b17
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RawMaterialStockBin.cs
@@ -0,0 +1,29 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.Model.RawMaterial
+{
+    public class RawMaterialStockBin : ObservableObject
+    {
+
+        public short RawMaterialCount { get { return _mRawMaterialCount; } set { _mRawMaterialCount = value; OnPropertyChanged(); } }
+        private short _mRawMaterialCount;
+
+        /// <summary>
+        /// 原料名称
+        /// </summary>
+        public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } }
+        private string _mRawMaterialName;
+
+
+        /// <summary>
+        /// 原料对应料仓的位置
+        /// </summary>
+        public int RawMaterialLocation { get { return _mRawMaterialLocation; } set { _mRawMaterialLocation = value; OnPropertyChanged(); } }
+        private int _mRawMaterialLocation;
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
index 16f0baa0..7c145c99 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
@@ -94,7 +94,7 @@
                     Height="40"
                     Margin="5,0,5,0"
                     Command="{Binding SystemReset}"
-                    Content="系统复位"
+                    Content="PLC系统复位"
                     FontSize="20"
                     Panel.ZIndex="0"
                     Style="{StaticResource ImageButtonStyle}"></Button>
@@ -112,10 +112,44 @@
 
         </Grid>
         <Grid Grid.Row="2">
-            <WrapPanel>
-                <TextBlock Text="心跳：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                <TextBlock Text="{Binding Heartbeat}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
-            </WrapPanel>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                </Grid.RowDefinitions>
+
+                <WrapPanel>
+                    <TextBlock Text="心跳：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding Heartbeat}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel Grid.Row="1">
+                    <TextBlock Text="当前系统状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding OrderStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel Grid.Row="2">
+                    <TextBlock Text="柔性味魔方配料完成，延迟复位时间：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBox Text="{Binding time}" Width="150"  HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBox>
+                    <TextBlock Text="ms" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <Button
+                        Width="100"
+                        Height="40"
+                        Margin="5,0,5,0"
+                        Command="{Binding TimeSet}"
+                        Content="设置"
+                        FontSize="20"
+                        Panel.ZIndex="0"
+                        Style="{StaticResource ImageButtonStyle}"></Button>
+                </WrapPanel>
+            </Grid>
         </Grid>
     </Grid>
 </UserControl>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml b/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml
new file mode 100644
index 00000000..87c2680a
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml
@@ -0,0 +1,138 @@
+<UserControl x:Class="BPASmartClient.JXJFoodSmallStation.View.StockBinRawMaterialView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920">
+    <UserControl.DataContext>
+        <vm:StockBinRawMaterialViewModel />
+    </UserControl.DataContext>
+    
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="60" />
+            <RowDefinition Height="40" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <!--#region 表格标题栏设置-->
+        <Grid>
+            <StackPanel HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
+                <pry:IcoButton
+                    Margin="10"
+                    Command="{Binding UpdateRawMaterial}"
+                    Content="新增数据"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource IcoButtonStyle}" />
+                <pry:IcoButton
+                    Margin="10"
+                    Command="{Binding SaveRawMaterialPara}"
+                    Content="保存参数"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource IcoButtonStyle}" />
+            </StackPanel>
+            
+        </Grid>
+        <Grid
+            Grid.Row="1"
+            Margin="0,10,0,0"
+            Background="#ff0C255F">
+
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid Grid.Column="0">
+                <TextBlock  Text="序号" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"/>
+                <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
+            </Grid>
+            <TextBlock  Grid.Column="1" FontSize="24" Text="料仓位置" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            
+            <TextBlock  Grid.Column="2" FontSize="24" Text="原料编号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <TextBlock  Grid.Column="3" FontSize="24" Text="编辑" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+        </Grid>
+        <Grid Grid.Row="2">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"  >
+                <ItemsControl ItemsSource="{Binding RawMaterialInfo}" Foreground="Aqua">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid Name="gr" >
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Grid Grid.Column="0" Margin="5">
+                                    <TextBlock
+                                        FontSize="16"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding  RawMaterialCount}" />
+                                    <Border
+                                        BorderThickness="1,0,1,0"
+                                        Cursor="SizeWE" />
+                                    
+                                </Grid>
+                                <Grid Grid.Column="1" Margin="5">
+                                    <TextBox
+                                        Width="50"
+                                        FontSize="16"
+                                        TextAlignment="Center"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding  RawMaterialLocation}" />
+                                    <Border
+                                        BorderThickness="1,0,1,0"
+                                        Cursor="SizeWE" />
+
+                                </Grid>
+                                <Grid Grid.Column="2" Margin="5">
+                                    <TextBox
+                                        Width="50"
+                                        FontSize="16"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center" 
+                                        Text="{Binding  RawMaterialName}" />
+                                    <Border
+                                        BorderThickness="1,0,1,0"
+                                        Cursor="SizeWE"  />
+                                </Grid>
+                                <Grid Grid.Column="3">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                        <pry:IcoButton
+                                            Margin="3,4,4,0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Background="#11F53F62"
+                                            BorderThickness="0"
+                                            Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                            CommandParameter="{Binding RawMaterialLocation}"
+                                            Content="删除"
+                                            EnterBackground="#22F53F62"
+                                            Foreground="#FFF53F62"
+                                            IcoText="&#xe68e;"
+                                            Style="{StaticResource IcoButtonStyle}" />
+                                    </StackPanel>
+                                    
+                                </Grid>
+                            </Grid>
+                            
+                            <DataTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                </Trigger>
+                            </DataTemplate.Triggers>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml.cs
new file mode 100644
index 00000000..fe3e6909
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.JXJFoodSmallStation.View
+{
+    /// <summary>
+    /// HKPlcCommMonitor.xaml 的交互逻辑
+    /// </summary>
+    public partial class StockBinRawMaterialView : UserControl
+    {
+        public StockBinRawMaterialView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
index fa79e115..9322b444 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
@@ -16,6 +16,7 @@ using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
 using System.Threading;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using BPASmartClient.CustomResource.Pages.Model;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -23,47 +24,93 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
     {
         public ManualFlowViewModel()
         {
+            time = GVL_SmallStation.Time;
             Test1Command = new RelayCommand(() =>
             {
                 GVL_SmallStation.AGV_PutTray1Finish = true;
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV送托盘完成");
             });
             Test2Command = new RelayCommand(() =>
             {
                 GVL_SmallStation.WindSendDosingComple = true;
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，粉料仓配料完成");
             });
             Test3Command = new RelayCommand(() =>
             {
                 GVL_SmallStation.AGV_GetTray1Finish = true;
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV取托盘完成");
             });
             Test4Command = new RelayCommand(() =>
             {
                 GVL_SmallStation.CylinderReset = true;
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，气缸收紧错位复位");
             });
             Test5Command = new RelayCommand(() =>
             {
                 GVL_SmallStation.WindSendAllowAGVPutGet = true;
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，粉料仓提升到位");
             });
             Test6Command = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("AGVPutTrayFinish");
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV放货架流程完成");
             });
             CLearRecipeInfo = new RelayCommand(() => 
             {
                 ActionManage.GetInstance.Send("CLearRecipeInfo");
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，配方清零");
             });
             SystemReset = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("ManualSystemReset");
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，PLC系统复位");
             });
             BPAResetCommand = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("BPASystemReset");
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，上位机初始化");
             });
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
                 Heartbeat = GVL_SmallStation.GetInstance.HeartBeatFromPlc;
+                switch (GVL_SmallStation.SiemensSendRecipeStatus) 
+                {
+                    case 0:
+                        OrderStatus = "初始状态";
+                        break;
+                    case 1:
+                        OrderStatus = "向西门子请求配方";
+                        break;
+                    case 2:
+                        OrderStatus = "上位机接收到配方";
+                        break;
+                    case 3:
+                        OrderStatus = "西门子确认上位机接收到配方";
+                        break;
+                    case 4:
+                        OrderStatus = "上位机向西门子请求配料";
+                        break;
+                    case 5:
+                        OrderStatus = "西门子确认配料";
+                        break;
+                    case 6:
+                        OrderStatus = "上位机将配方进行配料";
+                        break;
+                    case 7:
+                        OrderStatus = "配料完成";
+                        break;
+                    default:
+                        OrderStatus = "无意义";
+                        break;
+                }
                 Thread.Sleep(100);
             }), "流程手动设备状态读取",true);
+            TimeSet = new RelayCommand(() =>
+            {
+                GVL_SmallStation.Time = time;
+                MessageNotify.GetInstance.ShowUserLog($"设置柔性味魔方复位时间：{time}s");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{time.ToString()}：设置成功!");
+            });
         }
         public RelayCommand Test1Command { get; set; }
         public RelayCommand Test2Command { get; set; }
@@ -71,9 +118,15 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public RelayCommand Test4Command { get; set; }
         public RelayCommand Test5Command { get; set; }
         public RelayCommand Test6Command { get; set; }
+        public RelayCommand TimeSet { get; set; }
         public static bool Heartbeat { get { return _mHeartbeat; } set { _mHeartbeat = value; OnStaticPropertyChanged(); } }
         private static bool _mHeartbeat;
 
+        public int time { get { return _mtime; } set { _mtime = value; OnStaticPropertyChanged(); } }
+        private int _mtime;
+        public static string OrderStatus { get { return _mOrderStatus; } set { _mOrderStatus = value; OnStaticPropertyChanged(); } }
+        private static string _mOrderStatus = "无意义";
+        
         public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
         public static void OnStaticPropertyChanged([CallerMemberName] string PropName = "")
         {
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs
new file mode 100644
index 00000000..c7ecea4d
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs
@@ -0,0 +1,55 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.Helper;
+using BPASmartClient.JXJFoodSmallStation.Model;
+using BPASmartClient.JXJFoodSmallStation.Model.RawMaterial;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.ViewModel
+{
+    public class StockBinRawMaterialViewModel : ObservableObject
+    {
+        public StockBinRawMaterialViewModel()
+        {
+            RawMaterialInfo = Json<DevicePar>.Data.rawMaterialStockBin;
+            RemoveCommand = new RelayCommand<Object>((loc) =>
+            {
+                if (loc is int pos)
+                {
+                    var res = RawMaterialInfo.FirstOrDefault(p => p.RawMaterialLocation == pos);
+                    if (res != null) RawMaterialInfo.Remove(res);
+                }
+            });
+            SaveRawMaterialPara = new RelayCommand(() => 
+            {
+                Json<DevicePar>.Save();
+                ProcessControl.GetInstance.testData();
+                foreach (var item in Json<DevicePar>.Data.rawMaterialStockBin) 
+                {
+                    MessageNotify.GetInstance.ShowUserLog($"料仓位置:"+ item.RawMaterialLocation+ ",物料编码:" + item.RawMaterialName);
+                }
+                MessageNotify.GetInstance.ShowUserLog($"原料与料仓对应关系保存成功");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"原料与料仓对应关系保存成功");
+            });
+            UpdateRawMaterial = new RelayCommand(() =>
+            {
+                RawMaterialInfo.Add(new RawMaterialStockBin() { RawMaterialCount = (short)(RawMaterialInfo.Count + 1)});
+            });
+        }
+        public ObservableCollection<RawMaterialStockBin> RawMaterialInfo { get; set; } = new ObservableCollection<RawMaterialStockBin>();
+        public RelayCommand<Object> RemoveCommand { get; set; }
+        public RelayCommand SaveRawMaterialPara { get; set; }
+        public RelayCommand UpdateRawMaterial { get; set; }
+    }
+}
diff --git a/BPASmartClient.JakaRobot/BPASmartClient.JakaRobot.csproj b/BPASmartClient.JakaRobot/BPASmartClient.JakaRobot.csproj
index ef6914fa..a21a359c 100644
--- a/BPASmartClient.JakaRobot/BPASmartClient.JakaRobot.csproj
+++ b/BPASmartClient.JakaRobot/BPASmartClient.JakaRobot.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\BPASmartClient.Helper\BPASmartClient.Helper.csproj" />
     <ProjectReference Include="..\BPASmartClient.Message\BPASmartClient.Message.csproj" />
   </ItemGroup>
 
diff --git a/BPASmartClient.JakaRobot/JaKaHelper.cs b/BPASmartClient.JakaRobot/JaKaHelper.cs
index b6f259c4..1402fff6 100644
--- a/BPASmartClient.JakaRobot/JaKaHelper.cs
+++ b/BPASmartClient.JakaRobot/JaKaHelper.cs
@@ -1,4 +1,5 @@
-using BPASmartClient.Message;
+using BPASmartClient.Helper;
+using BPASmartClient.Message;
 using System.Text;
 
 namespace BPASmartClient.JakaRobot
@@ -72,44 +73,50 @@ namespace BPASmartClient.JakaRobot
         //private JaKaHelper() { }
         public bool IsIdle { get; set; } = false;
         public bool IsConnected { get { return login; } }
+        public bool IsDeviceFirstInit { get; set; }
 
         public void Connect(string ip)
         {
             bool ErrorFlag = false;
-            while (rshd == -1 || login == false)
+            ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                try
+                if (rshd == -1 || login == false) 
                 {
-                    jakaAPI.create_handler(ip.ToCharArray(), ref rshd);
-
-                    login = true;
+                    try
+                    {
+                        jakaAPI.create_handler(ip.ToCharArray(), ref rshd);
+                        login = true;
 
-                }
-                catch (Exception ex)
-                {
-                    if (!ErrorFlag)
+                    }
+                    catch (Exception ex)
                     {
-                        MessageLog.GetInstance.ShowEx(ex.ToString());
-                        ErrorFlag = true;
-                        login = false;
+                        if (!ErrorFlag)
+                        {
+                            MessageLog.GetInstance.ShowEx(ex.ToString());
+                            ErrorFlag = true;
+                            login = false;
+                        }
+                        Thread.Sleep(3000);
                     }
-                    Thread.Sleep(3000);
-                }
-            }
-            if (login)
-            {
-                try
-                {
-                    Power_On();//打开机器人电源
-                    Thread.Sleep(1000);
-                    Enable_robot();//机器人上使能
-                    MessageLog.GetInstance.Show("机器人已上电使能");
-                }
-                catch (Exception ex)
+                } 
+                if (login && IsDeviceFirstInit==false)
                 {
-                    MessageLog.GetInstance.ShowEx("机器人未完成上电和使能");
+                    try
+                    {
+                        Power_On();//打开机器人电源
+                        Thread.Sleep(1000);
+                        Enable_robot();//机器人上使能
+                        IsDeviceFirstInit = true;
+                        MessageLog.GetInstance.Show("机器人已上电使能");
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageLog.GetInstance.ShowEx("机器人未完成上电和使能");
+                    }
                 }
-            }
+                Thread.Sleep(5000);
+            }), $"节卡机器人连接", true);
+           
         }
         public void Power_On()
         {
@@ -319,13 +326,14 @@ namespace BPASmartClient.JakaRobot
             try
             {
                 //加载
-                file = Programname.ToCharArray();
+                p: file = Programname.ToCharArray();
                 MessageLog.GetInstance.Show($"调用文件名：{Programname}");
                 status = new JKTYPE.ProgramState();
                 jakaAPI.get_program_state(ref rshd, ref status);
                 if (status != JKTYPE.ProgramState.PROGRAM_IDLE)
                 {
                     MessageLog.GetInstance.Show($"程序运行中，无法加载程序!!!");
+                    goto p;
                 }
                 else
                 {
@@ -336,11 +344,13 @@ namespace BPASmartClient.JakaRobot
                     else
                     {
                         MessageLog.GetInstance.Show($"加载程序失败！！！");
+                        goto p;
                     }
                 }
                 if (status == JKTYPE.ProgramState.PROGRAM_RUNNING)
                 {
                     MessageLog.GetInstance.Show($"程序处于已处于启动状态！！！");
+                    goto p;
                 }
                 else if (status == JKTYPE.ProgramState.PROGRAM_IDLE)
                 {
@@ -349,6 +359,7 @@ namespace BPASmartClient.JakaRobot
                     if (jakafile.Length == 0)
                     {
                         MessageLog.GetInstance.Show($"未加载程序，无法运行！！！");
+                        goto p;
                     }
                     else
                     {
diff --git a/BPASmartClient.MilkTeaCube/BPASmartClient.MilkTeaCube.csproj b/BPASmartClient.MilkTeaCube/BPASmartClient.MilkTeaCube.csproj
new file mode 100644
index 00000000..fda73f31
--- /dev/null
+++ b/BPASmartClient.MilkTeaCube/BPASmartClient.MilkTeaCube.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+	  <TargetFramework>net6.0</TargetFramework>
+	  <ImplicitUsings>enable</ImplicitUsings>
+	  <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BPASmartClient.Modbus\BPASmartClient.Modbus.csproj" />
+    <ProjectReference Include="..\BPASmartClient.Peripheral\BPASmartClient.Peripheral.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/BPASmartClient.MilkTeaCube/MilkTeaCubeMachine.cs b/BPASmartClient.MilkTeaCube/MilkTeaCubeMachine.cs
new file mode 100644
index 00000000..33c678a4
--- /dev/null
+++ b/BPASmartClient.MilkTeaCube/MilkTeaCubeMachine.cs
@@ -0,0 +1,90 @@
+using BPASmartClient.Peripheral;
+using System;
+using BPASmartClient.Modbus;
+using BPASmartClient.Helper;
+using System.Threading;
+using BPASmartClient.Model.�̲�ζħ��;
+using BPASmartClient.EventBus;
+using static BPASmartClient.EventBus.EventBus;
+
+namespace BPASmartClient.MilkTeaCube
+{
+    public class MilkTeaCubeMachine: BasePeripheral
+    {
+        public ModbusTcp modbus =new ModbusTcp();
+        public override void Init() 
+        {
+            modbus.ModbusTcpConnect(communicationPar.IPAddress);
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                IsConnected = modbus.Connected;
+                if (!IsConnected) IsWork = false;
+                if (IsConnected)
+                {
+                    IsWork = true;
+                    if (status != null)
+                    {
+                        var a = modbus.Read("LB0");
+                        var b = modbus.Read("LB13");
+                        if (a is bool[] a1 && b is bool[] b1)
+                        {
+                            SetStatus("Get_MilkTeaCubeStatus", a1[0]);
+                            SetStatus("Get_MilkTeaCubeDosingStatus", b1[0]);
+                        }
+                    }
+                    Thread.Sleep(500);
+                }
+                Thread.Sleep(1000);
+            }), $"�̲�ζħ���豸����", true);
+            EventBus.EventBus.GetInstance().Subscribe<MilkTea_MakeMilkTeaEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
+            {
+                if (@event == null) return;
+                var par = @event as MilkTea_MakeMilkTeaEvent;
+                switch (par?.TagName)
+                {
+                    case "Start":
+                        modbus.Write("LB14",true);
+                        break;
+                    case "ParameterSet":
+                        modbus.Write("LB14", false);
+                        Thread.Sleep(500);
+                        modbus.Write("LW1002", par.MilkTeaKind[0]);
+                        modbus.Write("LW1006", par.MilkTeaKind[1]);
+                        modbus.Write("LW1008", par.MilkTeaKind[2]);
+                        modbus.Write("LW1010", par.MilkTeaKind[3]);
+                        modbus.Write("LW1012", par.MilkTeaKind[4]);
+                        modbus.Write("LW1014", par.MilkTeaKind[5]);
+                        modbus.Write("LW1016", par.MilkTeaKind[6]);
+                        modbus.Write("LW1018", par.MilkTeaKind[7]);
+                        modbus.Write("LW1020", par.MilkTeaKind[8]);
+                        modbus.Write("LW1022", par.MilkTeaKind[9]);
+                        modbus.Write("LW1024", par.MilkTeaKind[10]);
+                        modbus.Write("LW1026", par.MilkTeaKind[11]);
+                        
+                        break;
+                    case "StartSignReset":
+                        modbus.Write("LB14", false);
+                        break;
+                    default:
+                        break;
+                }
+            });
+        }
+        public override void Start()
+        {
+        }
+
+        public override void Stop()
+        {
+        }
+
+        public override void WriteData(string address, object value)
+        {
+
+        }
+
+        protected override void InitStatus()
+        {
+        }
+    }
+}
diff --git a/BPASmartClient.MilkTeaCubeHelper/BPASmartClient.MilkTeaCubeHelper.csproj b/BPASmartClient.MilkTeaCubeHelper/BPASmartClient.MilkTeaCubeHelper.csproj
new file mode 100644
index 00000000..9a7c06f1
--- /dev/null
+++ b/BPASmartClient.MilkTeaCubeHelper/BPASmartClient.MilkTeaCubeHelper.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+</Project>
diff --git a/BPASmartClient.MilkTeaCubeHelper/Class1.cs b/BPASmartClient.MilkTeaCubeHelper/Class1.cs
new file mode 100644
index 00000000..360d0ef4
--- /dev/null
+++ b/BPASmartClient.MilkTeaCubeHelper/Class1.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace BPASmartClient.MilkTeaCubeHelper
+{
+    public class Class1
+    {
+    }
+}
diff --git a/BPASmartClient.Model/奶茶味魔方/MilkTeaCubeEvent.cs b/BPASmartClient.Model/奶茶味魔方/MilkTeaCubeEvent.cs
new file mode 100644
index 00000000..bdf075a3
--- /dev/null
+++ b/BPASmartClient.Model/奶茶味魔方/MilkTeaCubeEvent.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.Model.奶茶味魔方
+{
+    public class MilkTea_MakeMilkTeaEvent : BaseEvent
+    {
+        public ushort[] MilkTeaKind { get; set; } = new ushort[12];
+    }
+}
diff --git a/BPASmartClient.Model/电夹爪/GripperEvent.cs b/BPASmartClient.Model/电夹爪/GripperEvent.cs
new file mode 100644
index 00000000..bbe03d78
--- /dev/null
+++ b/BPASmartClient.Model/电夹爪/GripperEvent.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.Model.电夹爪
+{
+    public class Wrtie : WriteGripper { }
+}
diff --git a/BPASmartClient.Model/电夹爪/WriteGripper.cs b/BPASmartClient.Model/电夹爪/WriteGripper.cs
new file mode 100644
index 00000000..18c12702
--- /dev/null
+++ b/BPASmartClient.Model/电夹爪/WriteGripper.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.Model.电夹爪
+{
+    public class WriteGripper:BaseEvent
+    {
+        public string CH_Number { get; set; }
+        public string PWMOutput { get; set; }
+    }
+}
diff --git a/BPASmartClient.Model/节卡机器人/JakaModel.cs b/BPASmartClient.Model/节卡机器人/JakaModel.cs
index 00d4702f..5ac5aace 100644
--- a/BPASmartClient.Model/节卡机器人/JakaModel.cs
+++ b/BPASmartClient.Model/节卡机器人/JakaModel.cs
@@ -8,31 +8,82 @@ namespace BPASmartClient.Model
 {
     public class JakaModel
     {
-        public const string SENCE_取杯 = "10000";
-        public const string SENCE_放杯位检测 = "10100";
-        public const string SENCE_取杯检测 = "11000";
-
-        public const string SENCE_接咖啡 = "12000";
-        public const string SENCE_接果汁1 = "12001";
-        public const string SENCE_接果汁2 = "12002";
-        public const string SENCE_接果汁3 = "12003";
-        public const string SENCE_接果汁4 = "12004";
-        public const string SENCE_接茶 = "12005";
-        public const string SENCE_接水 = "12006";
-        public const string SENCE_接茶_接水 = "12007";
-
-        public const string SENCE_放咖啡杯 = "13000";//接饮料位---放饮料过渡位
-        public const string SENCE_放果汁杯1 = "13001";
-        public const string SENCE_放果汁杯2 = "13002";
-        public const string SENCE_放果汁杯3 = "13003";
-        public const string SENCE_放果汁杯4 = "13004";
-        public const string SENCE_放茶水杯 = "13005";
-
-        public const string SENCE_放杯 = "14000";//放杯过渡位到-放杯
-
-        public const string SENCE_放杯检测 = "15000";
-
-        public const string SENCE_初始位 = "20000";
+        public const string SENCE_初始位 = "1000";
+
+        public const string SENCE_初始位_取杯位 = "1010";
+
+        public const string SENCE_取杯位_取杯放杯检测位 = "1011";
+
+        public const string SENCE_取杯放杯检测位_取杯位 = "1012";
+
+        public const string SENCE_取杯位_接咖啡位 = "1020";
+
+        public const string SENCE_取杯位_接奶茶位 = "1021";
+
+        public const string SENCE_等奶茶_接奶茶位 = "1022";
+
+        public const string SENCE_接咖啡位_放咖啡位 = "1030";
+
+        public const string SENCE_接奶茶位_放奶茶位 = "1031";
+
+        public const string SENCE_落杯 = "1100";
+
+        public const string SENCE_初始位_取杯位检测 = "1200";
+
+        public const string SENCE_取杯位检测_取杯位 = "1300";
+
+        public const string SENCE_取杯位_接咖啡 = "1400";
+
+        public const string SENCE_取杯位_接奶茶 = "1500";
+
+        public const string SENCE_初始位_放杯位检测 = "1600";
+
+        public const string SENCE_放杯位检测_接咖啡 = "1610";
+
+        public const string SENCE_放杯位检测_接奶茶 = "1620";
+
+        public const string SENCE_接咖啡_放杯位 = "1700";
+
+        public const string SENCE_接奶茶_放杯位 = "1800";
+
+        public const string SENCE_异常回初始位 = "1900";
+
+        public const string SENCE_接咖啡_初始位 = "1910";
+
+        public const string SENCE_接奶茶_初始位 = "1920";
+
+        public const string SENCE_放杯位_初始位 = "2000";
+
+
+
+        public const string SENCE_初始位_落杯位 = "100";
+
+        public const string SENCE_落杯位_接咖啡位 = "110";
+
+        public const string SENCE_接咖啡位_初始位 = "120";
+
+        public const string SENCE_落杯位_接奶茶等待位 = "150";
+
+        public const string SENCE_接奶茶等待位_初始位 = "160";
+
+
+        public const string SENCE_接咖啡_放咖啡杯 = "";
+        public const string SENCE_接水 = "";
+        public const string SENCE_放茶水杯 = "";
+        public const string SENCE_接茶_接水 = "";
+        public const string SENCE_接果汁1 = "";
+        public const string SENCE_接果汁2 = "";
+        public const string SENCE_接果汁3 = "";
+        public const string SENCE_接果汁4 = "";
+        public const string SENCE_放果汁杯1 = "";
+        public const string SENCE_放果汁杯2 = "";
+        public const string SENCE_放果汁杯3 = "";
+        public const string SENCE_放果汁杯4 = "";
+        public const string SENCE_取杯检测 = "";
+        public const string SENCE_放杯 = "";
+        public const string SENCE_放杯检测 = "";
+        public const string SENCE_接茶 = "";
+
     }
 
     public class WriteJaka : BaseEvent
@@ -48,6 +99,10 @@ namespace BPASmartClient.Model
         public ushort Length { get; set; }
         public object ReadPar { get; set; }
     }
-
+    public enum Kind:int
+    {
+        咖啡 = 1,
+        奶茶 = 2
+    }
 }
 
diff --git a/BPASmartClient.MorkBF/Control_MorkBF.cs b/BPASmartClient.MorkBF/Control_MorkBF.cs
index 91fef0bb..d720c09a 100644
--- a/BPASmartClient.MorkBF/Control_MorkBF.cs
+++ b/BPASmartClient.MorkBF/Control_MorkBF.cs
@@ -37,7 +37,7 @@ namespace BPASmartClient.MorkBF
             ActionManage.GetInstance.Register(new Action(() =>
             {
                 GlobalFoodMenu.LocalFoodMenus.Clear();
-                if(BPASmartClient.Helper.Json<LocalFryPotMessage>.Data.FryPotMessage.Count>0)
+                if (BPASmartClient.Helper.Json<LocalFryPotMessage>.Data.FryPotMessage.Count > 0)
                 {
                     foreach (var item in BPASmartClient.Helper.Json<LocalFryPotMessage>.Data.FryPotMessage)
                     {
@@ -50,7 +50,8 @@ namespace BPASmartClient.MorkBF
             DataParse();//数据解析
             ScreenDataServer();//大屏数据上报
             ActionManage.GetInstance.Send("更新菜单");
-            //ThreadManage.GetInstance().Start(FirePot1_Process, "炒锅1流程");
+            ThreadManage.GetInstance().Start(FirePot1_Process, "炒锅1流程");
+            ThreadManage.GetInstance().Start(FirePot2_Process, "炒锅2流程");
             DeviceProcessLogShow("MORKF 设备初始化完成");
         }
 
@@ -97,23 +98,26 @@ namespace BPASmartClient.MorkBF
         private void CommandRegist()
         {
             #region 炒锅
-            ActionManage.GetInstance.Register(FirePot_SetFireGear, "FirePot_SetFireGear");//炒锅设定加热挡位
+            ActionManage.GetInstance.Register(FirePot_SetFireGear, "FirePot_SetFireGear");//炒锅设定加热挡位1-5
+            ActionManage.GetInstance.Register(FirePot_SetStirGear, "FirePot_SetStirGear");//炒锅设定搅拌挡位1-5
+            ActionManage.GetInstance.Register(FirePot_SetTurnSpeed, "FirePot_SetTurnSpeed");//炒锅翻转速度0-800
+            ActionManage.GetInstance.Register(FirePot_SetPotAngle, "FirePot_SetPotAngle");//设定炒锅角度挡位1-4
+            ActionManage.GetInstance.Register(FirePot_StartPassWay, "FirePot_StartPassWay");//通道出料需求值+启动
+
             ActionManage.GetInstance.Register(FirePot_StartFire, "FirePot_StartFire");//炒锅加热启动
             ActionManage.GetInstance.Register(FirePot_StartFire, "FirePot_StopFire");//炒锅关闭加热
-            ActionManage.GetInstance.Register(FirePot_SetStirGear, "FirePot_SetStirGear");//炒锅设定搅拌挡位
             ActionManage.GetInstance.Register(FirePot_StartStir, "FirePot_StartStir");//炒锅搅拌启动
             ActionManage.GetInstance.Register(FirePot_StartStir, "FirePot_StopStir");//炒锅搅拌停止
-            ActionManage.GetInstance.Register(FirePot_SetTurnSpeed, "FirePot_SetTurnSpeed");//炒锅翻转频率设定
-            ActionManage.GetInstance.Register(FirePot_SetPotAngle, "FirePot_SetPotAngle");//设定炒锅角度
-            ActionManage.GetInstance.Register(FirePot_StartPassWay, "FirePot_StartPassWay");//炒锅翻转频率设定
 
-            ActionManage.GetInstance.Register(FirePot_Reset, "FirePot_Reset");//复位;
             ActionManage.GetInstance.Register(FirePot_PotGotoOrigin, "FirePot_PotGotoOrigin");//炒锅回原点
-            ActionManage.GetInstance.Register(FirePot_PotGotoInFoodPosition, "FirePot_PotGotoInFoodPosition");//炒锅去投料位置
             ActionManage.GetInstance.Register(FirePot_StartOutFood, "FirePot_StartOutFood");//出餐启动
             ActionManage.GetInstance.Register(FirePot_Clean, "FirePot_Clean");//清洗
+
+            ActionManage.GetInstance.Register(FirePot_Reset, "FirePot_Reset");//复位;
             ActionManage.GetInstance.Register(FirePot_StartPumpWater, "FirePot_StartPumpWater");//抽水启动
             ActionManage.GetInstance.Register(FirePot_StartPumpWater, "FirePot_StopPumpWater");//抽水关闭
+            ActionManage.GetInstance.Register(FirePot_PotGotoInFoodPosition, "FirePot_PotGotoInFoodPosition");//炒锅去投料位置
+
             ActionManage.GetInstance.Register(FirePot_PushReach, "FirePot_PushReach");//推杆伸出
             ActionManage.GetInstance.Register(FirePot_PushRetract, "FirePot_PushRetract");//推杆缩回
             ActionManage.GetInstance.Register(FirePot_PotForward, "FirePot_PotForward");//翻转正转
@@ -129,12 +133,11 @@ namespace BPASmartClient.MorkBF
 
         public override void MainTask()
         {
-            
             if(morkBF.RobotActinQueue.Count>0&&! morkBF.Robot_Start)//机器人启动
             {
                if( morkBF.RobotActinQueue.TryDequeue(out RobotAction_Pot robotAction))
                {
-                    morkBF.Robot_IsBusy =true;
+                    morkBF.Robot_IsBusy = true;
                     RobotProcess(robotAction);
                }
             }
@@ -142,11 +145,10 @@ namespace BPASmartClient.MorkBF
 
         private void FirePot1_Process()
         {
-            if (morkBF.FirePan1_Order.Count > 0 && morkBF.FirePot1_InitCompleted && morkBF.FirePot2_IsAuto && !morkBF.FirePan1_Busy)
+            if (morkBF.FirePan1_Order.Count > 0 && morkBF.FryPan1_InitComplete && morkBF.FryPan1_ManualOrAutoMode && !morkBF.FirePan1_Busy)
             {
                 if (morkBF.FirePan1_Order.TryDequeue(out FryPotMessages result))
                 {
-
                     morkBF.FirePan1_Busy = true;
                     morkBF.FryPot1_CurrentProcess = result.fryPotProcesses;
                     foreach (var item in result.fryPotProcesses)
@@ -178,17 +180,56 @@ namespace BPASmartClient.MorkBF
                         }
                     }
                     FirePot_StartFire(new object[] { 1, false });//关火
-                    Thread.Sleep(result.FryOffStirTime*1000);//关火翻炒时间
+                    Thread.Sleep(result.FryOffStirTime * 1000);//关火翻炒时间
                     FirePot_StartStir(new object[] { 1, false });//关闭搅拌
                     Message.MessageLog.GetInstance.Show($"炒锅1炒制{result.GoodName}完成");
 
                 }
             } 
         }
-
         private void FirePot2_Process()
         {
-           
+            if (morkBF.FirePan2_Order.Count > 0 && morkBF.FryPan2_InitComplete && morkBF.FryPan2_ManualOrAutoMode && !morkBF.FirePan2_Busy)
+            {
+                if (morkBF.FirePan2_Order.TryDequeue(out FryPotMessages result))
+                {
+                    morkBF.FirePan2_Busy = true;
+                    morkBF.FryPot2_CurrentProcess = result.fryPotProcesses;
+                    foreach (var item in result.fryPotProcesses)
+                    {
+                        switch (item.fryActions)
+                        {
+                            case FryAction.冷锅加热:
+                                FirePot_PotPerHeat(item, 2);
+                                MessageLog.GetInstance.Show("炒锅2---冷锅加热完成");
+                                break;
+                            case FryAction.热油:
+                                FirePot_HeatOil(item, 2);
+                                MessageLog.GetInstance.Show("炒锅2---热油完成");
+                                break;
+                            case FryAction.机器人加调料:
+                                FirePot_RobotGetSeasoning(item, 2);
+                                MessageLog.GetInstance.Show("炒锅2---机器人加调料完成");
+                                break;
+                            case FryAction.通道出调料:
+                                FirePot_PasswayOutSeasoning(item, 2);
+                                MessageLog.GetInstance.Show("炒锅2---通道出调料完成");
+                                break;
+                            case FryAction.炒制菜品:
+                                FirePot_FryFood(item, 2);
+                                MessageLog.GetInstance.Show("炒锅2---炒制菜品完成");
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    FirePot_StartFire(new object[] { 1, false });//关火
+                    Thread.Sleep(result.FryOffStirTime * 1000);//关火翻炒时间
+                    FirePot_StartStir(new object[] { 1, false });//关闭搅拌
+                    Message.MessageLog.GetInstance.Show($"炒锅1炒制{result.GoodName}完成");
+
+                }
+            }
         }
 
 
@@ -223,7 +264,7 @@ namespace BPASmartClient.MorkBF
         private void FirePot_PotPerHeat(FryPotProcess item,int i)
         {
             bool isRobotWork = false;
-           
+            
             FirePot_SetFireGear(new object[]{ i, item.FryGear});//设定加热挡位
             FirePot_StartFire(new object[] { i, true });
             isRobotWork = IsRobotNextWork(i,item.FryTime);//下个流程动作是否需要机器人
@@ -318,7 +359,7 @@ namespace BPASmartClient.MorkBF
             {
                 Thread.Sleep(300);
             }
-            if((int)robotAction.subTask1>0&& (int)robotAction.subTask1<16)//任务1
+            if ((int)robotAction.subTask1 > 0 && (int)robotAction.subTask1 < 16)//任务1
             {
                 Robot_Write("GI1", (int)robotAction.subTask1);
                 Thread.Sleep(1000);
@@ -327,7 +368,7 @@ namespace BPASmartClient.MorkBF
                     Thread.Sleep(300);
                 }
             }
-            if((int)robotAction.subTask1>15) //出餐
+            if ((int)robotAction.subTask1 > 15) //出餐
             {
 
             }
@@ -368,104 +409,85 @@ namespace BPASmartClient.MorkBF
             MessageLog.GetInstance.Show($"机器人完成[{robotAction.MainTask.ToString()}]任务");
         }
 
+        /// <summary>
+        /// PLC——>上位机（PLC反馈的数据）
+        /// </summary>
         public override void ReadData()
         {
-            GetStatus("M20.0",new Action<object>((o)=>
+            GetStatus("M40.0",new Action<object>((o)=>
             {
                 if (o == null) return;
-                if(o is bool[] values&&values.Length == 19)
-                {
-                    morkBF.FirePot1_InitCompleted = values[0];
-                    morkBF.FirePot1_IsAuto = values[1];
-                    morkBF.FirePot1_Emergencystop = values[2];
-                    morkBF.FirePot1_MealTubExist = values[3];
-                    morkBF.FirePot1_VegetablesTub1Exist = values[4];
-                    morkBF.FirePot1_VegetablesTub2Exist = values[5];
-                    morkBF.FirePot1_Seasoning1Exist = values[6];
-                    morkBF.FirePot1_Seasoning2Exist = values[7];
-                    morkBF.FirePot1_Accessories1Exist = values[8];
-                    morkBF.FirePot1_Accessories2Exist = values[9];
-                    morkBF.FirePot1_OutFoodTubExist = values[10];
-                    morkBF.FirePot1_OnOrigin = values[11];
-                    morkBF.FirePot1_FirePosition1 = values[12];
-                    morkBF.FirePot1_FirePosition2 = values[13];
-                    morkBF.FirePot1_FirePosition3 = values[14];
-                    morkBF.FirePot1_FirePosition4 = values[15];
-                    morkBF.FirePot1_PotOnOutFoodPosition = values[16];
-                    morkBF.FirePot1_PotOnIntoFoodPosition = values[17];
-                    morkBF.FirePot1_PotOnCleanPosition = values[18];
-
-                }
-            }),0);
-
-            GetStatus("VW120", new Action<object>((o) =>
-            {
-                if (o == null) return;
-                if (o is int[] values&&values.Length == 2)
+                if(o is bool[] values&&values.Length == 18)
                 {
-                    morkBF.FirePot1_Temperature = values[0];
-                    morkBF.FirePot1_Pulse = values[1];
-
+                    morkBF.FryPan1_InitComplete = values[0];
+                    morkBF.FryPan1_ManualOrAutoMode = values[1];
+                    morkBF.FryPan1_EStop = values[2];
+                    morkBF.FryPan1_InPosition1 = values[3];
+                    morkBF.FryPan1_InPosition2 = values[4];
+                    morkBF.FryPan1_InPosition3 = values[5];
+                    morkBF.FryPan1_InPosition4 = values[6];
+                    morkBF.FryPan1_InPositionUnload = values[7];
+                    morkBF.FryPan1_InPositionload = values[8];
+                    morkBF.FryPan1_InPositionWashPot = values[9];
+                    morkBF.FryPan1_UnloadFinishCH1 = values[10];
+                    morkBF.FryPan1_UnloadFinishCH2 = values[11];
+                    morkBF.FryPan1_UnloadFinishCH3 = values[12];
+                    morkBF.FryPan1_UnloadFinishCH4 = values[13];
+                    morkBF.FryPan1_UnloadFinishCH5 = values[14];
+                    morkBF.FryPan1_UnloadFinishCH6 = values[15];
+                    morkBF.FryPan1_UnloadFinishCH7 = values[16];
+                    morkBF.FryPan1_UnloadFinishCH8 = values[17];
                 }
-            }), 0);
-
-            GetStatus("M25.0", new Action<object>((o) =>
-            {
-                if (o == null) return;
-                if (o is bool[] values&& values.Length == 19)
-                {
-                    morkBF.FirePot2_InitCompleted = values[0];
-                    morkBF.FirePot2_IsAuto = values[1];
-                    morkBF.FirePot2_Emergencystop = values[2];
-                    morkBF.FirePot2_MealTubExist = values[3];
-                    morkBF.FirePot2_VegetablesTub1Exist = values[4];
-                    morkBF.FirePot2_VegetablesTub2Exist = values[5];
-                    morkBF.FirePot2_Seasoning1Exist = values[6];
-                    morkBF.FirePot2_Seasoning2Exist = values[7];
-                    morkBF.FirePot2_Accessories1Exist = values[8];
-                    morkBF.FirePot2_Accessories2Exist = values[9];
-                    morkBF.FirePot2_OutFoodTubExist = values[10];
-                    morkBF.FirePot2_OnOrigin = values[11];
-                    morkBF.FirePot2_FirePosition1 = values[12];
-                    morkBF.FirePot2_FirePosition2 = values[13];
-                    morkBF.FirePot2_FirePosition3 = values[14];
-                    morkBF.FirePot2_FirePosition4 = values[15];
-                    morkBF.FirePot2_PotOnOutFoodPosition = values[16];
-                    morkBF.FirePot2_PotOnIntoFoodPosition = values[17];
-                    morkBF.FirePot2_PotOnCleanPosition = values[18];
-
-                }
-            }), 0);
+            }),0);
 
-            GetStatus("VW150", new Action<object>((o) =>
+            GetStatus("VW200", new Action<object>((o) =>
             {
                 if (o == null) return;
-                if (o is int[] values&& values.Length == 2)
+                if (o is short[] values&&values.Length == 4)
                 {
-                    morkBF.FirePot2_Temperature = values[0];
-                    morkBF.FirePot2_Pulse = values[1];
-
+                    morkBF.FryPan1_TemperatureNow = values[0];
+                    morkBF.FryPan1_MixingSpeedNow = values[1];
+                    morkBF.FryPan1_FryAngle = values[2]; 
+                    morkBF.FryPan1_HeatingGearNow = values[3];
                 }
             }), 0);
-        
-
-            GetStatus("VW2250", new Action<object>((o) =>
+            GetStatus("M40.0", new Action<object>((o) =>
             {
                 if (o == null) return;
-                if (o is int[] values && values.Length == 1)
+                if (o is bool[] values && values.Length == 18)
                 {
-                    dataReport.FirePot1_PotState = values[0];
+                    morkBF.FryPan2_InitComplete = values[0];
+                    morkBF.FryPan2_ManualOrAutoMode = values[1];
+                    morkBF.FryPan2_EStop = values[2];
+                    morkBF.FryPan2_InPosition1 = values[3];
+                    morkBF.FryPan2_InPosition2 = values[4];
+                    morkBF.FryPan2_InPosition3 = values[5];
+                    morkBF.FryPan2_InPosition4 = values[6];
+                    morkBF.FryPan2_InPositionUnload = values[7];
+                    morkBF.FryPan2_InPositionload = values[8];
+                    morkBF.FryPan2_InPositionWashPot = values[9];
+                    morkBF.FryPan2_UnloadFinishCH1 = values[10];
+                    morkBF.FryPan2_UnloadFinishCH2 = values[11];
+                    morkBF.FryPan2_UnloadFinishCH3 = values[12];
+                    morkBF.FryPan2_UnloadFinishCH4 = values[13];
+                    morkBF.FryPan2_UnloadFinishCH5 = values[14];
+                    morkBF.FryPan2_UnloadFinishCH6 = values[15];
+                    morkBF.FryPan2_UnloadFinishCH7 = values[16];
+                    morkBF.FryPan2_UnloadFinishCH8 = values[17];
                 }
             }), 1);
-            GetStatus("VW2350", new Action<object>((o) =>
+
+            GetStatus("VW200", new Action<object>((o) =>
             {
                 if (o == null) return;
-                if (o is int[] values && values.Length == 1)
+                if (o is short[] values && values.Length == 4)
                 {
-                    dataReport.FirePot2_PotState = values[0];
+                    morkBF.FryPan2_TemperatureNow = values[0];
+                    morkBF.FryPan2_MixingSpeedNow = values[1];
+                    morkBF.FryPan2_FryAngle = values[2];
+                    morkBF.FryPan2_HeatingGearNow = values[3];
                 }
             }), 1);
-
         }
 
         public override void ResetProgram()
@@ -538,133 +560,130 @@ namespace BPASmartClient.MorkBF
             Thread.Sleep(200);
         }
         /// <summary>
-        /// 炒锅1加热启停
+        /// 炒锅1设置搅拌挡位
         /// </summary>
-        /// <param name="b"></param>
-        private void FirePot_StartFire(object[] o)
+        /// <param name="o"></param>
+        private void FirePot_SetStirGear(object[] o)
         {
             if (o == null) return;
-            if (o.Length == 2 && o[0] is int fryNo && o[1] is bool value)
+            if (o.Length == 2 && o[0] is int fryNo && o[1] is int value)
             {
                 if (fryNo == 1)
                 {
-                    FirePot1_Write("M10.0", value);
+                    FirePot1_Write("VW102", (ushort)value);
                 }
                 else if (fryNo == 2)
                 {
-                    FirePot2_Write("M10.0", value);
+                    FirePot2_Write("VW102", (ushort)value);
                 }
             }
             Thread.Sleep(200);
-        }    
+        }
         /// <summary>
-        /// 炒锅1设置搅拌挡位
+        /// 设置炒锅翻转速度
         /// </summary>
         /// <param name="o"></param>
-        private void FirePot_SetStirGear(object[] o)
+        private void FirePot_SetTurnSpeed(object[] o)
         {
             if (o == null) return;
             if (o.Length == 2 && o[0] is int fryNo && o[1] is int value)
             {
                 if (fryNo == 1)
                 {
-                    FirePot1_Write("VW102", (ushort)value);
+                    FirePot1_Write("VW104", (ushort)value);
                 }
                 else if (fryNo == 2)
                 {
-                    FirePot2_Write("VW102", (ushort)value);
+                    FirePot2_Write("VW104", (ushort)value);
                 }
             }
             Thread.Sleep(200);
         }
         /// <summary>
-        /// 炒锅1搅拌启停
+        /// 设定炒锅角度
         /// </summary>
         /// <param name="o"></param>
-        private void FirePot_StartStir(object[] o)
+        private void FirePot_SetPotAngle(object[] o)
         {
             if (o == null) return;
-            if (o.Length == 2 && o[0] is int fryNo && o[1] is bool value)
+            if (o.Length == 2 && o[0] is int fryNo && o[1] is int value)
             {
                 if (fryNo == 1)
                 {
-                    FirePot1_Write("M10.1", value);
+                    FirePot1_Write("VW106", (ushort)value);
                 }
                 else if (fryNo == 2)
                 {
-                    FirePot2_Write("M10.1", value);
+                    FirePot2_Write("VW106", (ushort)value);
                 }
             }
             Thread.Sleep(200);
         }
         /// <summary>
-        /// 设置炒锅1翻转速度
+        /// 通道出料启动
         /// </summary>
         /// <param name="o"></param>
-        private void FirePot_SetTurnSpeed(object[] o)
+        private void FirePot_StartPassWay(object[] o)
         {
             if (o == null) return;
-            if (o.Length == 2 && o[0] is int fryNo && o[1] is int value)
+            if (o.Length == 3 && o[0] is int fryNo && o[1] is int value1 && o[2] is int value2)
             {
                 if (fryNo == 1)
                 {
-                    FirePot1_Write("VW104", (ushort)value);
+                    FirePot1_Write(morkBF.Fire_PasswayValue[value1], (ushort)value2);//写入需求值
+                    Thread.Sleep(200);
+                    FirePot1_Write(morkBF.Fire_PasswayWrite[value1], true);//启动通道
                 }
                 else if (fryNo == 2)
                 {
-                    FirePot2_Write("VW104", (ushort)value);
+                    FirePot2_Write(morkBF.Fire_PasswayValue[value1], (ushort)value2);
+                    Thread.Sleep(200);
+                    FirePot2_Write(morkBF.Fire_PasswayWrite[value1], true);
                 }
             }
             Thread.Sleep(200);
         }
         /// <summary>
-        /// 设定炒锅角度
+        /// 炒锅1加热启停
         /// </summary>
-        /// <param name="o"></param>
-        private void FirePot_SetPotAngle(object[] o)
+        /// <param name="b"></param>
+        private void FirePot_StartFire(object[] o)
         {
             if (o == null) return;
-            if (o.Length == 2 && o[0] is int fryNo && o[1] is int value)
+            if (o.Length == 2 && o[0] is int fryNo && o[1] is bool value)
             {
                 if (fryNo == 1)
                 {
-                    FirePot1_Write("VW106", (ushort)value);
+                    FirePot1_Write("M10.0", value);
                 }
                 else if (fryNo == 2)
                 {
-                    FirePot2_Write("VW106", (ushort)value);
+                    FirePot2_Write("M10.0", value);
                 }
             }
             Thread.Sleep(200);
-        }
-
+        }    
+        
         /// <summary>
-        /// 通道出料启动
+        /// 炒锅搅拌启停
         /// </summary>
         /// <param name="o"></param>
-        private void FirePot_StartPassWay(object[] o)
+        private void FirePot_StartStir(object[] o)
         {
             if (o == null) return;
-            if (o.Length == 3 && o[0] is int fryNo && o[1] is int value1&& o[2] is int value2)
+            if (o.Length == 2 && o[0] is int fryNo && o[1] is bool value)
             {
                 if (fryNo == 1)
                 {
-                    FirePot1_Write(morkBF.Fire_PasswayValue[value1], (ushort)value2);//写入需求值
-                    Thread.Sleep(200);
-                    FirePot1_Write(morkBF.Fire_PasswayWrite[value1], true);//启动通道哦
+                    FirePot1_Write("M10.1", value);
                 }
                 else if (fryNo == 2)
                 {
-                    FirePot2_Write(morkBF.Fire_PasswayValue[value1], (ushort)value2);
-                    Thread.Sleep(200);
-                    FirePot2_Write(morkBF.Fire_PasswayWrite[value1], true);
+                    FirePot2_Write("M10.1", value);
                 }
             }
             Thread.Sleep(200);
         }
-
-
-
         /// <summary>
         /// 炒锅复位
         /// </summary>
@@ -683,46 +702,103 @@ namespace BPASmartClient.MorkBF
 
                 }
             }
-
-
         }
         /// <summary>
-        /// 炒锅回原点
+        /// 炒锅设定加热挡位 锁定
         /// </summary>
         /// <param name="o"></param>
-        private void FirePot_PotGotoOrigin(object o)
+        private void FirePot_SetFireGearLock(object[] o)
         {
             if (o == null) return;
-            if (o is int i)
+            if (o.Length == 2 && o[0] is int fryNo && o[1] is int value)
             {
-                if (i == 1)
+                if (fryNo == 1)
                 {
-                    FirePot1_Write("M10.5", true);
+                    FirePot1_Write("M10.2", value);
                 }
-                else if (i == 2)
+                else if (fryNo == 2)
                 {
-                    FirePot2_Write("M10.5", true);
+                    FirePot2_Write("M10.2", value);
                 }
             }
             Thread.Sleep(200);
         }
-       
         /// <summary>
-        /// 炒锅去投料位置
+        /// 炒锅1设置搅拌挡位锁定
         /// </summary>
         /// <param name="o"></param>
-        private void FirePot_PotGotoInFoodPosition(object o)
+        private void FirePot_SetStirGearLock(object[] o)
+        {
+            if (o == null) return;
+            if (o.Length == 2 && o[0] is int fryNo && o[1] is int value)
+            {
+                if (fryNo == 1)
+                {
+                    FirePot1_Write("M10.3", value);
+                }
+                else if (fryNo == 2)
+                {
+                    FirePot1_Write("M10.3", value);
+                }
+            }
+            Thread.Sleep(200);
+        }
+        /// <summary>
+        /// 设置炒锅翻转速度锁定
+        /// </summary>
+        /// <param name="o"></param>
+        private void FirePot_SetTurnSpeedLock(object[] o)
+        {
+            if (o == null) return;
+            if (o.Length == 2 && o[0] is int fryNo && o[1] is int value)
+            {
+                if (fryNo == 1)
+                {
+                    FirePot1_Write("M10.4", value);
+                }
+                else if (fryNo == 2)
+                {
+                    FirePot1_Write("M10.4", value);
+                }
+            }
+            Thread.Sleep(200);
+        }
+        /// <summary>
+        /// 设定炒锅角度值锁定
+        /// </summary>
+        /// <param name="o"></param>
+        private void FirePot_SetPotAngleLock(object[] o)
+        {
+            if (o == null) return;
+            if (o.Length == 2 && o[0] is int fryNo && o[1] is int value)
+            {
+                if (fryNo == 1)
+                {
+                    FirePot1_Write("M11.1", value);
+                }
+                else if (fryNo == 2)
+                {
+                    FirePot1_Write("M11.1", value);
+                }
+            }
+            Thread.Sleep(200);
+        }
+        /// <summary>
+        /// 炒锅回原点
+        /// </summary>
+        /// <param name="o"></param>
+        private void FirePot_PotGotoOrigin(object o)
         {
             if (o == null) return;
             if (o is int i)
             {
                 if (i == 1)
                 {
-                    FirePot1_Write("M11.2", true);
+                    FirePot1_Write("M10.5", true);
                 }
                 else if (i == 2)
                 {
-                    FirePot2_Write("M11.2", true);
+                    FirePot2_Write("M10.5", true);
                 }
             }
             Thread.Sleep(200);
@@ -758,7 +834,7 @@ namespace BPASmartClient.MorkBF
             {
                 if (i == 1)
                 {
-                   FirePot1_Write("M10.7", true);
+                    FirePot1_Write("M10.7", true);
 
                 }
                 else if (i == 2)
@@ -768,8 +844,9 @@ namespace BPASmartClient.MorkBF
             }
             Thread.Sleep(200);
         }
+        
         /// <summary>
-        /// 抽水启动
+        /// 抽洗锅水启动
         /// </summary>
         /// <param name="o"></param>
         private void FirePot_StartPumpWater(object[] o)
@@ -788,6 +865,26 @@ namespace BPASmartClient.MorkBF
             }
             Thread.Sleep(200);
         }
+        /// <summary>
+        /// 炒锅去投料位置
+        /// </summary>
+        /// <param name="o"></param>
+        private void FirePot_PotGotoInFoodPosition(object o)
+        {
+            if (o == null) return;
+            if (o is int i)
+            {
+                if (i == 1)
+                {
+                    FirePot1_Write("M11.2", true);
+                }
+                else if (i == 2)
+                {
+                    FirePot2_Write("M11.2", true);
+                }
+            }
+            Thread.Sleep(200);
+        }
 
         /// <summary>
         /// 推杆伸出
@@ -922,8 +1019,8 @@ namespace BPASmartClient.MorkBF
                 ScreenModelMaxWok maxWok = new ScreenModelMaxWok
                 {
                     IsRun = IsHealth ? IsRun.运行 : IsRun.停止,
-                    WorkStatus_1 = morkBF.FirePot1_Temperature > 0 ? WorkStatus.工作 : WorkStatus.待机,
-                    WorkStatus_2 = morkBF.FirePot2_Temperature > 0 ? WorkStatus.工作 : WorkStatus.待机,
+                    WorkStatus_1 = morkBF.FryPan1_TemperatureNow > 0 ? WorkStatus.工作 : WorkStatus.待机,
+                    WorkStatus_2 = morkBF.FryPan2_TemperatureNow > 0 ? WorkStatus.工作 : WorkStatus.待机,
                     RobotStatu =  WorkStatus.工作,
                     Alarm = new List<AlarmModel>(),
                     FailuresCount = 0,
@@ -934,12 +1031,12 @@ namespace BPASmartClient.MorkBF
                     MaxWok_Task_2 = ((PotState)dataReport.FirePot2_PotState).ToString(),
                     MaxWok_Process_1 = SetFirePotPorcess(new Random().Next(0,11)),
                     MaxWok_Process_2 = SetFirePotPorcess(new Random().Next(0, 11)),
-                    MaxWok_HeatGear_1 = morkBF.FirePot1_FireGear.ToString(),
-                    MaxWok_HeatGear_2 = morkBF.FirePot2_FireGear.ToString(),
-                    MaxWok_StirGear_1 = morkBF.FirePot1_StirGear.ToString(),
-                    MaxWok_StirGear_2 = morkBF.FirePot2_StirGear.ToString(),
-                    MaxWok_FlipSpeed_1 = morkBF.FirePot1_FlipSpeed.ToString(),
-                    MaxWok_FlipSpeed_2 = morkBF.FirePot2_FlipSpeed.ToString(),
+                    MaxWok_HeatGear_1 = morkBF.FryPan1_HeatingGearNow.ToString(),
+                    MaxWok_HeatGear_2 = morkBF.FryPan2_HeatingGearNow.ToString(),
+                    MaxWok_StirGear_1 = morkBF.FryPan1_FryAngle.ToString(),
+                    MaxWok_StirGear_2 = morkBF.FryPan2_FryAngle.ToString(),
+                    MaxWok_FlipSpeed_1 = morkBF.FryPan1_MixingSpeedNow.ToString(),
+                    MaxWok_FlipSpeed_2 = morkBF.FryPan2_MixingSpeedNow.ToString(),
                     MaxWok_Temp_1 = new Random().Next(250, 450).ToString(),
                     MaxWok_Temp_2 = new Random().Next(250, 450).ToString(),
                     MaxWok_OrderCount_1 = 2,
@@ -959,17 +1056,17 @@ namespace BPASmartClient.MorkBF
         {
             if (potState > 0)
             {
-                if(potState <=3)
+                if (potState <= 3)
                 {
                     SetState(2);
                 }
-                else if(potState>3&&potState < 9) SetState(3);
-                else if(potState == 9) SetState(4);
+                else if (potState > 3 && potState < 9) SetState(3);
+                else if (potState == 9) SetState(4);
                 else if (potState == 10) SetState(5);
             }
-            else 
-            { 
-                foreach(var item in dataReport.processModels)
+            else
+            {
+                foreach (var item in dataReport.processModels)
                 {
                     item.Status = ProcessStatus.未执行;
                 }
@@ -987,8 +1084,8 @@ namespace BPASmartClient.MorkBF
                 {
                     dataReport.processModels[i].Status = ProcessStatus.正在执行;
                 }
-                else if( i<c) dataReport.processModels[i].Status = ProcessStatus.执行完成;
-                else if (i > c ) dataReport.processModels[i].Status = ProcessStatus.未执行;
+                else if (i < c) dataReport.processModels[i].Status = ProcessStatus.执行完成;
+                else if (i > c) dataReport.processModels[i].Status = ProcessStatus.未执行;
             }
         }
     }
diff --git a/BPASmartClient.MorkBF/GVL_MorkBF.cs b/BPASmartClient.MorkBF/GVL_MorkBF.cs
index 0fd64e11..33ce20b4 100644
--- a/BPASmartClient.MorkBF/GVL_MorkBF.cs
+++ b/BPASmartClient.MorkBF/GVL_MorkBF.cs
@@ -41,8 +41,8 @@ namespace BPASmartClient.MorkBF
         /// </summary>
         public List<FryPotProcess> FryPot2_CurrentProcess;
 
-
-        #region 炒锅1读取数据
+        #region 旧数据
+        /*#region 炒锅1读取数据
         /// <summary>
         /// 炒锅1锅低温度
         /// </summary>
@@ -155,7 +155,6 @@ namespace BPASmartClient.MorkBF
         public int FirePot1_FlipSpeed { get; set; } = 0;
 
         #endregion
-
         #region 炒锅2读取数据
         /// <summary>
         /// 炒锅2锅低温度
@@ -325,6 +324,7 @@ namespace BPASmartClient.MorkBF
         //[VariableMonitor("机器人动作反馈GI4", "GI4", "4")]
         //public int Robot_GI4ActionCallback { get; set; }
 
+        #endregion*/
         #endregion
         //新版大炒的通讯协议 2023/01/15
         #region 炒锅1读取数据
@@ -480,7 +480,7 @@ namespace BPASmartClient.MorkBF
 
         public Dictionary<int, bool> FirePot2_CompleteSingle { get; set; }
 
-       
+        
         public GVL_MorkBF()
         {
            
diff --git a/BPASmartClient.MorkS3/Alarm.cs b/BPASmartClient.MorkS3/Alarm.cs
new file mode 100644
index 00000000..895427e0
--- /dev/null
+++ b/BPASmartClient.MorkS3/Alarm.cs
@@ -0,0 +1,204 @@
+using BPASmartClient.Device;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkS3
+{
+    public class Alarm : IAlarm
+    {
+        /// <summary>
+        /// 煮面机左侧低温报警
+        /// PLC ---> M230.0
+        /// ModbusTcp --> 1570
+        /// </summary>
+        [Alarm("煮面机左侧低温报警")]
+        public bool MachineLeftLowTemperature { get; set; }
+
+        /// <summary>
+        /// 煮面机左侧低温报警
+        /// PLC ---> M230.1
+        /// ModbusTcp --> 1571
+        /// </summary>
+        [Alarm("煮面机右侧低温报警")]
+        public bool MachineRightLowTemperature { get; set; }
+
+        /// <summary>
+        /// 供碗1缺碗
+        /// PLC ---> 230.2
+        /// ModbusTcp --> 1572
+        /// </summary>
+        [Alarm("供碗1缺碗")]
+        public bool Supply1_LossBowl { get; set; }
+
+        /// <summary>
+        /// 供碗2缺碗
+        /// PLC ---> M230.3
+        /// ModbusTcp --> 1573
+        /// </summary>
+        [Alarm("供碗2缺碗")]
+        public bool Supply2_LossBowl { get; set; }
+
+        /// <summary>
+        /// 供碗1出碗检测异常
+        /// PLC ---> M230.4
+        /// ModbusTcp --> 1574
+        /// </summary>
+        [Alarm("供碗1出碗检测异常")]
+        public bool Supply1_ErrorOutBowl { get; set; }
+
+        /// <summary>
+        /// 供碗2出碗检测异常
+        /// PLC ---> M230.5
+        /// ModbusTcp --> 1575
+        /// </summary>
+        [Alarm("供碗2出碗检测异常")]
+        public bool Supply2_ErrorOutBowl { get; set; }
+
+        /// <summary>
+        /// 推碗气缸故障
+        /// PLC ---> M230.6
+        /// ModbusTcp --> 1576
+        /// </summary>
+        [Alarm("推碗气缸故障")]
+        public bool PushBowlCylinderError { get; set; }
+
+        /// <summary>
+        /// 煮面机通讯异常
+        /// PLC ---> M230.7
+        /// ModbusTcp --> 1577
+        /// </summary>
+        [Alarm("煮面机通讯异常")]
+        public bool NoodleMacCommunicateError { get; set; }
+
+        /// <summary>
+        /// 配料机通讯异常
+        /// PLC ---> M231.0
+        /// ModbusTcp --> 1580
+        /// </summary>
+        [Alarm("配料机通讯异常")]
+        public bool DosingMacCommunicateError { get; set; }
+
+        /// <summary>
+        /// 机器人通讯异常
+        /// PLC ---> M231.1
+        /// ModbusTcp --> 1581
+        /// </summary>
+        [Alarm("机器人通讯异常")]
+        public bool RobotMacCommunicateError { get; set; }
+
+        /// <summary>
+        /// 机器人通讯异常
+        /// PLC ---> M231.2
+        /// ModbusTcp --> 1581
+        /// </summary>
+        [Alarm("设备急停")]
+        public bool DeviceEstop { get; set; }
+
+        /// <summary>
+        /// PLC电池电压低
+        /// PLC ---> M231.3
+        /// ModbusTcp --> 1583
+        /// </summary>
+        [Alarm("PLC电池电压低")]
+        public bool RobotInitError { get; set; }
+
+        /// <summary>
+        /// 机器人急停
+        /// PLC ---> M231.4
+        /// ModbusTcp --> 1584
+        /// </summary>
+        [Alarm("机器人急停")]
+        public bool RobotUrgentStop { get; set; }
+
+        /// <summary>
+        /// 机器人不在远程模式
+        /// PLC ---> M231.5
+        /// ModbusTcp --> 1585
+        /// </summary>
+        [Alarm("机器人不在远程模式")]
+        public bool RobotNotInRemoteMode { get; set; }
+
+        /// <summary>
+        /// 机器人伺服未就绪
+        /// PLC ---> M231.6
+        /// ModbusTcp --> 1586
+        /// </summary>
+        [Alarm("机器人伺服未就绪")]
+        public bool RobotNotInReady { get; set; }
+
+        /// <summary>
+        /// 机器人本体异常
+        /// PLC ---> M231.7
+        /// ModbusTcp --> 1587
+        /// </summary>
+        [Alarm("机器人本体异常")]
+        public bool RobotSelfInException { get; set; }
+
+        /// <summary>
+        /// 煮面机左侧缺水
+        /// PLC ---> M232.0
+        /// ModbusTcp --> 1570
+        /// </summary>
+        [Alarm("煮面机左侧缺水报警")]
+        public bool LeftLackWater { get; set; }
+
+        /// <summary>
+        /// 煮面机右侧缺水
+        /// PLC ---> M232.1
+        /// ModbusTcp --> 1571
+        /// </summary>
+        [Alarm("煮面机右侧缺水报警")]
+        public bool RightLackWater { get; set; }
+
+        /// <summary>
+        /// 丝杆初始化失败
+        /// PLC ---> M232.2
+        /// ModbusTcp --> 1571
+        /// </summary>
+        [Alarm("丝杆初始化失败")]
+        public bool SvrewInitFail { get; set; }
+
+        /// <summary>
+        /// 转盘初始化失败
+        /// PLC ---> M232.3
+        /// ModbusTcp --> 1571
+        /// </summary>
+        [Alarm("转盘初始化失败")]
+        public bool TurntableInitFail { get; set; }
+
+        /// <summary>
+        /// 机器人初始化失败
+        /// PLC ---> M232.4
+        /// ModbusTcp --> 1571
+        /// </summary>
+        [Alarm("机器人初始化失败")]
+        public bool RobotInitFail { get; set; }
+
+        /// <summary>
+        /// 煮面机初始化失败
+        /// PLC ---> M232.5
+        /// ModbusTcp --> 1571
+        /// </summary>
+        [Alarm("煮面机初始化失败")]
+        public bool NoodleCookerInitFail { get; set; }
+
+        /// <summary>
+        /// 推碗1步进推杆初始化失败
+        /// PLC ---> M232.6
+        /// ModbusTcp --> 1571
+        /// </summary>
+        [Alarm("推碗1步进推杆初始化失败")]
+        public bool PushBowlInitFail1 { get; set; }
+
+        /// <summary>
+        /// 推碗2步进推杆初始化失败
+        /// PLC ---> M232.7
+        /// ModbusTcp --> 1571
+        /// </summary>
+        [Alarm("推碗2步进推杆初始化失败")]
+        public bool PushBowlInitFail2 { get; set; }
+    }
+}
diff --git a/BPASmartClient.MorkS3/BPASmartClient.MorkS3.csproj b/BPASmartClient.MorkS3/BPASmartClient.MorkS3.csproj
new file mode 100644
index 00000000..c781b773
--- /dev/null
+++ b/BPASmartClient.MorkS3/BPASmartClient.MorkS3.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+	  <Nullable>enable</Nullable>
+	  <UseWPF>true</UseWPF>
+	  <BaseOutputPath>bin\</BaseOutputPath>
+	  <DebugType>portable</DebugType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BPA.Message" Version="1.0.86" />
+    <PackageReference Include="BPA.Models" Version="1.0.38" />
+    <PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
+    <PackageReference Include="System.Speech" Version="7.0.0" />
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <ProjectReference Include="..\BPASmartClient.Business\BPASmartClient.Business.csproj" />
+    <ProjectReference Include="..\BPASmartClient.CustomResource\BPASmartClient.CustomResource.csproj" />
+    <ProjectReference Include="..\BPASmartClient.Device\BPASmartClient.Device.csproj" />
+    <ProjectReference Include="..\BPASmartClient.EventBus\BPASmartClient.EventBus.csproj" />
+    <ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" />
+    <ProjectReference Include="..\BPASmartClient.MORKSM.BK.PLC\BPASmartClient.PLC.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/BPASmartClient.MorkS3/Control_Morks.cs b/BPASmartClient.MorkS3/Control_Morks.cs
new file mode 100644
index 00000000..3ca33215
--- /dev/null
+++ b/BPASmartClient.MorkS3/Control_Morks.cs
@@ -0,0 +1,891 @@
+using System;
+using System.Collections.Generic;
+using BPA.Message.Enum;
+using BPASmartClient.Device;
+using BPASmartClient.EventBus;
+using BPASmartClient.Model;
+using BPASmartClient.Peripheral;
+using static BPASmartClient.EventBus.EventBus;
+using BPASmartClient.Helper;
+using System.Threading;
+using BPASmartClient.Message;
+using BPA.Message;
+using System.Linq;
+using BPASmartClient.Model.PLC;
+using System.Threading.Tasks;
+using System.Reflection;
+using BPASmartClient.MorkS3.Model;
+using System.Collections.ObjectModel;
+using BPASmartClient.MorkS3.ViewModel;
+using BPASmartClient.Business;
+using BPASmartClient.Model.小炒机;
+using BPA.Models;
+using System.Speech.Synthesis;
+using System.Windows.Forms;
+using System.Media;
+
+namespace BPASmartClient.MorkS3
+{
+    public class Control_Morks : BaseDevice
+    {
+        public override DeviceClientType DeviceType => DeviceClientType.MORKS;
+        GVL_MORKS mORKS = new GVL_MORKS();
+        Alarm alarm = new Alarm();
+
+        public override void DoMain()
+        {
+            MonitorViewModel.DeviceId = DeviceId;   
+            ServerInit();
+            DataParse();
+            Json<MorksPar>.Read();
+            Json<OrderStatistics>.Read();
+            if (Json<MorksPar>.Data.parSets == null) Json<MorksPar>.Data.parSets = new ObservableCollection<ParSet>();
+            if (Json<MorksPar>.Data.parSets.Count < 6)
+            {
+                Json<MorksPar>.Data.parSets.Clear();
+                for (int i = 0; i < 6; i++)
+                {
+                    Json<MorksPar>.Data.parSets.Add(new ParSet()
+                    {
+                        CheckBoxContext = $"煮面口{i + 1}屏蔽",
+                        Minute = 1,
+                        Second = 0,
+                        IsShield = false,
+                        TextBlockContext = $"煮面口{i + 1}时间设定"
+                    });
+                }
+            }
+
+            ActionManage.GetInstance.Register(new Action<object[]>((o) =>
+            {
+                if (o.Length > 0)
+                {
+                    Random rd = new Random();
+                    ThreadManage.GetInstance().StartLong(new Action(() =>
+                    {
+                        int NoodleLoc = (int)o[0] == 0 ? rd.Next(1, 6) : (int)o[0];
+                        int BowlLoc = (int)o[1] == 0 ? rd.Next(10, 12) : (int)o[1];
+
+                        string guid = new Guid().ToString();
+
+                        mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { Loc = (ushort)NoodleLoc, SuborderId = guid });
+                        MessageLog.GetInstance.Show($"添加订单：面条位置【{NoodleLoc}】");
+
+                        mORKS.TakeBowlTask.Enqueue(new OrderLocInfo() { Loc = (ushort)BowlLoc, SuborderId = guid });
+                        MessageLog.GetInstance.Show($"添加订单：碗位置【{BowlLoc}】");
+                        Thread.Sleep(60000);
+                    }), "ForOrder");
+                }
+            }), "EnableForOrder");
+
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is WritePar writePar) WriteData(writePar.Address, writePar.Value);
+            }), "WriteVW");
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is WritePar writePar) WriteData(writePar.Address, writePar.Value);
+            }), "WriteBools");
+            ActionManage.GetInstance.Register(new Action(() => { DeviceInit(); }), "InitDevice");
+        }
+
+        public override void ResetProgram()
+        {
+            mORKS = null;
+            mORKS = new GVL_MORKS();
+        }
+
+        public override void Stop()
+        {
+
+        }
+
+        private void ServerInit()
+        {
+            //物料信息
+            EventBus.EventBus.GetInstance().Subscribe<MaterialDeliveryEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
+             {
+                 if (@event == null) return;
+                 if (@event is MaterialDeliveryEvent material)
+                 {
+                     orderMaterialDelivery = material.orderMaterialDelivery;
+                 }
+             });
+
+            //配方数据信息
+            EventBus.EventBus.GetInstance().Subscribe<RecipeBomEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
+            {
+                if (@event == null) return;
+                if (@event is RecipeBomEvent recipe)
+                {
+                    recipeBoms = recipe.recipeBoms;
+                    WriteRecipeBoms();
+                }
+            });
+
+
+        }
+
+        private void OrderChange(string subid, ORDER_STATUS oRDER_STATUS)
+        {
+            var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
+            string goodName = string.Empty;
+            string SortNum = string.Empty;
+            if (res != null)
+            {
+                goodName = res.MorkOrder.GoodsName;
+                SortNum = res.MorkOrder.SortNum.ToString();
+            }
+
+            EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+
+            var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
+            if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
+            {
+                if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
+                {
+                    DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
+                    DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
+                    {
+                        Status = oRDER_STATUS,
+                        GoodName = goodName,
+                        SortNum = SortNum,
+                        StopTime = DateTime.Now.ToString("HH:mm:ss")
+                    });
+                }
+                else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
+                {
+                    var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
+                    if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
+                }
+                else
+                {
+                    DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
+                }
+            }
+            else
+            {
+                DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
+                {
+                    Status = oRDER_STATUS,
+                    GoodName = goodName,
+                    SortNum = SortNum,
+                    StartTime = DateTime.Now.ToString("HH:mm:ss")
+                });
+            }
+        }
+
+        private void GetStatus(string key, Action<object> action)
+        {
+            if (peripheralStatus.ContainsKey(key))
+            {
+                if (peripheralStatus[key] != null)
+                {
+                    action?.Invoke(peripheralStatus[key]);
+                }
+            }
+        }
+
+        public override void ReadData()
+        {
+            DataServer.GetInstance.morkS.Alarm.Clear();
+            alarms.ForEach(item =>
+            {
+                DataServer.GetInstance.morkS.Alarm.Add(new AlarmModel()
+                {
+                    AlarmTime = $"{item.Date} {item.Time}",
+                    AlarmMs = item.Info
+                });
+            });
+
+            GetStatus("M230.0", new Action<object>((obj) =>
+             {
+                 if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 24)
+                 {
+                     alarm.MachineLeftLowTemperature = bools[0];
+                     alarm.MachineRightLowTemperature = bools[1];
+                     alarm.Supply1_LossBowl = bools[2];
+                     alarm.Supply2_LossBowl = bools[3];
+                     alarm.Supply1_ErrorOutBowl = bools[4];
+                     alarm.Supply2_ErrorOutBowl = bools[5];
+                     alarm.PushBowlCylinderError = bools[6];
+                     alarm.NoodleMacCommunicateError = bools[7];
+                     alarm.DosingMacCommunicateError = bools[8];
+                     alarm.RobotMacCommunicateError = bools[9];
+                     alarm.DeviceEstop = bools[10];
+                     alarm.RobotInitError = bools[11];
+                     alarm.RobotUrgentStop = bools[12];
+                     alarm.RobotNotInRemoteMode = bools[13];
+                     alarm.RobotNotInReady = bools[14];
+                     alarm.RobotSelfInException = bools[15];
+                     alarm.LeftLackWater = bools[16];
+                     alarm.RightLackWater = bools[17];
+                     alarm.SvrewInitFail = bools[18];
+                     alarm.TurntableInitFail = bools[19];
+                     alarm.RobotInitFail = bools[20];
+                     alarm.NoodleCookerInitFail = bools[21];
+                     alarm.PushBowlInitFail1 = bools[22];
+                     alarm.PushBowlInitFail2 = bools[23];
+                 }
+             }));
+
+            GetStatus("M0.3", new Action<object>((obj) =>
+             {
+                 if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 3)
+                 {
+                     mORKS.RobotTakeNoodle = bools[0];
+                     mORKS.RobotOutMeal = bools[1];
+                     mORKS.MoveTurntable = bools[2];
+                 }
+             }));
+
+            GetStatus("M100.0", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 16)
+                {
+                    mORKS.InitComplete = bools[0];
+                    mORKS.TakeBowlIdle = bools[1];
+                    mORKS.TemperatureReached = bools[2];
+                    mORKS.AllowFallNoodle = bools[3];
+                    mORKS.RbTakeNoodleComplete = bools[4];
+                    mORKS.RbFallNoodleComplete = bools[5];
+                    mORKS.RbOutMealComplete = bools[6];
+                    mORKS.RobotIdle = bools[7];
+                    mORKS.TakeMealDetect = bools[8];
+                    mORKS.MissingBowl = bools[9];
+                    Initing = bools[10];
+                    mORKS.TurntableLowerLimit = bools[11];
+                    mORKS.MissingBowlSignal2 = bools[12];
+                    mORKS.TurntableUpLimit = bools[13];
+                    mORKS.FeedComplete = bools[14];
+                    mORKS.TurntableMoveInPlace = bools[15];
+                    DataServer.GetInstance.morkS.MorkS_Temp = mORKS.TemperatureReached;
+                    DataServer.GetInstance.morkS.Morks_SiloMeasUp = mORKS.TurntableUpLimit;
+                    DataServer.GetInstance.morkS.Morks_SiloMeasDown = mORKS.TurntableLowerLimit;
+                    DataServer.GetInstance.morkS.MorkS_NoBowMeas1 = mORKS.MissingBowl;
+                    DataServer.GetInstance.morkS.MorkS_NoBowMeas2 = mORKS.MissingBowlSignal2;
+                }
+
+            }));
+
+            GetStatus("M235.0", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+                {
+                    mORKS.Error = bools[0];
+                }
+            }));
+
+
+            GetStatus("M102.0", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 7)
+                {
+                    for (int i = 0; i < 6; i++)
+                    {
+                        mORKS.NoodleCookerStatus[i] = bools[i];
+                    }
+                    mORKS.Feeding = bools[6];
+                }
+            }));
+
+            GetStatus("M103.0", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 6)
+                {
+                    for (int i = 0; i < 6; i++)
+                    {
+                        mORKS.CookNoodlesComplete[i] = bools[i];
+                        DataServer.GetInstance.morkS.Morks_NoodleUpOrDown[i] = bools[i];
+                    }
+                }
+
+            }));
+
+            GetStatus("VW372", new Action<object>((obj) =>
+            {
+                if (obj is ushort[] UshortValue && UshortValue.Length > 0 && UshortValue.Length <= 1)
+                    mORKS.TurntableFeedbackloc = UshortValue[0];
+                DataServer.GetInstance.morkS.MorkS_BinLocation = mORKS.TurntableFeedbackloc;
+            }));
+
+            GetStatus("M0.1", new Action<object>((obj) => 
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 8) 
+                {
+                    for (int i = 0; i < 8; i++)
+                    {
+                        mORKS.InitComplete = bools[0]; 
+                    }
+                }
+
+            }));
+        }
+
+        /// <summary>
+        /// 数据解析
+        /// </summary>
+        private void DataParse()
+        {
+            EventBus.EventBus.GetInstance().Subscribe<DoOrderEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBackHandle)
+             {
+                 if (@event == null) return;
+                 if (@event is DoOrderEvent order)
+                 {
+                     mORKS.doOrderEvents.Add(order);
+                     if (order.MorkOrder.GoodBatchings == null) return;
+                     if (mORKS.HistorySuborderId.Contains(order.MorkOrder.SuborderId)) return;
+                     OrderCount++;
+                     if (DateTime.Now.Subtract(Json<OrderStatistics>.Data.StatisticsTime).Days != 0)
+                         Json<OrderStatistics>.Data.Count = 0;
+                     Json<OrderStatistics>.Data.StatisticsTime = DateTime.Now;
+                     Json<OrderStatistics>.Data.Count++;
+                     Json<OrderStatistics>.Save();
+                     OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT);
+                     DeviceProcessLogShow($"接收到{OrderCount}次订单，订单ID：{order.MorkOrder.SuborderId}");
+                     mORKS.HistorySuborderId.Add(order.MorkOrder.SuborderId);
+                     foreach (var item in order.MorkOrder.GoodBatchings)
+                     {
+                         var res = orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId);
+                         if (res != null)
+                         {
+                             if (ushort.TryParse(res.BatchingLoc, out ushort loc))
+                             {
+                                 if (loc >= 1 && loc <= 5)
+                                 {
+                                     if (mORKS.RBTakeNoodleTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                                         mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { GoodName = order.MorkOrder.GoodsName, Loc = ushort.Parse(res.BatchingLoc), SuborderId = order.MorkOrder.SuborderId, BatchingId = res.BatchingId });
+                                 }
+                                 else if (loc >= 10 && loc <= 11)
+                                 {
+                                     int index = 0;
+                                     if (recipeBoms != null)
+                                     {
+                                         index = Array.FindIndex(recipeBoms.RecipeIds?.ToArray(), p => p.RecipeId == order.MorkOrder.RecipeId);
+                                         index++;
+                                     }
+                                     if (mORKS.TakeBowlTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                                         mORKS.TakeBowlTask.Enqueue(new OrderLocInfo()
+                                         {
+                                             BatchingId = res.BatchingId,
+                                             GoodName = order.MorkOrder.GoodsName,
+                                             Loc = ushort.Parse(res.BatchingLoc),
+                                             SuborderId = order.MorkOrder.SuborderId,
+                                             RecipeNumber = (index >= 1 && index <= 10) ? (ushort)index : (ushort)0
+                                         });
+                                 }
+                             }
+                         }
+                     }
+                 }
+             });
+        }
+
+        public override void MainTask()
+        {
+            mORKS.AllowRun = mORKS.InitComplete;
+            if (Json<KeepDataBase>.Data.IsVerify)
+                IsHealth = mORKS.Error && mORKS.InitComplete;
+            else
+                IsHealth = true;
+
+            TakeBowlTask();
+
+            TakeNoodleTask();
+
+            OutNoodleTask();
+
+            SingleDetect();
+
+            TurntableControl();
+
+            var data = new List<bool>();
+            for (int i = 0; i < Json<MorksPar>.Data.parSets.Count; i++)
+            {
+                data.Add(Json<MorksPar>.Data.parSets.ElementAt(i).IsShield);
+            }
+
+            WriteControl("M260.0", data.ToArray());
+
+        }
+
+        private void BowlControl(OrderLocInfo orderLocInfo)
+        {
+            if (orderLocInfo.Loc >= 10 && orderLocInfo.Loc <= 11)
+            {
+                mORKS.TakeBowlId = orderLocInfo.SuborderId;
+                mORKS.TakeBowName = orderLocInfo.GoodName;
+                TakeBowlControl(orderLocInfo.Loc);
+                SetRecipeNumber(orderLocInfo.RecipeNumber);
+                OrderChange(mORKS.TakeBowlId, ORDER_STATUS.COOKING);
+                DeviceProcessLogShow($"订单【{ mORKS.TakeBowlId}】执行取碗控制,位置:[{orderLocInfo.Loc}]");
+                mORKS.TakeBowlInterlock = true;
+            }
+        }
+
+        /// <summary>
+        /// 取碗控制
+        /// </summary>
+        private void TakeBowlTask()
+        {
+            if (mORKS.AllowRun && mORKS.TakeBowlTask.Count > 0 && !mORKS.TakeBowlIdle && !mORKS.TakeBowlInterlock)
+            {
+                DeviceProcessLogShow("开始取碗流程");
+                ushort BowLoc = 0;
+                var res = orderMaterialDelivery?.BatchingInfo?.Where(p => p.BatchingId == mORKS.TakeBowlTask.ElementAt(0).BatchingId).ToList();
+                if (res == null || res?.Count == 0)
+                {
+                    if (mORKS.TakeBowlTask.TryDequeue(out OrderLocInfo orderLocInfo)) BowlControl(orderLocInfo);
+                }
+                else
+                {
+                    foreach (var item in res)
+                    {
+                        if (ushort.TryParse(item.BatchingLoc, out ushort loc))
+                        {
+                            //DeviceProcessLogShow($"位置：={loc}，检测开关1:{alarm.Supply1_LossBowl},检测开关1:{alarm.Supply2_LossBowl}");
+                            if (loc == 10 && !alarm.Supply1_LossBowl)
+                            {
+                                BowLoc = loc;
+                                break;
+                            }
+                            else if (loc == 11 && !alarm.Supply2_LossBowl)
+                            {
+                                BowLoc = loc;
+                                break;
+                            }
+                        }
+                    }
+
+                    if (BowLoc >= 10 && BowLoc <= 11)
+                    {
+                        if (mORKS.TakeBowlTask.TryDequeue(out OrderLocInfo orderLocInfo))
+                        {
+                            orderLocInfo.Loc = BowLoc;
+                            BowlControl(orderLocInfo);
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 转台控制
+        /// </summary>
+        private void TurntableControl()
+        {
+            if (Global.EnableLocalSimOrder)
+            {
+                //不做轮询，直接取面，模拟订单使用
+                if (mORKS.TurntableMoveInPlace && !mORKS.Feeding && mORKS.InitComplete && !mORKS.AllowTakeNoodle && mORKS.RBTakeNoodleTask.Count > 0)
+                {
+                    if (mORKS.TurntableLowerLimit)
+                    {
+                        TurntableStart(mORKS.RBTakeNoodleTask.ElementAt(0).Loc);
+                        mORKS.TurntableLocLists.Clear();
+                        mORKS.AllowTakeNoodle = true;
+                        DeviceProcessLogShow($"控制机器人去转台【{mORKS.RBTakeNoodleTask.ElementAt(0).Loc}】号位置取面");
+                    }
+                }
+            }
+            else
+            {
+                //正常轮询
+                if (mORKS.TurntableMoveInPlace && !mORKS.Feeding && mORKS.InitComplete && !mORKS.AllowTakeNoodle && mORKS.RBTakeNoodleTask.Count > 0)
+                {
+                    var result = orderMaterialDelivery.BatchingInfo.Where(p => p.BatchingId == mORKS.RBTakeNoodleTask.ElementAt(0).BatchingId).ToList();
+                    if (result != null)
+                    {
+                        var res = result.FirstOrDefault(P => P.BatchingLoc == mORKS.TurntableFeedbackloc.ToString());
+                        if (mORKS.TurntableLowerLimit && res != null)
+                        {
+                            TurntableStart(mORKS.TurntableFeedbackloc);
+                            mORKS.TurntableLocLists.Clear();
+                            mORKS.AllowTakeNoodle = true;
+                            DeviceProcessLogShow($"控制机器人去转台【{mORKS.TurntableFeedbackloc}】号位置取面");
+                        }
+                        else
+                        {
+                            if (!mORKS.TurntableInterlock)
+                            {
+                                foreach (var item in result)
+                                {
+                                    if (ushort.TryParse(item.BatchingLoc, out ushort loc))
+                                    {
+                                        if (mORKS.TurntableFeedbackloc != loc && !mORKS.TurntableLocLists.Contains(loc))
+                                        {
+                                            if (!mORKS.TurntableLowerLimit)
+                                            {
+                                                WriteData("M32.7", false);
+                                                DeviceProcessLogShow($"执行了转台启动互锁信号复位");
+                                            }
+                                            TurntableStart(loc);
+                                            DeviceProcessLogShow($"没有物料检测的启动转台控制,转台位置：[{loc}]");
+                                            break;
+                                        }
+                                        else if (mORKS.TurntableFeedbackloc == loc && !mORKS.TurntableLocLists.Contains(loc)) mORKS.TurntableLocLists.Add(loc);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else DeviceProcessLogShow("未找到可用的物料信息");
+                }
+            }
+
+            //if (DelayRTrig.GetInstance("互锁信号复位").Start(!mORKS.TurntableLowerLimit && mORKS.TurntableMoveInPlace, 2))
+            //{
+            //    if (!mORKS.TurntableLowerLimit)
+            //    {
+            //        WriteData("M32.7", false);
+            //        DeviceProcessLogShow($"执行了转台启动互锁信号复位");
+            //    }
+            //}
+
+            //补料中检测
+            if (RTrig.GetInstance("mORKS.Feeding").Start(mORKS.Feeding))
+            {
+                mORKS.AllowTakeNoodle = false;
+                mORKS.TakeNoodleInterlock = false;
+            }
+
+            //转台到位检测
+            if (RTrig.GetInstance("TurntableInPlace").Start(mORKS.TurntableMoveInPlace && mORKS.CurrentLoc == mORKS.TurntableFeedbackloc))
+            {
+                mORKS.CurrentLoc = 0;
+                mORKS.TurntableInterlock = false;
+                DeviceProcessLogShow("转台到位检测");
+            }
+
+            //补料完成检测
+            if (RTrig.GetInstance("FeedComplete").Start(mORKS.FeedComplete))
+            {
+                if (!mORKS.AllowTakeNoodle && mORKS.TurntableLocLists.Count > 0)
+                {
+                    mORKS.TurntableLocLists.Clear();
+                    mORKS.TurntableInterlock = false;
+                    DeviceProcessLogShow("补料完成检测");
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// 取面任务
+        /// </summary>
+        private void TakeNoodleTask()
+        {
+            //取面控制
+            if (mORKS.AllowRun && mORKS.RobotIdle && !mORKS.Feeding && !mORKS.RobotTaskInterlock && mORKS.AllowTakeNoodle && mORKS.TurntableMoveInPlace && !mORKS.TakeNoodleInterlock && !mORKS.OutNoodleing && mORKS.RBTakeNoodleTask.Count > 0)
+            {
+                int loc = Array.FindIndex(mORKS.NoodleCookerStatus, p => p == false);//查找煮面炉空闲位置
+                if (loc >= 0 && loc <= 5)
+                {
+                    if (mORKS.RBTakeNoodleTask.TryDequeue(out OrderLocInfo orderLocInfo))
+                    {
+                        mORKS.CookNodelId[loc] = orderLocInfo.SuborderId;
+                        SetFallNoodleLoc((ushort)(loc + 1));
+                        //机器人开始取面
+                        RobotTakeNoodle();
+                        OrderChange(orderLocInfo.SuborderId, ORDER_STATUS.COOKING);
+                        DeviceProcessLogShow($"订单【{orderLocInfo.SuborderId}】,机器人倒面至【{loc + 1}】号煮面栏");
+                        //写入煮面时间
+                        List<ushort> values = new List<ushort>();
+                        values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
+                        values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
+                        WriteData($"VW{116 + (loc * 6)}", values.ToArray());
+                        mORKS.TakeNoodleInterlock = true;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 出餐控制
+        /// </summary>
+        private void OutNoodleTask()
+        {
+            if (mORKS.AllowFallNoodle && mORKS.RobotTaskInterlock && !mORKS.TakeNoodleInterlock && mORKS.RobotIdle && !mORKS.TakeMealDetect)
+            {
+                int loc = Array.FindIndex(mORKS.CookNodelId, p => p == mORKS.IngredientsCompleteId && p.Length > 0);
+                if (loc >= 0 && loc <= 5)
+                {
+                    if (mORKS.CookNoodlesComplete[loc])
+                    {
+                        SetTakeNoodleLoc((ushort)(loc + 1));
+                        RobotOutMeal();
+                        CookNoodleStatusReset((ushort)(loc + 1));
+                        ResetAllowFallNoodle();
+
+
+                        //新增，待测试
+                        if (mORKS.RbOutMealComplete)
+                        {
+                            ResetCookComplete();
+                            mORKS.CookCompleteFlatBit = false;
+                            DeviceProcessLogShow("取餐过程中复位出餐完成信号");
+                        }
+
+                        if (!string.IsNullOrEmpty(mORKS.OutMealId)) OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
+                        mORKS.OutMealId = mORKS.IngredientsCompleteId;
+                        mORKS.OutMealName = mORKS.IngredientsCompleteName;
+                        mORKS.IngredientsCompleteId = string.Empty;
+                        mORKS.CookNodelId[loc] = string.Empty;
+                        DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{ mORKS.OutMealId}");
+
+                        mORKS.OutNoodleing = true;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 信号检测
+        /// </summary>
+        private void SingleDetect()
+        {
+            //允许倒面信号检测
+            if (RTrig.GetInstance("AllowFallNoodle").Start(mORKS.AllowFallNoodle))
+            {
+                mORKS.IngredientsCompleteId = mORKS.TakeBowlId;
+                mORKS.IngredientsCompleteName = mORKS.TakeBowName;
+                mORKS.TakeBowlId = string.Empty;
+                mORKS.TakeBowName = string.Empty;
+                DeviceProcessLogShow($"碗到位，允许到面,{mORKS.IngredientsCompleteId}");
+                mORKS.TakeBowlInterlock = false;
+            }
+
+            //出餐完成信号检测
+            if (RTrig.GetInstance("CompleteChange").Start(mORKS.RbOutMealComplete))
+            {
+                OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_COOK);
+                DeviceProcessLogShow($"订单【{mORKS.OutMealId}】制作完成");
+                mORKS.CookCompleteFlatBit = true;
+                mORKS.OutNoodleing = false;
+                WaitMeaLSpeak(mORKS.OutMealName);
+            }
+
+            //取餐完成逻辑处理
+            if (Delay.GetInstance("CompleteChange1").Start(!mORKS.TakeMealDetect, 1) && mORKS.CookCompleteFlatBit == true)
+            {
+                OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
+                DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成");
+                ResetCookComplete();
+                mORKS.CookCompleteFlatBit = false;
+                mORKS.OutMealId = string.Empty;
+                mORKS.OutMealName = string.Empty;
+            }
+
+            //机器人取面完成信号检测
+            if (RTrig.GetInstance("TakeNoodleComplete").Start(mORKS.RbTakeNoodleComplete))
+            {
+                mORKS.TakeNoodleInterlock = false;
+                mORKS.AllowTakeNoodle = false;
+                mORKS.TurntableInterlock = false;
+                DeviceProcessLogShow("机器人取面完成信号检测");
+                TakeNoodleCompleteReset();
+            }
+
+            int OutMealRequstCount = mORKS.CookNoodlesComplete.Where(p => p == true).ToList().Count;
+            int mlCount = mORKS.NoodleCookerStatus.Where(p => p == true).ToList().Count;
+            int index = Array.FindIndex(mORKS.CookNodelId, p => p == mORKS.IngredientsCompleteId);
+
+            bool isok = index >= 0 && index < mORKS.CookNoodlesComplete.Length && mORKS.CookNoodlesComplete[index];
+
+            mORKS.PriorityJudgment = Delay.GetInstance("取餐优先级判断").Start(mORKS.TurntableLocLists.Count > 0 && !mORKS.TurntableLowerLimit, 4);
+            //mORKS.RobotTaskInterlock = OutMealRequstCount > 0 && mORKS.AllowFallNoodle && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
+            mORKS.RobotTaskInterlock = isok && mORKS.AllowFallNoodle && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
+
+
+        }
+        /// <summary>
+        /// 语音提醒取餐
+        /// </summary>
+        /// <param name="meal"></param>
+        private void WaitMeaLSpeak(string meal)
+        {
+            VoiceAPI.m_SystemPlayWav(@"Vioce\电子提示音.wav");
+            Thread.Sleep(1000);
+            if (meal != null) mORKS.speech.Speak(meal);
+            VoiceAPI.m_SystemPlayWav(@"Vioce\取餐通知.wav");
+        }
+
+        #region PLC 控制函数
+
+        private void WriteData(string address, object value)
+        {
+            EventBus.EventBus.GetInstance().Publish(new WriteModel() { DeviceId = DeviceId, Address = address, Value = value });
+        }
+
+        /// <summary>
+        /// 写入配方数据到 PLC
+        /// </summary>
+        private void WriteRecipeBoms()
+        {
+            List<ushort> recipeBoms = new List<ushort>();
+            if (this.recipeBoms == null) return;
+            foreach (var item in this.recipeBoms.RecipeIds)
+            {
+                foreach (var rec in item.Recipes)
+                {
+                    recipeBoms.Add((ushort)rec);
+                }
+            }
+            if (recipeBoms.Count > 0)
+            {
+                //配方数据地址范围：VW2000 - VW2278
+                WriteData("VW2000", recipeBoms.ToArray());
+                DeviceProcessLogShow("写配方成功");
+            }
+            else { DeviceProcessLogShow("配方数据为空"); }
+        }
+
+
+        /// <summary>
+        /// 取面完成复位
+        /// </summary>
+        private void TakeNoodleCompleteReset()
+        {
+            WriteData("M100.4", false);
+
+        }
+
+        /// <summary>
+        /// 指定煮面口状态复位
+        /// </summary>
+        /// <param name="num"></param>
+        private void CookNoodleStatusReset(int num)
+        {
+            if (num >= 1 && num <= 6)
+            {
+                WriteData($"102.{num - 1}", false);
+                DeviceProcessLogShow($"{num}号煮面口占用复位");
+            }
+
+        }
+
+        /// <summary>
+        /// 写配方编号
+        /// </summary>
+        /// <param name="num"></param>
+        private void SetRecipeNumber(ushort num)
+        {
+            WriteData("VW0", num);
+        }
+
+        /// <summary>
+        /// 启动转台
+        /// </summary>
+        /// <param name="loc"></param>
+        private void TurntableStart(ushort loc)
+        {
+            mORKS.CurrentLoc = loc;
+            mORKS.TurntableInterlock = true;
+            mORKS.TurntableLocLists.Add(loc);
+            WriteData("VW2", loc);
+            WriteData("M0.5", true);
+        }
+
+        /// <summary>
+        /// 设置倒面位置
+        /// </summary>
+        /// <param name="loc"></param>
+        private void SetFallNoodleLoc(ushort loc)
+        {
+            WriteData("VW4", loc);
+        }
+
+        /// <summary>
+        /// 设置取面位置
+        /// </summary>
+        /// <param name="loc"></param>
+        private void SetTakeNoodleLoc(ushort loc)
+        {
+            WriteData("VW6", loc);
+        }
+
+        /// <summary>
+        /// 取碗控制
+        /// </summary>
+        /// <param name="loc"></param>
+        private void TakeBowlControl(ushort loc)
+        {
+            if (loc == 10)//小碗
+            {
+                WriteData("M0.1", true);
+            }
+            else if (loc == 11)//大碗
+            {
+                WriteData("M0.2", true);
+            }
+        }
+
+        /// <summary>
+        /// 机器人取面
+        /// </summary>
+        private void RobotTakeNoodle()
+        {
+            WriteData("M0.3", true);
+        }
+
+        /// <summary>
+        /// 机器人取餐
+        /// </summary>
+        private void RobotOutMeal()
+        {
+            WriteData("M0.4", true);
+        }
+
+        /// <summary>
+        /// 制作完成信号复位
+        /// </summary>
+        private void ResetCookComplete()
+        {
+            WriteData("M100.6", false);
+        }
+
+        /// <summary>
+        /// 复位允许取面信号
+        /// </summary>
+        private void ResetAllowFallNoodle()
+        {
+            WriteData("M100.3", false);
+        }
+
+        /// <summary>
+        /// 设备初始化
+        /// </summary>
+        public async void DeviceInit()
+        {
+            WriteData("M0.0", true);
+            await Task.Delay(1000);
+            WriteData("M0.0", false);
+        }
+
+        public override void SimOrder()
+        {
+            EventBus.EventBus.GetInstance().Subscribe<MorksSimorderModel>(0, delegate (IEvent @event, EventCallBackHandle callBackHandle)
+            {
+                if (@event != null && @event is MorksSimorderModel msm)
+                {
+                    string guid = Guid.NewGuid().ToString();
+                    if (msm.NoodleLoc >= 1 && msm.NoodleLoc <= 5)
+                    {
+                        mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { Loc = (ushort)msm.NoodleLoc, SuborderId = guid });
+                        MessageLog.GetInstance.Show($"添加订单：面条位置【{(ushort)msm.NoodleLoc}】");
+                    }
+
+                    if (msm.Bowloc >= 10 && msm.Bowloc <= 11)
+                    {
+                        mORKS.TakeBowlTask.Enqueue(new OrderLocInfo() { Loc = (ushort)msm.Bowloc, SuborderId = guid });
+                        MessageLog.GetInstance.Show($"添加订单：碗位置【{(ushort)msm.Bowloc}】");
+                    }
+
+                }
+            });
+        }
+        #endregion
+
+
+    }
+}
diff --git a/BPASmartClient.MorkS3/DataServer.cs b/BPASmartClient.MorkS3/DataServer.cs
new file mode 100644
index 00000000..22062658
--- /dev/null
+++ b/BPASmartClient.MorkS3/DataServer.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using BPA.Helper;
+using BPASmartClient.MQTT;
+using BPA.Message;
+using BPASmartClient.Model;
+
+namespace BPASmartClient.MorkS3
+{
+    public class DataServer
+    {
+
+        private volatile static DataServer _Instance;
+        public static DataServer GetInstance => _Instance ?? (_Instance = new DataServer());
+        private DataServer() { }
+
+        public ScreenModelMorkS morkS { get; set; } = new ScreenModelMorkS();
+
+        MQTTProxy mQTTProxy = new MQTTProxy();
+        public void Init()
+        {
+            mQTTProxy.Connected = new Action(() =>
+            {
+                mQTTProxy.Subscrib(ScreenTOPIC.GetInstance.GetTopic(ScreenDeviceType.煮面机));
+                ThreadManage.GetInstance().StartLong(new Action(() =>
+                {
+                    morkS.MorkS_OrderCount = Json<OrderStatistics>.Data.Count;
+                    SendScreenDataModel sendScreenDataModel = new SendScreenDataModel();
+                    sendScreenDataModel.Name = ScreenDeviceType.煮面机;
+                    sendScreenDataModel.Value = morkS.ToJSON();
+                    mQTTProxy.Publish(ScreenTOPIC.GetInstance.GetTopic(ScreenDeviceType.煮面机), sendScreenDataModel.ToJSON());
+                    Thread.Sleep(100);
+                }), "海科食堂大屏监听");
+            });
+            mQTTProxy.Connect("UserName", "Password", "Host", 1883, $"MORKS 设备监听数据{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+        }
+
+        //订单信息（正在制作，等待制作，制作完成）
+        //煮面炉上下状态（6个煮面炉上或下）
+        //温度状态（煮面炉温度是否到达）
+        //料仓位置（当前料仓在几号位置）
+        //料仓上下物料检测
+        //落碗机构缺碗检测
+        //机器人状态
+        //当日订单总量
+        //报警信息
+    }
+}
diff --git a/BPASmartClient.MorkS3/GVL_MORKS.cs b/BPASmartClient.MorkS3/GVL_MORKS.cs
new file mode 100644
index 00000000..9176e7be
--- /dev/null
+++ b/BPASmartClient.MorkS3/GVL_MORKS.cs
@@ -0,0 +1,376 @@
+using BPASmartClient.Device;
+using BPASmartClient.Model;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Speech.Synthesis;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkS3
+{
+    public class GVL_MORKS : IStatus
+    {
+        public List<string> HistorySuborderId { get; set; } = new List<string>();
+        /// <summary>
+        /// 机器人取面
+        /// PLC -> M0.3
+        /// ModbusTcp -> 323
+        /// </summary>
+        public bool RobotTakeNoodle { get; set; }
+
+        /// <summary>
+        /// 机器人出餐
+        /// PLC -> M0.4
+        /// ModbusTcp -> 324
+        /// </summary>
+        public bool RobotOutMeal { get; set; }
+
+        /// <summary>
+        /// 移动转台
+        /// PLC -> M0.5
+        /// ModbusTcp -> 325
+        /// </summary>
+        public bool MoveTurntable { get; set; }
+
+
+        #region 临时变量
+        /// <summary>
+        /// 允许运行
+        /// </summary>
+        //[Circuit(new string[] { "机器人取面", "取碗控制" }, "允许运行")]
+        [VariableMonitor("允许运行")]
+        public bool AllowRun { get; set; }
+
+        /// <summary>
+        /// 优先级判断
+        /// </summary>
+        [VariableMonitor("优先级判断条件")]
+        public bool PriorityJudgment { get; set; }
+
+        /// <summary>
+        /// 机器人任务互锁信号,false:取面，true:出餐
+        /// </summary>
+        //[Circuit(new string[] { "机器人取面", "出面控制" }, "机器人互锁", new bool[] { true, false })]
+        [VariableMonitor("机器人任务互锁信号")]
+        public bool RobotTaskInterlock { get; set; }
+
+        /// <summary>
+        /// 取碗互锁信号
+        /// </summary>
+        //[Circuit("取碗控制", "取碗互锁", true)]
+        [VariableMonitor("取碗互锁信号")]
+        public bool TakeBowlInterlock { get; set; }
+
+        /// <summary>
+        /// 取面互锁信号
+        /// </summary>
+        //[Circuit(new string[] { "机器人取面", "出面控制" }, "取面互锁信号", new bool[] { true, true })]
+        [VariableMonitor("取面互锁信号")]
+        public bool TakeNoodleInterlock { get; set; }
+
+        /// <summary>
+        /// 出面中
+        /// </summary>
+        //[Circuit("机器人取面", "出面中", true)]
+        [VariableMonitor("出面中")]
+        public bool OutNoodleing { get; set; }
+
+        /// <summary>
+        /// 允许取面
+        /// </summary>
+        //[Circuit(new string[] { "转台控制", "机器人取面" }, "允许取面", new bool[] { true, false })]
+        [VariableMonitor("允许取面")]
+        public bool AllowTakeNoodle { get; set; }
+
+        /// <summary>
+        /// 转台互锁信号
+        /// </summary>
+        [VariableMonitor("转台互锁信号")]
+        public bool TurntableInterlock { get; set; }
+        #endregion
+
+        /// <summary>
+        /// 初始化完成
+        /// PLC -> M100.0
+        /// ModbusTcp -> 1120
+        /// </summary>
+        //[Circuit(new string[] { "允许运行", "转台控制", "转台控制" }, "初始化完成")]
+        [VariableMonitor("初始化完成", "M100.0", "1120")]
+        public bool InitComplete { get; set; }
+
+        /// <summary>
+        /// 取碗机构空闲，True:忙碌，false:空闲
+        /// PLC -> M100.1
+        /// ModbusTcp -> 1121
+        /// </summary>
+        //[Circuit("取碗控制", "取碗机构空闲", true)]
+        [VariableMonitor("取碗机构空闲", "M100.1", "1121")]
+        public bool TakeBowlIdle { get; set; }
+
+        /// <summary>
+        /// 温度到达,True:表示到达，false：未到达
+        /// PLC -> M100.2
+        /// ModbusTcp -> 1122
+        /// </summary>
+        //[Circuit("允许运行", "温度到达")]
+        [VariableMonitor("温度到达", "M100.2", "1122")]
+        public bool TemperatureReached { get; set; }
+
+        /// <summary>
+        /// 允许到面,配料完成
+        /// PLC -> M100.3
+        /// ModbusTcp -> 1123
+        /// </summary>
+        //[Circuit("出面控制", "允许到面")]
+        [VariableMonitor("允许到面", "M100.3", "1123")]
+        public bool AllowFallNoodle { get; set; }
+
+        /// <summary>
+        /// 机器人取面完成
+        /// PLC -> M100.4
+        /// ModbusTcp -> 1124
+        /// </summary>
+        [VariableMonitor("机器人取面完成", "M100.4", "1124")]
+        public bool RbTakeNoodleComplete { get; set; }
+
+        /// <summary>
+        /// 机器人倒面完成
+        /// PLC -> M100.5
+        /// ModbusTcp -> 1125
+        /// </summary>
+        [VariableMonitor("机器人倒面完成", "M100.5", "1125")]
+        public bool RbFallNoodleComplete { get; set; }
+
+        /// <summary>
+        /// 机器人出餐完成,上报取餐完成
+        /// PLC -> M100.6
+        /// ModbusTcp -> 1126
+        /// </summary>
+        [VariableMonitor("机器人出餐完成", "M100.6", "1126")]
+        public bool RbOutMealComplete { get; set; }
+
+        /// <summary>
+        /// 机器人空闲
+        /// PLC -> M100.7
+        /// ModbusTcp -> 1127
+        /// </summary>
+        //[Circuit(new string[] { "机器人取面", "出面控制" }, "机器人空闲")]
+        [VariableMonitor("机器人空闲", "M100.7", "1127")]
+        public bool RobotIdle { get; set; }
+
+        /// <summary>
+        /// 取餐口检测
+        /// PLC -> M101.0
+        /// ModbusTcp -> 1128
+        /// </summary>
+        //[Circuit("出面控制", "取餐口检测", true)]
+        [VariableMonitor("取餐口检测", "M101.0", "1128")]
+        public bool TakeMealDetect { get; set; }
+
+        /// <summary>
+        /// 缺碗信号，false:缺碗，true:有碗
+        /// PLC -> M101.1
+        /// ModbusTcp -> 1129
+        /// </summary>
+        [VariableMonitor("缺碗信号", "M101.1", "1129")]
+        public bool MissingBowl { get; set; }
+
+        /// <summary>
+        /// 设备初始化中，执行中等于1,2秒后复位
+        /// PLC -> M101.2
+        /// ModbusTcp -> 1130
+        /// </summary>
+        [VariableMonitor("设备初始化中", "M101.2", "1130")]
+        public bool DeviceIniting { get; set; }
+
+        /// <summary>
+        /// 转台下限检测
+        /// PLC -> M101.3
+        /// ModbusTcp -> 1131
+        /// </summary>
+        //[Circuit("转台控制", "转台下限检测有物料")]
+        [VariableMonitor("转台下限检测", "M101.3", "1131")]
+        public bool TurntableLowerLimit { get; set; }
+
+        /// <summary>
+        /// 缺碗信号 2
+        /// PLC -> M101.4
+        /// ModbusTcp -> 1132
+        /// </summary>
+        [VariableMonitor("缺碗信号 2", "M101.4", "1132")]
+        public bool MissingBowlSignal2 { get; set; }
+
+        /// <summary>
+        /// 转台上限检测
+        /// PLC -> M101.5
+        /// ModbusTcp -> 1133
+        /// </summary>
+        [VariableMonitor("转台上限检测", "M101.5", "1133")]
+        public bool TurntableUpLimit { get; set; }
+
+        /// <summary>
+        /// 补料完成
+        /// PLC -> M101.6
+        /// ModbusTcp -> 1134
+        /// </summary>
+        [VariableMonitor("补料完成", "M101.6", "1134")]
+        public bool FeedComplete { get; set; }
+
+        /// <summary>
+        /// 转台移动到位
+        /// PLC -> M101.7
+        /// ModbusTcp -> 1135
+        /// </summary>
+        //[Circuit(new string[] { "转台控制", "机器人取面" }, "转台移动到位")]
+        [VariableMonitor("转台移动到位", "M101.7", "1135")]
+        public bool TurntableMoveInPlace { get; set; }
+
+        /// <summary>
+        /// 煮面炉状态,True:忙碌，false:空闲
+        /// M102.0 - M102.5
+        /// 1136   - 1141
+        /// </summary>
+        [VariableMonitor("煮面炉状态", "M102.0", "1136")]
+        public bool[] NoodleCookerStatus { get; set; } = new bool[6] { false, false, false, false, false, false };
+
+        /// <summary>
+        /// 补料中
+        /// M102.6
+        /// 1142
+        /// </summary>
+        [VariableMonitor("补料中", "M102.6", "1142")]
+        public bool Feeding { get; set; }
+
+        /// <summary>
+        /// 煮面完成,上升后给信号
+        /// M103.0 - M103.5
+        /// 1144   - 1149
+        /// </summary>
+        [VariableMonitor("煮面完成", "M103.0", "1144")]
+        public bool[] CookNoodlesComplete { get; set; } = new bool[6] { false, false, false, false, false, false };
+
+        /// <summary>
+        /// 硬件设备异常
+        /// PLC -> M235.0
+        /// True:设备正常，False:设备异常
+        /// </summary>
+        [VariableMonitor("硬件设备异常", "M235.0", "")]
+        public bool Error { get; set; } = false;
+
+        /// <summary>
+        /// 配方编号
+        /// PLC -> VW0
+        /// ModbusTcp -> 100
+        /// </summary>
+        [VariableMonitor("配方编号", "VW0", "100")]
+        public ushort RecipeNumber { get; set; }
+
+        /// <summary>
+        /// 转台设置位置
+        /// PLC -> VW2
+        /// ModbusTcp -> 101
+        /// </summary>
+        [VariableMonitor("转台设置位置", "VW2", "101")]
+        public ushort TurntableLoc { get; set; }
+
+        /// <summary>
+        /// 到面至煮面炉位置
+        /// PLC -> VW4
+        /// ModbusTcp -> 102
+        /// </summary>
+        [VariableMonitor("到面至煮面炉位置", "VW4", "102")]
+        public ushort FallNoodleLoc { get; set; }
+
+        /// <summary>
+        /// 取面位置
+        /// PLC -> VW6
+        /// ModbusTcp -> 103
+        /// </summary>
+        [VariableMonitor("取面位置", "VW6", "103")]
+        public ushort TakeNoodleLoc { get; set; }
+
+        /// <summary>
+        /// 转台反馈位置
+        /// PLC -> VW372
+        /// ModbusTcp -> 286
+        /// </summary>
+        [VariableMonitor("转台反馈位置", "VW372", "286")]
+        public ushort TurntableFeedbackloc { get; set; }
+
+        /// <summary>
+        /// 机器人取面位置队列
+        /// </summary>
+        //[Circuit(new string[] { "转台控制", "机器人取面" }, "有机器人取面队列")]
+        public ConcurrentQueue<OrderLocInfo> RBTakeNoodleTask { get; set; } = new ConcurrentQueue<OrderLocInfo>();
+
+        /// <summary>
+        /// 出碗队列
+        /// </summary>
+        //[Circuit("取碗控制", "有取碗队列数量")]
+        public ConcurrentQueue<OrderLocInfo> TakeBowlTask { get; set; } = new ConcurrentQueue<OrderLocInfo>();
+
+        public List<DoOrderEvent> doOrderEvents { get; set; } = new List<DoOrderEvent>();
+
+        /// <summary>
+        /// 是否有面条
+        /// </summary>
+        public bool IsNoodles { get; set; } = true;
+
+        /// <summary>
+        /// 制作完成标志
+        /// </summary>
+        [VariableMonitor("制作完成标志")]
+        public bool CookCompleteFlatBit { get; set; }
+
+
+        #region 订单ID记录
+        /// <summary>
+        /// 取碗订单ID
+        /// </summary>
+        public string TakeBowlId = string.Empty;
+        /// <summary>
+        /// 取碗订单名称
+        /// </summary>
+        public string TakeBowName = string.Empty;
+
+        /// <summary>
+        /// 配料完成订单ID
+        /// </summary>
+        public string IngredientsCompleteId = string.Empty;
+        /// <summary>
+        /// 配料完成订单名称
+        /// </summary>
+        public string IngredientsCompleteName = string.Empty;
+
+        /// <summary>
+        /// 煮面口对应的订单ID
+        /// </summary>
+        public string[] CookNodelId = new string[6] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, };
+
+        /// <summary>
+        /// 出餐订单ID
+        /// </summary>
+        public string OutMealId = string.Empty;
+        /// <summary>
+        /// 出餐订单名称
+        /// </summary>
+        public string OutMealName = string.Empty;
+
+        /// <summary>
+        /// 转台位置轮询
+        /// </summary>
+        public List<ushort> TurntableLocLists = new List<ushort>();
+
+        /// <summary>
+        /// 转台当前启动位置
+        /// </summary>
+        [VariableMonitor("转台当前启动位置")]
+        public ushort CurrentLoc { get; set; } = 0;
+
+        public SpeechSynthesizer speech = new SpeechSynthesizer();
+
+        #endregion
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcWriteAddressDB7.cs b/BPASmartClient.MorkS3/Model/Global.cs
similarity index 52%
rename from BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcWriteAddressDB7.cs
rename to BPASmartClient.MorkS3/Model/Global.cs
index e083e60c..35819695 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcWriteAddressDB7.cs
+++ b/BPASmartClient.MorkS3/Model/Global.cs
@@ -4,10 +4,10 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
+namespace BPASmartClient.MorkS3.Model
 {
-    public class PlcWriteAddressDB7
+    public class Global
     {
-        
+        public static bool EnableLocalSimOrder { get; set; }
     }
 }
diff --git a/BPASmartClient.MorkS3/Model/MorksPar.cs b/BPASmartClient.MorkS3/Model/MorksPar.cs
new file mode 100644
index 00000000..5d499d39
--- /dev/null
+++ b/BPASmartClient.MorkS3/Model/MorksPar.cs
@@ -0,0 +1,16 @@
+using BPASmartClient.Model;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace BPASmartClient.MorkS3.Model
+{
+    internal class MorksPar
+    {
+        public ObservableCollection<ParSet> parSets { get; set; } = new ObservableCollection<ParSet>();
+    }
+}
diff --git a/BPASmartClient.MorkS3/Model/ParSet.cs b/BPASmartClient.MorkS3/Model/ParSet.cs
new file mode 100644
index 00000000..03261db1
--- /dev/null
+++ b/BPASmartClient.MorkS3/Model/ParSet.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.Model
+{
+    public class ParSet 
+    {
+        public ushort Minute { get { return _mMinute; } set { _mMinute = value; } }
+        private ushort _mMinute;
+
+        public ushort Second { get { return _mSecond; } set { _mSecond = value; } }
+        private ushort _mSecond;
+
+
+        public bool IsShield { get { return _mIsShield; } set { _mIsShield = value; } }
+        private bool _mIsShield;
+
+
+        public string TextBlockContext { get { return _mTextBlockContext; } set { _mTextBlockContext = value; } }
+        private string _mTextBlockContext;
+
+        public string CheckBoxContext { get { return _mCheckBoxContext; } set { _mCheckBoxContext = value; } }
+        private string _mCheckBoxContext;
+
+    }
+}
diff --git a/BPASmartClient.MorkS3/Model/WritePar.cs b/BPASmartClient.MorkS3/Model/WritePar.cs
new file mode 100644
index 00000000..24210bd8
--- /dev/null
+++ b/BPASmartClient.MorkS3/Model/WritePar.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkS3.Model
+{
+    public class WritePar
+    {
+        public string Address { get; set; }
+        public object Value { get; set; }
+    }
+}
diff --git a/BPASmartClient.MorkS3/OrderLocInfo.cs b/BPASmartClient.MorkS3/OrderLocInfo.cs
new file mode 100644
index 00000000..da71841a
--- /dev/null
+++ b/BPASmartClient.MorkS3/OrderLocInfo.cs
@@ -0,0 +1,23 @@
+using BPA.Message;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkS3
+{
+    public class OrderLocInfo
+    {
+        public string SuborderId { get; set; }
+        public ushort Loc { get; set; }
+        public ushort RecipeNumber { get; set; }
+        public int BatchingId { get; set; }
+        public string GoodName { get; set; }
+
+        public int RecipeId { get; set; }
+
+        public List<int> Recipes { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.MorkS3/View/Debug.xaml b/BPASmartClient.MorkS3/View/Debug.xaml
new file mode 100644
index 00000000..2f29c0ab
--- /dev/null
+++ b/BPASmartClient.MorkS3/View/Debug.xaml
@@ -0,0 +1,117 @@
+<UserControl
+    x:Class="BPASmartClient.MorkS3.View.Debug"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.MorkS3.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.MorkS3.ViewModel"
+    Name="调试界面"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:DebugViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <Style x:Key="TextboxStyle" TargetType="TextBox">
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="{StaticResource TitleBorderColor}" />
+            <Setter Property="Width" Value="150" />
+            <Setter Property="BorderBrush" Value="{StaticResource TitleBorderColor}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="CaretBrush" Value="Aqua" />
+        </Style>
+        <Style x:Key="CheckBox" TargetType="CheckBox">
+            <Setter Property="Foreground" Value="Aqua" />
+            <Setter Property="FontSize" Value="16" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="Margin" Value="10,0" />
+            <Setter Property="IsChecked" Value="False" />
+        </Style>
+    </UserControl.Resources>
+
+    <Grid Margin="20">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+        <StackPanel>
+            <StackPanel Margin="10,0,0,20" Orientation="Horizontal">
+                <TextBlock
+                    FontSize="18"
+                    Foreground="{StaticResource TitleBorderColor}"
+                    Text="面条位置：" />
+                <TextBox Style="{StaticResource TextboxStyle}" Text="{Binding NoodleLoc}" />
+                <CheckBox
+                    Background="White"
+                    Content="随机面条位置"
+                    IsChecked="{Binding IsNoodPositon}"
+                    Style="{StaticResource CheckBox}" />
+
+            </StackPanel>
+
+            <StackPanel Margin="10,0,0,20" Orientation="Horizontal">
+                <TextBlock
+                    FontSize="18"
+                    Foreground="{StaticResource TitleBorderColor}"
+                    Text="面碗位置：" />
+                <TextBox Style="{StaticResource TextboxStyle}" Text="{Binding BowlLoc}" />
+                <CheckBox
+                    Background="White"
+                    Content="随机面碗位置"
+                    IsChecked="{Binding IsBowPositon}"
+                    Style="{StaticResource CheckBox}" />
+                <CheckBox
+                    Background="White"
+                    Command="{Binding EnableLacalSimOrder}"
+                    Content="启用本地模拟功能"
+                    IsChecked="{Binding LocalSimOrder}"
+                    Style="{StaticResource CheckBox}" />
+            </StackPanel>
+
+            <StackPanel Orientation="Horizontal">
+                <Button
+                    Grid.Row="0"
+                    Width="170"
+                    HorizontalAlignment="Left"
+                    Command="{Binding SimOrderRandomCommand}"
+                    Content="启动随机模拟订单"
+                    Style="{StaticResource ButtonStyle}"
+                    Visibility="{Binding VisibilitySimOrder}" />
+                <Button
+                    Grid.Row="0"
+                    Width="170"
+                    HorizontalAlignment="Left"
+                    Command="{Binding SimOrderRandomCloseCommand}"
+                    Content="关闭随机模拟订单"
+                    Style="{StaticResource ButtonStyle}"
+                    Visibility="{Binding VisibilitySimOrder}" />
+                <Button
+                    Grid.Row="0"
+                    Width="130"
+                    HorizontalAlignment="Left"
+                    Command="{Binding SimOrderCommand}"
+                    Content="模拟订单"
+                    Style="{StaticResource ButtonStyle}"
+                    Visibility="{Binding VisibilitySimOrder}" />
+                <Button
+                    Grid.Row="0"
+                    Width="120"
+                    HorizontalAlignment="Left"
+                    Command="{Binding InitCommand}"
+                    Content="初始化设备"
+                    Style="{StaticResource ButtonStyle}" />
+            </StackPanel>
+        </StackPanel>
+
+
+
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.MorkS3/View/Debug.xaml.cs b/BPASmartClient.MorkS3/View/Debug.xaml.cs
new file mode 100644
index 00000000..21616f44
--- /dev/null
+++ b/BPASmartClient.MorkS3/View/Debug.xaml.cs
@@ -0,0 +1,30 @@
+using BPASmartClient.MorkS3.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.MorkS3.View
+{
+    /// <summary>
+    /// Debug.xaml 的交互逻辑
+    /// </summary>
+    public partial class Debug : UserControl
+    {
+        public Debug()
+        {
+            InitializeComponent();
+        }
+
+    }
+}
diff --git a/BPASmartClient.MorkS3/View/Monitor.xaml b/BPASmartClient.MorkS3/View/Monitor.xaml
new file mode 100644
index 00000000..8fcca0b4
--- /dev/null
+++ b/BPASmartClient.MorkS3/View/Monitor.xaml
@@ -0,0 +1,242 @@
+<UserControl
+    x:Class="BPASmartClient.MorkS3.View.Monitor"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.MorkS3.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.MorkS3.ViewModel"
+    Name="监控画面"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:MonitorViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <!--<convert:TextDisplayConvert x:Key="textDisplayConvert" />
+                    <convert:IsEnableConvert x:Key="isEnableConvert" />
+                    <convert:AnalogAlarmConvert x:Key="analogAlarmConvert" />
+                    <convert:DiscreteAlarmConvert x:Key="discreteAlarmConvert" />
+                    <convert:AlarmTypeTextConvert x:Key="alarmTypeTextConvert" />-->
+                    <SolidColorBrush x:Key="BorderSolid" Color="#5523CACA" />
+                    <SolidColorBrush x:Key="FontColor" Color="#FF2AB2E7" />
+                    <SolidColorBrush x:Key="TitleFontColor" Color="#ddd" />
+                    <SolidColorBrush x:Key="CursorColor" Color="Aqua" />
+                    <SolidColorBrush x:Key="TitleBorderColor" Color="#FF2AB2E7" />
+
+                    <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="18" />
+                        <Setter Property="Foreground" Value="{StaticResource TextBlockForeground}" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                        <Setter Property="HorizontalAlignment" Value="Center" />
+                    </Style>
+
+                    <Style x:Key="TextBoxStyle" TargetType="TextBox">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="22" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Foreground" Value="{StaticResource TextBlockForeground}" />
+                        <Setter Property="BorderBrush" Value="#FF23CACA" />
+                        <Setter Property="CaretBrush" Value="Aqua" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="30" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+        <!--#region 表格标题栏设置-->
+        <Grid Background="#dd2AB2E7">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="0.3*" />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition Width="0.7*" />
+                <ColumnDefinition Width="0.7*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                Grid.Column="0"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="{StaticResource TitleFontColor}"
+                Text="ID" />
+
+            <Grid Grid.Column="1">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Foreground="{StaticResource TitleFontColor}"
+                    Text="变量名" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>
+
+            <TextBlock
+                Grid.Column="2"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="{StaticResource TitleFontColor}"
+                Text="PLC 地址" />
+
+
+            <Grid Grid.Column="3">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Foreground="{StaticResource TitleFontColor}"
+                    Text="注释" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="1,0,0,0"
+                    Cursor="SizeWE" />
+            </Grid>
+
+
+
+            <Grid Grid.Column="4">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Foreground="{StaticResource TitleFontColor}"
+                    Text="Modbus TCP 地址" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>
+
+            <TextBlock
+                Grid.Column="5"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="{StaticResource TitleFontColor}"
+                Text="当前值" />
+
+        </Grid>
+        <!--#endregion-->
+
+        <!--#region 表格数据显示-->
+        <ScrollViewer
+            Grid.Row="1"
+            HorizontalScrollBarVisibility="Hidden"
+            VerticalScrollBarVisibility="Hidden">
+            <ItemsControl ItemsSource="{Binding variableMonitors}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Grid x:Name="gr" Height="30">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="0.3*" />
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="0.7*" />
+                                <ColumnDefinition Width="0.7*" />
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock
+                                Grid.Column="0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                FontSize="14"
+                                Foreground="{StaticResource FontColor}"
+                                Text="{Binding Id}" />
+
+                            <Grid Grid.Column="1">
+                                <TextBlock
+                                    Margin="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    FontSize="14"
+                                    Foreground="{StaticResource FontColor}"
+                                    Text="{Binding VarName}" />
+                                <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
+                            </Grid>
+
+
+                            <TextBlock
+                                Grid.Column="2"
+                                Margin="5,0,0,0"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                FontSize="14"
+                                Foreground="{StaticResource FontColor}"
+                                Text="{Binding PLCAddress}" />
+
+                            <Grid Grid.Column="3">
+                                <TextBlock
+                                    Margin="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    FontSize="14"
+                                    Foreground="{StaticResource FontColor}"
+                                    Text="{Binding Notes}" />
+                                <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,0,0" />
+                            </Grid>
+
+                            <Grid Grid.Column="4">
+                                <TextBlock
+                                    Margin="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    FontSize="14"
+                                    Foreground="{StaticResource FontColor}"
+                                    Text="{Binding ModbusTcpAddress}" />
+                                <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
+                            </Grid>
+
+                            <TextBlock
+                                Grid.Column="5"
+                                Margin="5,0,0,0"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                FontSize="14"
+                                Foreground="{StaticResource FontColor}"
+                                Text="{Binding CurrentValue}" />
+
+                            <Border
+                                Grid.ColumnSpan="8"
+                                BorderBrush="{StaticResource BorderSolid}"
+                                BorderThickness="1" />
+
+                        </Grid>
+
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                            </Trigger>
+                        </DataTemplate.Triggers>
+
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </ScrollViewer>
+        <!--#endregion-->
+
+
+    </Grid>
+
+</UserControl>
diff --git a/BPASmartClient.MorkS3/View/Monitor.xaml.cs b/BPASmartClient.MorkS3/View/Monitor.xaml.cs
new file mode 100644
index 00000000..7939c35a
--- /dev/null
+++ b/BPASmartClient.MorkS3/View/Monitor.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.MorkS3.View
+{
+    /// <summary>
+    /// Monitor.xaml 的交互逻辑
+    /// </summary>
+    public partial class Monitor : UserControl
+    {
+        public Monitor()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.MorkS3/View/ParSet.xaml b/BPASmartClient.MorkS3/View/ParSet.xaml
new file mode 100644
index 00000000..e4ef886e
--- /dev/null
+++ b/BPASmartClient.MorkS3/View/ParSet.xaml
@@ -0,0 +1,130 @@
+<UserControl
+    x:Class="BPASmartClient.MorkS3.View.ParSet"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.MorkS3.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.MorkS3.ViewModel"
+    Name="参数设置界面"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:ParSetViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="18" />
+                        <Setter Property="Foreground" Value="{StaticResource TextBlockForeground}" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                        <Setter Property="HorizontalAlignment" Value="Center" />
+                    </Style>
+
+                    <Style x:Key="TextBoxStyle" TargetType="TextBox">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="22" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Foreground" Value="{StaticResource TextBlockForeground}" />
+                        <Setter Property="BorderBrush" Value="#FF23CACA" />
+                        <Setter Property="CaretBrush" Value="Aqua" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+
+    </UserControl.Resources>
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="35" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+
+            <TextBlock Style="{StaticResource TextBlockStyle}" Text="请点击按钮保存参数：" />
+
+            <pry:IcoButton
+                Grid.Column="5"
+                Width="140"
+                HorizontalAlignment="Left"
+                Command="{Binding SaveInfoCommand}"
+                Content="保存配置"
+                FontSize="16"
+                IcoText="&#xe936;"
+                Style="{StaticResource IcoButtonStyle}">
+                <pry:IcoButton.Foreground>
+                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                        <GradientStop Color="#FFBB662A" />
+                        <GradientStop Offset="1" Color="White" />
+                    </LinearGradientBrush>
+                </pry:IcoButton.Foreground>
+            </pry:IcoButton>
+
+
+        </StackPanel>
+
+        <!--  参数放置面板  -->
+        <Grid Grid.Row="2">
+            <ItemsControl ItemsSource="{Binding parSets}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="{Binding TextBlockContext}" />
+                            <TextBox
+                                Width="100"
+                                Margin="10,0,0,0"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                BorderBrush="#FF23CACA"
+                                CaretBrush="Aqua"
+                                FontFamily="楷体"
+                                FontSize="21"
+                                Foreground="#ff34f7f7"
+                                Text="{Binding Minute}" />
+                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="（分）" />
+                            <TextBox
+                                Width="100"
+                                Margin="0,10"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                BorderBrush="#FF23CACA"
+                                CaretBrush="Aqua"
+                                FontFamily="楷体"
+                                FontSize="21"
+                                Foreground="#ff34f7f7"
+                                Text="{Binding Second}" />
+                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="（秒）" />
+
+                            <CheckBox
+                                Height="20"
+                                Margin="10"
+                                VerticalAlignment="Center"
+                                Background="#FF2AB2E7"
+                                Content="{Binding CheckBoxContext}"
+                                FontSize="14"
+                                Foreground="#00c2f4"
+                                IsChecked="{Binding IsShield}"
+                                Template="{StaticResource CbTemplate}" />
+
+                        </StackPanel>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+
+        </Grid>
+
+    </Grid>
+
+
+</UserControl>
diff --git a/BPASmartClient.MorkS3/View/ParSet.xaml.cs b/BPASmartClient.MorkS3/View/ParSet.xaml.cs
new file mode 100644
index 00000000..e2f93b94
--- /dev/null
+++ b/BPASmartClient.MorkS3/View/ParSet.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.MorkS3.View
+{
+    /// <summary>
+    /// ParSet.xaml 的交互逻辑
+    /// </summary>
+    public partial class ParSet : UserControl
+    {
+        public ParSet()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.MorkS3/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkS3/ViewModel/DebugViewModel.cs
new file mode 100644
index 00000000..c51de0b1
--- /dev/null
+++ b/BPASmartClient.MorkS3/ViewModel/DebugViewModel.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BPASmartClient.Helper;
+using BPASmartClient.Model;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using BPASmartClient.EventBus;
+using BPASmartClient.MorkS3.Model;
+using System.Windows;
+using BPASmartClient.Message;
+
+namespace BPASmartClient.MorkS3.ViewModel
+{
+    public class DebugViewModel : ObservableObject
+    {
+        public DebugViewModel()
+        {
+            InitCommand = new RelayCommand(() => { 
+                ActionManage.GetInstance.Send("InitDevice"); 
+                ActionManage.GetInstance.Send("初始化设定煮面时间"); 
+            });
+            SimOrderCommand = new RelayCommand(() =>
+            {
+                new MorksSimorderModel() { Bowloc = this.BowlLoc, NoodleLoc = this.NoodleLoc }.Publish();
+               
+            });
+            SimOrderRandomCommand = new RelayCommand(() =>
+            {
+                int NoodPosition = 0;
+                int BowPosion = 0;
+                NoodPosition = IsNoodPositon == true ? 0 : NoodleLoc;
+                BowPosion = IsBowPositon == true ? 0 : BowlLoc;
+                ActionManage.GetInstance.Send("EnableForOrder", new object[] { NoodPosition, BowPosion });
+            });
+            SimOrderRandomCloseCommand = new RelayCommand(() =>
+            {
+                ThreadManage.GetInstance().StopTask("ForOrder");
+                MessageLog.GetInstance.Show("停止模拟随机订单");
+            });
+            EnableLacalSimOrder = new RelayCommand(() =>
+            {
+                Global.EnableLocalSimOrder = LocalSimOrder;
+                VisibilitySimOrder = LocalSimOrder == true ? Visibility.Visible : Visibility.Collapsed;
+            });
+            VisibilitySimOrder = LocalSimOrder == true? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public RelayCommand InitCommand { get; set; }
+
+        public RelayCommand SimOrderCommand { get; set; }
+
+        public RelayCommand SimOrderRandomCommand { get; set; }
+
+        public RelayCommand SimOrderRandomCloseCommand { get; set; }
+
+        public RelayCommand EnableLacalSimOrder { get; set; }
+        public int NoodleLoc { get { return _mNoodleLoc; } set { _mNoodleLoc = value; OnPropertyChanged(); } }
+        private int _mNoodleLoc = 1;
+
+
+        public int BowlLoc { get { return _mBowlLoc; } set { _mBowlLoc = value; OnPropertyChanged(); } }
+        private int _mBowlLoc = 10;
+
+        public bool IsNoodPositon { get { return _isNoodPositon; } set { _isNoodPositon = value; OnPropertyChanged(); } }
+        private bool _isNoodPositon = false;
+
+        public bool IsBowPositon { get { return _isBowPositon; } set { _isBowPositon = value; OnPropertyChanged(); } }
+        private bool _isBowPositon = false;
+
+        public bool LocalSimOrder { get { return _localSimOrder; } set { _localSimOrder = value; OnPropertyChanged(); } }
+        private bool _localSimOrder = Global.EnableLocalSimOrder;
+
+        public Visibility VisibilitySimOrder { get { return _visibilitySimOrder; } set { _visibilitySimOrder = value; OnPropertyChanged(); } }
+        private Visibility _visibilitySimOrder;
+    }
+}
diff --git a/BPASmartClient.MorkS3/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkS3/ViewModel/MonitorViewModel.cs
new file mode 100644
index 00000000..b129dec0
--- /dev/null
+++ b/BPASmartClient.MorkS3/ViewModel/MonitorViewModel.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BPASmartClient.Business;
+using BPASmartClient.Device;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.MorkS3.ViewModel
+{
+    public class MonitorViewModel : ObservableObject
+    {
+        public MonitorViewModel()
+        {
+
+        }
+
+        public static int DeviceId { get; set; }
+
+        public ObservableCollection<VariableMonitor> variableMonitors { get; set; } = Plugin.GetInstance()?.GetPlugin<DeviceMgr>()?.GetDevices()?.FirstOrDefault(p => p.DeviceId == DeviceId)?.variableMonitors;
+
+    }
+}
diff --git a/BPASmartClient.MorkS3/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkS3/ViewModel/ParSetViewModel.cs
new file mode 100644
index 00000000..42ffe812
--- /dev/null
+++ b/BPASmartClient.MorkS3/ViewModel/ParSetViewModel.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BPASmartClient.Helper;
+using BPASmartClient.Model;
+using BPASmartClient.MorkS3.Model;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+
+namespace BPASmartClient.MorkS3.ViewModel
+{
+    public class ParSetViewModel : ObservableObject
+    {
+        public ParSetViewModel()
+        {
+            SaveInfoCommand = new RelayCommand(SaveSettingData);
+
+            ActionManage.GetInstance.Register(SaveSettingData, "初始化设定煮面时间");
+            
+        }
+
+        public RelayCommand SaveInfoCommand { get; set; }
+
+        public ObservableCollection<ParSet> parSets { get; set; } = Json<MorksPar>.Data.parSets;
+
+        private void SaveSettingData()
+        {
+            List<ushort> values = new List<ushort>();
+            values.Clear();
+
+            List<bool> bools = new List<bool>();
+            bools.Clear();
+
+            for (int i = 0; i < Json<MorksPar>.Data.parSets.Count; i++)
+            {
+                values.Clear();
+                values.Add(Json<MorksPar>.Data.parSets[i].Minute);
+                values.Add(Json<MorksPar>.Data.parSets[i].Second);
+                bools.Add(Json<MorksPar>.Data.parSets[i].IsShield);
+                ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = $"VW{116 + (i * 6)}", Value = values.ToArray() });
+            }
+            ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M260.0", Value = bools.ToArray() });
+            Json<MorksPar>.Save();
+        }
+    }
+}
diff --git a/BPASmartClient.MorkS3/VoiceAPI.cs b/BPASmartClient.MorkS3/VoiceAPI.cs
new file mode 100644
index 00000000..6b4e057c
--- /dev/null
+++ b/BPASmartClient.MorkS3/VoiceAPI.cs
@@ -0,0 +1,42 @@
+using BPASmartClient.Message;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkS3
+{
+    public class VoiceAPI
+    {
+        public VoiceAPI()
+        {
+        }
+       
+        [DllImport("winmm.dll")]
+        public static extern bool PlaySound(string pszSound, int hmod, int fdwSound);
+
+
+        // 系统播放wav格式的文件
+        public static void m_SystemPlayWav(string strPlayFile)
+        {
+            try
+            {
+                if (strPlayFile.Trim() == "")
+                { return; }//为空不放
+
+                string strPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
+                strPath = strPath + strPlayFile;
+
+                int SND_FILENAME = 0x00020000;
+                int SND_ASYNC = 0x0001;
+                PlaySound(strPath, 0, SND_ASYNC | SND_FILENAME);//播放音乐
+            }       
+            catch (Exception ex)
+            {
+                MessageLog.GetInstance.ShowEx(ex.Message);
+            }
+        }
+    }
+}
diff --git a/BPASmartClient.MorkT_BarCounter/BPASmartClient.MorkT_BarCounter.csproj b/BPASmartClient.MorkT_BarCounter/BPASmartClient.MorkT_BarCounter.csproj
index 4eaa9d28..35fcbfec 100644
--- a/BPASmartClient.MorkT_BarCounter/BPASmartClient.MorkT_BarCounter.csproj
+++ b/BPASmartClient.MorkT_BarCounter/BPASmartClient.MorkT_BarCounter.csproj
@@ -16,12 +16,17 @@
     <ProjectReference Include="..\BPASmartClient.Juicer\BPASmartClient.Juicer.csproj" />
     <ProjectReference Include="..\BPASmartClient.Lebai\BPASmartClient.Lebai.csproj" />
     <ProjectReference Include="..\BPASmartClient.MCU\BPASmartClient.MCU.csproj" />
+    <ProjectReference Include="..\BPASmartClient.MilkTeaCube\BPASmartClient.MilkTeaCube.csproj" />
+    <ProjectReference Include="..\BPASmartClient.RobotGripper\BPASmartClient.RobotGripper.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <Page Update="View\DebugView.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
     </Page>
+    <Page Update="View\TestView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
   </ItemGroup>
 
 </Project>
diff --git a/BPASmartClient.MorkT_BarCounter/Control_MorkT_BarCounter.cs b/BPASmartClient.MorkT_BarCounter/Control_MorkT_BarCounter.cs
index 70cf8a2f..10b33a97 100644
--- a/BPASmartClient.MorkT_BarCounter/Control_MorkT_BarCounter.cs
+++ b/BPASmartClient.MorkT_BarCounter/Control_MorkT_BarCounter.cs
@@ -20,6 +20,9 @@ using BPASmartClient.Model.单片机;
 using BPASmartClient.Model.PLC;
 using BPASmartClient.DRCoffee;
 using BPASmartClient.LebaiRobot;
+using BPASmartClient.RobotGripper;
+using BPASmartClient.Model.电夹爪;
+using BPASmartClient.Model.奶茶味魔方;
 
 namespace BPASmartClient.MorkT_BarCounter
 {
@@ -42,7 +45,7 @@ namespace BPASmartClient.MorkT_BarCounter
         private string mainMaterialLoc;
         public override global::BPA.Message.Enum.DeviceClientType DeviceType { get { return BPA.Message.Enum.DeviceClientType.MORKT; } }
 
-        GVL_MorkT morkTLebaiJC =new GVL_MorkT();
+        GVL_MorkT morkT =new GVL_MorkT();
         /// <summary>
         /// 果汁机做法，true:热饮，false:冷饮
         /// </summary>
@@ -113,47 +116,49 @@ namespace BPASmartClient.MorkT_BarCounter
                             {
                                 case GOODS_TYPE.COFFEE:
                                     
-                                    if (morkTLebaiJC.morkOrderPushesCoffee.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                                    if (morkT.morkOrderPushesCoffee.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
                                     {
-                                        morkTLebaiJC.morkOrderPushesCoffee.Enqueue(new OrderLocInfo()
+                                        morkT.morkOrderPushesCoffee.Enqueue(new OrderLocInfo()
                                         {
                                             SuborderId = order.MorkOrder.SuborderId,
                                             BatchingId = res.BatchingId,
                                             Loc = ushort.Parse( mainMaterialLoc),
                                             GoodName = order.MorkOrder.GoodsName,
                                         });
-                                    }
-                                    break;
-                                case GOODS_TYPE.JUICE:
-                                   
-                                    if (morkTLebaiJC.morkOrderPushesJuicer.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
-                                    {
-                                        morkTLebaiJC.morkOrderPushesJuicer.Enqueue(new OrderLocInfo()
+                                        morkT.morkOrderPushesAll.Enqueue(new OrderLocInfo()
                                         {
                                             SuborderId = order.MorkOrder.SuborderId,
                                             BatchingId = res.BatchingId,
                                             Loc = ushort.Parse(mainMaterialLoc),
                                             GoodName = order.MorkOrder.GoodsName,
-                                            makeID = order.MorkOrder.MakeID,
                                         });
+                                        
                                     }
                                     break;
-                                case GOODS_TYPE.TEA:
-                                    if (morkTLebaiJC.morkOrderPushesTea.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                                //case GOODS_TYPE.JUICE:
+                                //    if (morkTLebaiJC.morkOrderPushesJuicer.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                                //    {
+                                //        morkTLebaiJC.morkOrderPushesJuicer.Enqueue(new OrderLocInfo()
+                                //        {
+                                //            SuborderId = order.MorkOrder.SuborderId,
+                                //            BatchingId = res.BatchingId,
+                                //            Loc = ushort.Parse(mainMaterialLoc),
+                                //            GoodName = order.MorkOrder.GoodsName,
+                                //            makeID = order.MorkOrder.MakeID,
+                                //        });
+                                //    }
+                                //    break;
+                                case GOODS_TYPE.MilkTea:
+                                    if (morkT.morkOrderPushesMilkTea.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
                                     {
-                                        morkTLebaiJC.morkOrderPushesTea.Enqueue(new OrderLocInfo()
+                                        morkT.morkOrderPushesMilkTea.Enqueue(new OrderLocInfo()
                                         {
                                             SuborderId = order.MorkOrder.SuborderId,
                                             BatchingId = res.BatchingId,
                                             Loc = ushort.Parse(mainMaterialLoc),
                                             GoodName = order.MorkOrder.GoodsName,
                                         });
-                                    }
-                                    break;
-                                case GOODS_TYPE.WATER:
-                                    if (morkTLebaiJC.morkOrderPushesWater.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
-                                    {
-                                        morkTLebaiJC.morkOrderPushesWater.Enqueue(new OrderLocInfo()
+                                        morkT.morkOrderPushesAll.Enqueue(new OrderLocInfo()
                                         {
                                             SuborderId = order.MorkOrder.SuborderId,
                                             BatchingId = res.BatchingId,
@@ -162,6 +167,18 @@ namespace BPASmartClient.MorkT_BarCounter
                                         });
                                     }
                                     break;
+                                //case GOODS_TYPE.WATER:
+                                //    if (morkTLebaiJC.morkOrderPushesWater.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                                //    {
+                                //        morkTLebaiJC.morkOrderPushesWater.Enqueue(new OrderLocInfo()
+                                //        {
+                                //            SuborderId = order.MorkOrder.SuborderId,
+                                //            BatchingId = res.BatchingId,
+                                //            Loc = ushort.Parse(mainMaterialLoc),
+                                //            GoodName = order.MorkOrder.GoodsName,
+                                //        });
+                                //    }
+                                //    break;
                                 case GOODS_TYPE.NEITHER:
                                     DeviceProcessLogShow("未知的商品类型");
                                     break;
@@ -174,88 +191,63 @@ namespace BPASmartClient.MorkT_BarCounter
         /// <summary>
         /// 将空杯放好到接饮料的地方的标志位
         /// </summary>
-        private bool bFirstTrig_TeaWater = false;
+        private bool bFirstTrig_MilkTea = false;
         private bool bFirstTrig_Coffee   = false;
-        private bool bFirstTrig_Juice    = false;
         /// <summary>
         /// 延迟的超时时间
         /// </summary>
-        DateTime delayTimeOut_Water;
         DateTime delayTimeOut_Coffee;
-        DateTime delayTimeOut_Juice;
+        DateTime delayTimeOut_MilkTea;
         public override void MainTask()
         {
             EventBus.EventBus.GetInstance().Subscribe<DRCoffee_CoffeEndCookEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
             {
-                if (morkTLebaiJC.IsHaveCoffeeCup && morkTLebaiJC.MakeCoffeeEnd != true)
-                    morkTLebaiJC.MakeCoffeeEnd = true;
+                if (morkT.IsHaveCoffeeCup && morkT.MakeCoffeeEnd != true)
+                    morkT.MakeCoffeeEnd = true;
+                    bFirstTrig_Coffee = false;
             });
-            if (morkTLebaiJC.IsHaveCoffeeCup && morkTLebaiJC.MakeCoffeeEnd != true)
+            if (morkT.IsHaveCoffeeCup && morkT.MakeCoffeeEnd != true)
             {
                 if (!bFirstTrig_Coffee)
                 {
                     bFirstTrig_Coffee = true;
                     delayTimeOut_Coffee = DateTime.Now;
                 }
-                else if (DateTime.Now.Subtract(delayTimeOut_Coffee).TotalSeconds > 18 && bFirstTrig_Coffee == true) 
+                else if (DateTime.Now.Subtract(delayTimeOut_Coffee).TotalSeconds > 180 && bFirstTrig_Coffee == true) 
                 {
                     DeviceProcessLogShow("接咖啡超时，接咖啡结束，等待取咖啡");
                     bFirstTrig_Coffee = false;
-                    if (morkTLebaiJC.IsHaveCoffeeCup)
-                        morkTLebaiJC.MakeCoffeeEnd = true;
+                    if (morkT.IsHaveCoffeeCup)
+                        morkT.MakeCoffeeEnd = true;
                 }
             }
-
-            if (morkTLebaiJC.IsHaveJuiceCup && morkTLebaiJC.MakeJuiceEnd != true)
+            if (morkT.IsHaveTeaMilkTeaCup && morkT.MakeMilkTeaEnd != true)
             {
-                var Juicestate = GetStatus<int[]>("GetDeviceStatus");
-                if (Juicestate != null)
-                {
-                    if (Juicestate.Length > 0)
-                    {
-                        var Juicestate1 = Convert.ToString(Juicestate[0], 2);
-                        var Juicestate2 = Juicestate[1];
-                        if (Juicestate1.IndexOf("0") == 1 && Juicestate2 == 0)
-                        {
-                            morkTLebaiJC.MakeJuiceEnd = true;
-                            bFirstTrig_Juice = false;
-                        }
-                    }
-                }
-                if (!morkTLebaiJC.MakeJuiceEnd)
+                if (!bFirstTrig_MilkTea)
                 {
-                    //若无状态返回 则加延迟
-                    if (!bFirstTrig_Juice)
-                    {
-                        bFirstTrig_Juice = true;
-                        delayTimeOut_Juice = DateTime.Now;
-                    }
-                    else if (DateTime.Now.Subtract(delayTimeOut_Juice).TotalSeconds > 3 && bFirstTrig_Juice == true)
-                    {
-                        DeviceProcessLogShow("接果汁超时，接果汁结束，等待取果汁");
-                        bFirstTrig_Juice = false;
-                        morkTLebaiJC.MakeJuiceEnd = true;
-                    }
+                    bFirstTrig_MilkTea = true;
+                    delayTimeOut_MilkTea = DateTime.Now;//开启接水信号后，记录当前时间
                 }
-            }
-            if (morkTLebaiJC.IsHaveTeaWaterCup && morkTLebaiJC.MakeTeaEnd != true)
-            {
-                if (!bFirstTrig_TeaWater)
+                else if (DateTime.Now.Subtract(delayTimeOut_MilkTea).TotalSeconds >= 180 && bFirstTrig_MilkTea == true)//接水超过50s后，启动接水完成标志，开启接水程序
                 {
-                    bFirstTrig_TeaWater = true;
-                    delayTimeOut_Water = DateTime.Now;//开启接水信号后，记录当前时间
+                    DeviceProcessLogShow("接茶或水延迟时间结束");
+                    morkT.MakeMilkTeaEnd = true;
                 }
-                else if (DateTime.Now.Subtract(delayTimeOut_Water).TotalSeconds >= 5 && bFirstTrig_TeaWater == true)//接水超过50s后，启动接水完成标志，开启接水程序
+                if ( GetStatus<bool>("Get_MilkTeaCubeStatus") == true)
                 {
-                    DeviceProcessLogShow("接茶或水延迟时间结束");
-                    bFirstTrig_TeaWater = false;
-                    morkTLebaiJC.MakeTeaEnd = true;
+                    while(GetStatus<bool>("Get_MilkTeaCubeDosingStatus") == true) 
+                    {
+                        if (morkT.IsHaveTeaMilkTeaCup && morkT.MakeMilkTeaEnd != true)
+                        {
+                            morkT.MakeMilkTeaEnd = true;
+                            bFirstTrig_MilkTea = false;
+                            new MilkTea_MakeMilkTeaEvent() { DeviceId = DeviceId, TagName = "StartSignReset" }.Publish();
+                        }
+                    }
                 }
             }
             DoCoffee();
-            DoJuice();
-            DoBoiledTea();
-            DoBoiledWater();
+            DoMilkTea();
         }
 
         /// <summary>
@@ -278,18 +270,6 @@ namespace BPASmartClient.MorkT_BarCounter
             return GOODS_TYPE.NEITHER;
         }
         /// <summary>
-        /// 乐白的场景结束等待
-        /// </summary>
-        /// <param name="value"></param>
-        private void Wait(int value = 101)
-        {
-            while (!((bool)peripheralStatus["RobotOK"] && (int)peripheralStatus["RobotValue"] == value))
-            {
-                Thread.Sleep(5);
-            }
-            new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-        }
-        /// <summary>
         /// 乐白的场景
         /// </summary>
         /// <param name="sen"></param>
@@ -318,7 +298,6 @@ namespace BPASmartClient.MorkT_BarCounter
             return default;
         }
         int[] devStatusBy = new int[2] { 0, 0 };
-        bool outCupCheck = false;//放纸杯位置有无判断
         /// <summary>
         /// 传感器的输入信号 0:无意义 1：有信号 2：无信号 3：信号不正确
         /// </summary>
@@ -330,7 +309,7 @@ namespace BPASmartClient.MorkT_BarCounter
         /// <returns></returns>
         private bool IsMakeCoffee() 
         {
-            bool bMake = (IsHealth && morkTLebaiJC.morkOrderPushesCoffee.Count > 0 && !morkTLebaiJC.IsHaveCoffeeCup) ? true : false;
+            bool bMake = (IsHealth && morkT.morkOrderPushesCoffee.Count > 0 && !morkT.IsHaveCoffeeCup &&  morkT.morkOrderPushesAll.ElementAt(0).SuborderId == morkT.morkOrderPushesCoffee.ElementAt(0).SuborderId) ? true : false;
             return bMake;
         }
         /// <summary>
@@ -339,16 +318,16 @@ namespace BPASmartClient.MorkT_BarCounter
         /// <returns></returns>
         private bool IsMakeJuice()
         {
-            bool bMake = (IsHealth && morkTLebaiJC.morkOrderPushesJuicer.Count > 0  && !morkTLebaiJC.IsHaveJuiceCup) ? true : false;
+            bool bMake = (IsHealth && morkT.morkOrderPushesJuicer.Count > 0  && !morkT.IsHaveJuiceCup && morkT.morkOrderPushesAll.ElementAt(0).SuborderId == morkT.morkOrderPushesCoffee.ElementAt(0).SuborderId) ? true : false;
             return bMake;
         }
         /// <summary>
         /// 判断是否有茶订单
         /// </summary>
         /// <returns></returns>
-        private bool IsMakeTeaWater()
+        private bool IsMakeMilkTea()
         {
-            bool bMake = (IsHealth && morkTLebaiJC.morkOrderPushesTea.Count > 0  && !morkTLebaiJC.IsHaveTeaWaterCup) ? true : false;
+            bool bMake = (IsHealth && morkT.morkOrderPushesMilkTea.Count > 0 && !morkT.IsHaveTeaMilkTeaCup && morkT.morkOrderPushesAll.ElementAt(0).SuborderId == morkT.morkOrderPushesMilkTea.ElementAt(0).SuborderId) ? true : false;
             return bMake;
         }
         /// <summary>
@@ -357,7 +336,7 @@ namespace BPASmartClient.MorkT_BarCounter
         /// <returns></returns>
         private bool IsMakeWater()
         {
-            bool bMake = (IsHealth && morkTLebaiJC.morkOrderPushesWater.Count > 0  && !morkTLebaiJC.IsHaveTeaWaterCup) ? true : false;
+            bool bMake = (IsHealth && morkT.morkOrderPushesWater.Count > 0  && !morkT.IsHaveTeaMilkTeaCup) ? true : false;
             return bMake;
         }
         /// <summary>
@@ -367,83 +346,19 @@ namespace BPASmartClient.MorkT_BarCounter
         {
             if (IsMakeCoffee())
             {
-                PickUpCoffee();//接咖啡
-                morkTLebaiJC.IsHaveCoffeeCup = true;
-            }
-            else if(morkTLebaiJC.MakeCoffeeEnd)
-            {
-                try
-                {
-                    PutCoffeeCup();
-                    morkTLebaiJC.MakeCoffeeEnd = false;
-                    morkTLebaiJC.IsHaveCoffeeCup = false;
-                    morkTLebaiJC.morkOrderPushesCoffee.TryDequeue(out OrderLocInfo orderLoc);
-                }
-                catch (Exception ex)
-                {
-                    MessageLog.GetInstance.ShowEx(ex.ToString());
-                }
-            }
-        }
-        private void DoJuice()
-        {
-            if (IsMakeJuice())
-            {
-                switch (morkTLebaiJC.morkOrderPushesJuicer.ElementAt(0).makeID) 
-                {
-                    case "1":
-                        GuMake = true;
-                        IsAddIce = false;
-                        break;
-                    case "2":
-                        GuMake = false;
-                        IsAddIce = false;
-                        break;
-                    case "3":
-                        GuMake = false;
-                        IsAddIce = true;
-                        break;
-                    default:
-                        break;
-                }
-                PickUpJuicer();
-                morkTLebaiJC.IsHaveJuiceCup = true;
-            }
-            else if (morkTLebaiJC.MakeJuiceEnd) 
-            {
-                try
-                {
-                    Thread.Sleep(5000);//延迟五秒，防止饮料口滴饮料
-                    putJuice();
-                    morkTLebaiJC.IsHaveJuiceCup = false;
-                    morkTLebaiJC.MakeJuiceEnd = false;
-                    morkTLebaiJC.morkOrderPushesJuicer.TryDequeue(out OrderLocInfo orderLoc);
-                }
-                catch (Exception ex) 
-                {
-                    MessageLog.GetInstance.ShowEx(ex.ToString());
-                }
-            }
-        }
-        public bool DoTeaOrWater;
-        private void DoBoiledTea() 
-        {
-            if (IsMakeTeaWater())
-            {
-                PickUpTea();
-                morkTLebaiJC.IsHaveTeaWaterCup = true;
-                DoTeaOrWater = true;
+                Discharge_Control(Kind.咖啡);//接咖啡
+                morkT.IsHaveCoffeeCup = true;
             }
-            else if (morkTLebaiJC.MakeTeaEnd && morkTLebaiJC.morkOrderPushesTea.Count > 0 && DoTeaOrWater)
+            else if(morkT.MakeCoffeeEnd)
             {
                 try
                 {
-                    PutWaterCup();
-                    OrderChange(morkTLebaiJC.morkOrderPushesTea.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
-                    DeviceProcessLogShow("-------------茶 制作完成------------");
-                    morkTLebaiJC.IsHaveTeaWaterCup = false;
-                    morkTLebaiJC.MakeTeaEnd = false;
-                    morkTLebaiJC.morkOrderPushesTea.TryDequeue(out OrderLocInfo orderLoc);
+                    PutCup(Kind.咖啡);
+                    DeviceProcessLogShow("-------------咖啡制作完成------------");
+                    morkT.MakeCoffeeEnd = false;
+                    morkT.IsHaveCoffeeCup = false;
+                    morkT.morkOrderPushesCoffee.TryDequeue(out OrderLocInfo orderLoc);
+                    morkT.morkOrderPushesAll.TryDequeue(out OrderLocInfo orderLoc1);
                 }
                 catch (Exception ex)
                 {
@@ -451,24 +366,23 @@ namespace BPASmartClient.MorkT_BarCounter
                 }
             }
         }
-        private void DoBoiledWater() 
+        private void DoMilkTea() 
         {
-            if (IsMakeWater())
+            if (IsMakeMilkTea())
             {
-                PickUpWater();
-                morkTLebaiJC.IsHaveTeaWaterCup = true;
-                DoTeaOrWater = false;
+                Discharge_Control(Kind.奶茶);//接咖啡
+                morkT.IsHaveTeaMilkTeaCup = true;
             }
-            else if (morkTLebaiJC.MakeTeaEnd && morkTLebaiJC.morkOrderPushesWater.Count > 0 && DoTeaOrWater == false)
+            else if (morkT.MakeMilkTeaEnd && morkT.morkOrderPushesMilkTea.Count > 0)
             {
                 try
                 {
-                    PutWaterCup();
-                    OrderChange(morkTLebaiJC.morkOrderPushesWater.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
-                    DeviceProcessLogShow("-------------开水 制作完成------------");
-                    morkTLebaiJC.IsHaveTeaWaterCup = false;
-                    morkTLebaiJC.MakeTeaEnd = false;
-                    morkTLebaiJC.morkOrderPushesWater.TryDequeue(out OrderLocInfo orderLoc);
+                    PutCup(Kind.奶茶);
+                    DeviceProcessLogShow("-------------奶茶制作完成------------");
+                    morkT.IsHaveTeaMilkTeaCup = false;
+                    morkT.MakeMilkTeaEnd = false;
+                    morkT.morkOrderPushesMilkTea.TryDequeue(out OrderLocInfo orderLoc);
+                    morkT.morkOrderPushesAll.TryDequeue(out OrderLocInfo orderLoc1);
                 }
                 catch (Exception ex)
                 {
@@ -477,326 +391,140 @@ namespace BPASmartClient.MorkT_BarCounter
             }
         }
 
-
         #region 做咖啡流程
         /// <summary>
-        /// 接咖啡
+        /// 出料控制
         /// </summary>
-        private void PickUpCoffee()
+        private void Discharge_Control(Kind kind)
         {
-            if (!morkTLebaiJC.IsHaveCoffeeCup)
+            if (!morkT.IsHaveCoffeeCup)
             {
-                outCupCheck = false;
-                OrderChange(morkTLebaiJC.morkOrderPushesCoffee.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
-                int resultTakeCup = takeCup();
-                if (resultTakeCup == 1)
+                if (kind == Kind.咖啡)
                 {
-                    new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                    Sence(GVL_MorkT.机器人安全位);
-                    //Wait();
-
-                    WritePLCData("",2);//将轴移动到接咖啡的位置
-                    DeviceProcessLogShow("伺服电机移动到接咖啡的位置");
-
-                    DeviceProcessLogShow("咖啡杯取杯完成");
-                    new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                    Sence(GVL_MorkT.接咖啡);
-                    //Wait();
-                    new DRCoffee_MakeCoffeeEvent() { DrinkCode = (DrCoffeeDrinksCode)(morkTLebaiJC.morkOrderPushesCoffee.ElementAt(0).Loc)}.Publish();  //接咖啡控制 //DrCoffeeDrinksCode.热水
+                    OrderChange(morkT.morkOrderPushesCoffee.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
                 }
                 else
                 {
-                    /*DeviceProcessLogShow("取杯失败 回到初始位，请及时处理！！");
-                    new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                    Sence(GVL_MorkT.机器人初始位);
-                    //Wait();*/
+                    OrderChange(morkT.morkOrderPushesMilkTea.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
                 }
-            }
-        }
-        /// <summary>
-        /// 咖啡杯接好，放咖啡杯
-        /// </summary>
-        private void PutCoffeeCup()
-        {
-            while (GetStatus<bool>("RobotValue1"))//判断放杯位置是否有物品
-            {
-                if (!outCupCheck)
-                    DeviceProcessLogShow("成品处有纸杯存在，请取走！！");
-                outCupCheck = true;
-            }
-            outCupCheck = false;
-            new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-            Sence(GVL_MorkT.机器人安全位);
-            //Wait();
-
-            WritePLCData("", 2);//将轴移动到接咖啡的位置
-            new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-            Sence(GVL_MorkT.放咖啡杯);
-            //Wait();
-            OrderChange(morkTLebaiJC.morkOrderPushesCoffee.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
-            DeviceProcessLogShow($"-------------{morkTLebaiJC.morkOrderPushesCoffee.ElementAt(0).GoodName}制作完成------------");
-        }
-        #endregion
-        #region 做开水流程
-        /// <summary>
-        /// 接开水
-        /// </summary>
-        private void PickUpWater()
-        {
-            #region 接水流程
-            if (!morkTLebaiJC.IsHaveTeaWaterCup)
-            {
-                OrderChange(morkTLebaiJC.morkOrderPushesWater.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
                 int resultTakeCup = takeCup();
                 if (resultTakeCup == 1)
                 {
-                    new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                    Sence(GVL_MorkT.接开水);
-                    //Wait();
-                    Output(false, 1);
-                    Output(false, 0);
-                    Thread.Sleep(100);
-                    Output(true, 0);
-                    Thread.Sleep(3000);
-                    Output(false, 0);
-                    Thread.Sleep(100);
+                    if (kind == Kind.咖啡)
+                    {
+                        new WriteJaka() { DeviceId =DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_取杯位_接咖啡位 }.Publish();
+                        JakaWait(int.Parse(JakaModel.SENCE_取杯位_接咖啡位));
+
+                        new DRCoffee_MakeCoffeeEvent() { DeviceId = DeviceId, DrinkCode = (DrCoffeeDrinksCode)(morkT.morkOrderPushesCoffee.ElementAt(0).Loc) }.Publish();  //控制咖啡出料
+
+                        //new WriteGripper() { TagName = "PWMControl", CH_Number = "0", PWMOutput = "500" }.Publish();//夹爪的幅度控制
+
+                        //new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_接咖啡_初始位 }.Publish();
+                        //Wait(int.Parse(JakaModel.SENCE_接咖啡_初始位));
 
-                    Output(false, 1);
-                    Thread.Sleep(100);
-                    Output(true, 1);
-                    Thread.Sleep(500);
-                    Output(false, 1);
+                        //DeviceProcessLogShow("接咖啡杯动作完成");
+                    }
+                    else 
+                    {
+                        new WriteJaka() { DeviceId = DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_取杯位_接奶茶位 }.Publish();
+                        JakaWait(int.Parse(JakaModel.SENCE_取杯位_接奶茶位));
+                        while (GetStatus<bool>("Get_MilkTeaCubeStatus") == false)
+                        {
+                            new MilkTea_MakeMilkTeaEvent() { DeviceId = DeviceId, TagName = "ParameterSet", MilkTeaKind = GVL_MorkT.MilkTeaCHValue }.Publish();  //写入奶茶参数
+                            new MilkTea_MakeMilkTeaEvent() { DeviceId = DeviceId, TagName = "Start" }.Publish();
+                            break;
+                        }
+                        //new WriteGripper() { TagName = "PWMControl", CH_Number = "0", PWMOutput = "500" }.Publish();//夹爪的幅度控制
+
+                        //new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_接奶茶_初始位 }.Publish();
+                        //Wait(int.Parse(JakaModel.SENCE_接奶茶_初始位));
+
+                        //DeviceProcessLogShow("接奶茶杯动作完成");
+                    }
                 }
                 else
                 {
-                    return;
+                    DeviceProcessLogShow("取杯失败 回到初始位，请及时处理！！");
+                    new WriteJaka() { DeviceId = DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_异常回初始位 }.Publish();
+                    JakaWait(int.Parse(JakaModel.SENCE_异常回初始位));
                 }
             }
-            #endregion
         }
-        #endregion
-        #region 做茶流程
-        /// <summary>
-        /// 做茶
-        /// </summary>
-        private void PickUpTea()
+        public bool outCupCheck;
+        private void PutCup(Kind res)
         {
-            #region 接茶流程
-            if (!morkTLebaiJC.IsHaveTeaWaterCup)
+            //new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_初始位 }.Publish();
+            //Wait(int.Parse(JakaModel.SENCE_初始位));
+
+            //new WriteGripper() { TagName = "PWMControl", CH_Number = "0", PWMOutput = "500" }.Publish();//夹爪的幅度控制
+
+            //new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_初始位 }.Publish();
+            //Wait(int.Parse(JakaModel.SENCE_初始位_放杯位检测));
+
+            //while (GetStatus<bool>("Get_JakaRobotDI0"))//判断放杯位置是否有物品
+            //{
+            //    if (!outCupCheck)
+            //        DeviceProcessLogShow("成品处有纸杯存在，请取走！！");
+            //    outCupCheck = true;
+            //}
+            //outCupCheck = false;
+            if (res == Kind.咖啡)
             {
-                OrderChange(morkTLebaiJC.morkOrderPushesTea.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
-                int resultTakeCup = takeCup();
-                if (resultTakeCup == 1)
-                {
-                    DeviceProcessLogShow("取茶杯完成");
-                    new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                    Sence(GVL_MorkT.接茶叶);
-                    //Wait();
+                //new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_放杯位检测_接咖啡 }.Publish();
+                //Wait(int.Parse(JakaModel.SENCE_放杯位检测_接咖啡));
 
-                    new WriteMcu() { TagName = "ServoControl", Address = "1", Value = 90 }.Publish();
-                    Thread.Sleep(1000);
-                    new WriteMcu() { TagName = "ServoControl", Address = "1", Value = 150 }.Publish();
-                    Thread.Sleep(1000);
-                    new WriteMcu() { TagName = "ServoControl", Address = "1", Value = 90 }.Publish();
+                //new WriteGripper() { TagName = "PWMControl", CH_Number = "0", PWMOutput = "1300" }.Publish();//夹爪的幅度控制
 
-                    Thread.Sleep(3000);
-                    new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                    Sence(GVL_MorkT.接茶水);
-                    //Wait();
-                    Output(false, 1);
-                    Output(false, 0);
-                    Thread.Sleep(100);
-                    Output(true, 0);
-                    Thread.Sleep(3000);
-                    Output(false, 0);
-                    Thread.Sleep(100);
+                //new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_放杯位检测_接咖啡 }.Publish();
+                //Wait(int.Parse(JakaModel.SENCE_接咖啡_放杯位));
+
+                //new WriteGripper() { TagName = "PWMControl", CH_Number = "0", PWMOutput = "500" }.Publish();//夹爪的幅度控制
+                new WriteJaka() { DeviceId = DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_接咖啡位_放咖啡位 }.Publish();
+                JakaWait(int.Parse(JakaModel.SENCE_接咖啡位_放咖啡位));
+
+                //new WriteGripper() { DeviceId = DeviceId, TagName = "PWMControl", CH_Number = "0", PWMOutput = "0500" }.Publish();//夹爪的幅度控制
+                //new WriteJaka() { DeviceId = DeviceId, TagName = "JakaDOutput", Value = true, DO_Index = 1 }.Publish();
 
-                    Output(false, 1);
-                    Thread.Sleep(100);
-                    Output(true, 1);
-                    Thread.Sleep(500);
-                    Output(false, 1);
-                    morkTLebaiJC.IsHaveTeaWaterCup = true;
-                }
-                else
-                {
-                    return;
-                }
             }
-            #endregion
-        }
-        /// <summary>
-        /// 放水杯流程
-        /// </summary>
-        private void PutWaterCup()
-        {
-            while (GetStatus<bool>("RobotValue1"))//判断放杯位置是否有物品
+            else
             {
-                if (!outCupCheck)
-                    DeviceProcessLogShow("成品处有纸杯存在，请取走！！");
-                outCupCheck = true;
-            }
-            outCupCheck = false;
-            new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-            Sence(GVL_MorkT.放水杯);
-        }
+                //new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_放杯位检测_接咖啡 }.Publish();
+                //Wait(int.Parse(JakaModel.SENCE_放杯位检测_接奶茶));
 
-        #endregion
-        #region 做果汁流程
-        /// <summary>
-        /// 果汁机控制信号
-        /// </summary>
-        private byte JuicerNum;
+                //new WriteGripper() { TagName = "PWMControl", CH_Number = "0", PWMOutput = "1300" }.Publish();//夹爪的幅度控制
 
-        private void getIce() 
-        {
-            IsAddIceNow = IsAddIce;
-            if (IsAddIce)
-            {
-                new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                Sence(GVL_MorkT.取杯位_机器人安全位);
-                //Wait();
+                //new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_放杯位检测_接咖啡 }.Publish();
+                //Wait(int.Parse(JakaModel.SENCE_接奶茶_放杯位));
 
-                WritePLCData("",3);//将模组移动到接冰的位置
+                //new WriteGripper() { TagName = "PWMControl", CH_Number = "0", PWMOutput = "500" }.Publish();//夹爪的幅度控制
 
-                new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                Sence(GVL_MorkT.接冰块);
-                //Wait();
-                if (Math.Pow(1, GetStatus<byte>("GetMakeIceDeviceStatus")) == 0)//制冰机在待机状态才可以制作冰
-                {
-                    new StartMakeIce() { }.Publish();
-                }
-                new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                Sence(GVL_MorkT.接冰_机器人安全位);
-                //Wait();
+                new WriteJaka() { DeviceId = DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_等奶茶_接奶茶位 }.Publish();
+                JakaWait(int.Parse(JakaModel.SENCE_等奶茶_接奶茶位));
+
+                new WriteJaka() { DeviceId = DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_接奶茶位_放奶茶位 }.Publish();
+                JakaWait(int.Parse(JakaModel.SENCE_接奶茶位_放奶茶位));
+
+                //new WriteGripper() { DeviceId = DeviceId,  TagName = "PWMControl", CH_Number = "0", PWMOutput = "500" }.Publish();//夹爪的幅度控制
+                //new WriteJaka() { DeviceId = DeviceId, TagName = "JakaDOutput", Value = true, DO_Index = 1 }.Publish();
             }
-        }
-        /// <summary>
-        /// 当前订单是否加冰
-        /// </summary>
-        private bool IsAddIceNow = false;
-        private int JuiceCH;
-        /// <summary>
-        /// 接果汁
-        /// </summary>
-        private void PickUpJuicer()
-        {
-            #region 接果汁流程
-            if (!morkTLebaiJC.IsHaveJuiceCup)
+            new WriteJaka() { DeviceId = DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_放杯位_初始位 }.Publish();
+            JakaWait(int.Parse(JakaModel.SENCE_放杯位_初始位));
+            if (GetStatus<bool>("Get_JakaRobotDI5"))
             {
-                OrderChange(morkTLebaiJC.morkOrderPushesJuicer.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
-                int resultTakeCup = takeCup();  
-                JuiceCH = morkTLebaiJC.morkOrderPushesJuicer.ElementAt(0).Loc;
-                if (resultTakeCup == 1)
-                {
-                    getIce();
-                    new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                    Sence(GVL_MorkT.机器人安全位);
-                    //Wait();
-                    WritePLCData("", 3);//将模组移动到接冰的位置
-                    new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                    Sence(GVL_MorkT.接果汁过渡位);
-                    //Wait();
-                    switch (JuiceCH)
-                    {
-                        case 52:
-                            if (GuMake)
-                                JuicerNum = 0x00;
-                            else
-                                JuicerNum = 0x01;
-                            new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                            Sence(GVL_MorkT.接果汁1);
-                            //Wait();
-                            break;
-                        case 53:
-                            if (GuMake)
-                                JuicerNum = 0x02;
-                            else
-                                JuicerNum = 0x03;
-                            new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                            Sence(GVL_MorkT.接果汁2);
-                            //Wait();
-                            break;
-                        case 54:
-                            if (GuMake)
-                                JuicerNum = 0x04;
-                            else
-                                JuicerNum = 0x05;
-                            new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                            Sence(GVL_MorkT.接果汁3);
-                            //Wait();
-                            break;
-                        case 55:
-                            if (GuMake)
-                                JuicerNum = 0x06;
-                            else
-                                JuicerNum = 0x07;
-                            new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                            Sence(GVL_MorkT.接果汁4);
-                            //Wait();
-                            break;
-                        default:
-                            JuicerNum = 0x00;
-                            new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                            Sence(GVL_MorkT.接果汁1);
-                            //Wait();
-                            break;
-                    }
-                    new WriteJuicer() { Value = JuicerNum }.Publish();
-                    morkTLebaiJC.IsHaveJuiceCup = true;
-                }
-                else
-                {
-                    return;
-                }
+                DeviceProcessLogShow("放杯完成，杯子感应器但仍有信号");
             }
-            #endregion
-        }
-        /// <summary>
-        /// 取接好果汁杯
-        /// </summary>
-        private void putJuice()
-        {
-            while (GetStatus<bool>("RobotValue1"))//判断放杯位置是否有物品
+            if (res == Kind.咖啡)
             {
-                if (!outCupCheck)
-                    DeviceProcessLogShow("成品处有纸杯存在，请取走！！");
-                outCupCheck = true;
+                OrderChange(morkT.morkOrderPushesCoffee.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
+                DeviceProcessLogShow($"-------------{morkT.morkOrderPushesCoffee.ElementAt(0).GoodName}制作完成------------");
             }
-            outCupCheck = false;
-            switch (JuiceCH)
+            else
             {
-                case 52:
-                    new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                    Sence(GVL_MorkT.放果汁杯1);
-                    //Wait();
-                    break;
-                case 53:
-                    new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                    Sence(GVL_MorkT.放果汁杯2);
-                    //Wait();
-                    break;
-                case 54:
-                    new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                    Sence(GVL_MorkT.放果汁杯3);
-                    //Wait();
-                    break;
-                case 55:
-                    new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                    Sence(GVL_MorkT.放果汁杯4);
-                    //Wait();
-                    break;
-                default:
-                    new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                    Sence(GVL_MorkT.放果汁杯1);
-                    //Wait();
-                    break;
+                OrderChange(morkT.morkOrderPushesMilkTea.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
+                DeviceProcessLogShow($"-------------{morkT.morkOrderPushesMilkTea.ElementAt(0).GoodName}制作完成------------");
             }
-            OrderChange(morkTLebaiJC.morkOrderPushesJuicer.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
-            DeviceProcessLogShow($"-------------{morkTLebaiJC.morkOrderPushesJuicer.ElementAt(0).GoodName}果汁 制作完成------------");
         }
         #endregion
-
         /// <summary>
         /// 取杯的次数
         /// </summary>
@@ -809,96 +537,124 @@ namespace BPASmartClient.MorkT_BarCounter
         {
             try
             {
-                nCnt = 0;
-                new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                Sence(GVL_MorkT.机器人初始位);
-                //Wait();
+                //    new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_初始位 }.Publish();
+                //    Wait(int.Parse(JakaModel.SENCE_初始位));
+
+                //    new WriteGripper() { TagName = "PWMControl", CH_Number = "0", PWMOutput = "500" }.Publish();//夹爪的幅度控制
 
-                new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                Sence(GVL_MorkT.机器人安全位);
-                //Wait();
+                //p: new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_落杯 }.Publish();
+                //    Wait(int.Parse(JakaModel.SENCE_落杯));
 
-                WritePLCData("", 1);
+                //    new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_取杯位检测_取杯位 }.Publish();
+                //    Wait(int.Parse(JakaModel.SENCE_初始位_取杯位检测));
 
-                new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                Sence(GVL_MorkT.取纸杯);
-                //Wait();
+                //    if (!GetStatus<bool>("Get_JakaRobotDI0"))
+                //        goto p;
 
-                new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                Sence(GVL_MorkT.取纸杯检测);
-                //Wait();
-                nCnt++;
-                Thread.Sleep(2000);
-                while (!GetStatus<bool>("GetInput")) //读取传感器的值
+                //    new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_取杯位检测_取杯位 }.Publish();
+                //    Wait(int.Parse(JakaModel.SENCE_取杯位检测_取杯位));
+
+                //    new WriteGripper() { TagName = "PWMControl", CH_Number = "0", PWMOutput = "1300" }.Publish();//夹爪的幅度控制
+                //    Thread.Sleep(2000);
+                //    while (!GetStatus<bool>("Get_JakaRobotDI0")) //读取传感器的值
+                //    {
+                //        new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_异常回初始位 }.Publish();
+                //        Wait(int.Parse(JakaModel.SENCE_异常回初始位));
+                //        return 2;
+                //    }
+                bool test1 = false;
+                if (test1)
                 {
-                    if (nCnt > 3)
-                    {
-                        nCnt = 0;
-                        DeviceProcessLogShow("三次取杯失败，回原点");
-                        new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                        Sence(GVL_MorkT.机器人安全位);
-                        //Wait();
-                        new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                        Sence(GVL_MorkT.机器人初始位);
-                        //Wait();
-                        return 2;
-                    }
-                    else
+                    #region 第一种取杯方式
+                    new WriteJaka() { DeviceId = DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_初始位 }.Publish();
+                    JakaWait(int.Parse(JakaModel.SENCE_初始位));
+
+                    new WriteGripper() { DeviceId = DeviceId, TagName = "PWMControl", CH_Number = "0", PWMOutput = "1350" }.Publish();//夹爪的幅度控制
+
+                    new WriteJaka() { DeviceId = DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_初始位_取杯位 }.Publish();
+                    JakaWait(int.Parse(JakaModel.SENCE_初始位_取杯位));
+
+                    int cnt = 0;
+                    new WriteGripper() { DeviceId = DeviceId, TagName = "PWMControl", CH_Number = "0", PWMOutput = "1350" }.Publish();//夹爪的幅度控制
+
+                p: new WriteJaka() { DeviceId = DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_落杯 }.Publish();
+                    JakaWait(int.Parse(JakaModel.SENCE_落杯));
+                    cnt = cnt + 1;
+                    if (!GetStatus<bool>("Get_JakaRobotDI6"))
                     {
-                        nCnt++;
-                        new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                        Sence(GVL_MorkT.二次取杯);
-                        //Wait();
-                        new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                        Sence(GVL_MorkT.取纸杯检测);
-                        //Wait();
+                        if (cnt < 3)
+                            goto p;
+                        else
+                        {
+                            return 2;
+                        }
                     }
-                    Thread.Sleep(1000);
-                }
-                new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
-                Sence(GVL_MorkT.取杯位_机器人安全位);
-                //Wait();
-                return 1;
-            }
-            catch (Exception ex)
-            {
-                DeviceProcessLogShow(ex.ToString());
-            }
-            return 2;
-        }
-        /// <summary>
-        /// 放杯
-        /// </summary>
-        /// <returns>0:无意义 1：放杯成功 2：执行失败(传感器还有信号) 3：放杯异常</returns>
-        private int putCup()
-        {
-            try
-            {
-                if (GetStatus<bool>("GetInput2")) return 2;
-                Sence(GVL_MorkT.JUICE_放杯);
-                //Wait();
-                new LebaiRobot_SetValueEvent() { RobotSetValue = 1 }.Publish();
-                Sence(GVL_MorkT.JUICE_放杯检测);
-                //Wait();
-                new LebaiRobot_SetValueEvent() { RobotSetValue = 1 }.Publish();
-                if (GetStatus<bool>("GetInput2"))
-                {
                     return 1;
+                    #endregion
                 }
                 else
                 {
-                    return 3;
+                    #region 第二种取杯方式
+                    new WriteJaka() { DeviceId = DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_初始位 }.Publish();
+                    JakaWait(int.Parse(JakaModel.SENCE_初始位));
+
+                    //new WriteJaka() { DeviceId = DeviceId, TagName = "JakaDOutput", Value = false, DO_Index = 1 }.Publish();
+
+                    //new WriteGripper() { DeviceId = DeviceId, TagName = "PWMControl", CH_Number = "0", PWMOutput = "1350" }.Publish();//夹爪的幅度控制
+
+                    new WriteJaka() { DeviceId = DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_初始位_取杯位 }.Publish();
+                    JakaWait(int.Parse(JakaModel.SENCE_初始位_取杯位));
+
+                    int cnt = 0;
+                p:  new WriteJaka() { DeviceId = DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_落杯 }.Publish();
+                    JakaWait(int.Parse(JakaModel.SENCE_落杯));
+                    cnt = cnt + 1;
+                    if (!GetStatus<bool>("Get_JakaRobotDI5"))
+                    {
+                        if (cnt < 3)
+                            goto p;
+                        else
+                        {
+                            return 2;
+                        }
+                    }
+                    Thread.Sleep(2000);
+                    new WriteJaka() { DeviceId = DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_取杯位_取杯放杯检测位 }.Publish();
+                    JakaWait(int.Parse(JakaModel.SENCE_取杯位_取杯放杯检测位));
+
+                    //new WriteJaka() { DeviceId = DeviceId, TagName = "JakaDOutput", Value = true, DO_Index = 1 }.Publish();
+                    //Thread.Sleep(2000);
+                    //new WriteJaka() { DeviceId = DeviceId, TagName = "JakaDOutput", Value = false, DO_Index = 1 }.Publish();
+                    //new WriteGripper() { DeviceId = DeviceId, TagName = "PWMControl", CH_Number = "0", PWMOutput = "1200" }.Publish();//夹爪的幅度控制
+                    //Thread.Sleep(2000);
+                    //new WriteGripper() { DeviceId = DeviceId, TagName = "PWMControl", CH_Number = "0", PWMOutput = "1350" }.Publish();//夹爪的幅度控制
+
+                    new WriteJaka() { DeviceId = DeviceId, TagName = "JaKaProgramName", Value = JakaModel.SENCE_取杯放杯检测位_取杯位 }.Publish();
+                    JakaWait(int.Parse(JakaModel.SENCE_取杯放杯检测位_取杯位));
+
+                    return 1;
+
+                    #endregion
                 }
             }
             catch (Exception ex)
             {
                 DeviceProcessLogShow(ex.ToString());
-                return 0;
             }
+            return 2;
         }
         public void SimOrder<T>(T simOrder)
         {
              
+        }
+        private void JakaWait(int value)
+        {
+            while (!((GetStatus<int>("Get_JakaRobotAO1") == value) && GetStatus<int>("Get_JakaRobotProgramStatus") == 0))//判断文件是否已经执行结束 且 文件末端变量值==文件名
+            {
+                int a = GetStatus<int>("Get_JakaRobotAO1");
+                int b = GetStatus<int>("Get_JakaRobotProgramStatus");
+                Thread.Sleep(5);
+            }
         }
         #region PLC 控制函数
 
@@ -924,49 +680,49 @@ namespace BPASmartClient.MorkT_BarCounter
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.RobotIsConnected = b;
+                    morkT.RobotIsConnected = b;
                 }
             }));
             GetStatus("RobotMode", new Action<object>((o) =>
             {
                 if (o is ELebaiRModel eLebaiRModel)
                 {
-                    morkTLebaiJC.RobotMode = eLebaiRModel;
+                    morkT.RobotMode = eLebaiRModel;
                 }
             }));
             GetStatus("LeibaiGetTcpInput", new Action<object>((o) =>
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.RobotGetTcpInput = b;
+                    morkT.RobotGetTcpInput = b;
                 }
             }));
             GetStatus("LeibaiGetInput1", new Action<object>((o) =>
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.RobotGetInput0 = b;
+                    morkT.RobotGetInput0 = b;
                 }
             }));
             GetStatus("LeibaiGetInput2", new Action<object>((o) =>
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.RobotGetInput1 = b;
+                    morkT.RobotGetInput1 = b;
                 }
             }));
             GetStatus("LeibaiGetInput3", new Action<object>((o) =>
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.RobotGetInput2 = b;
+                    morkT.RobotGetInput2 = b;
                 }
             }));
             GetStatus("LeibaiGetInput4", new Action<object>((o) =>
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.RobotGetInput3 = b;
+                    morkT.RobotGetInput3 = b;
                 }
             }));
 
@@ -976,14 +732,14 @@ namespace BPASmartClient.MorkT_BarCounter
             {
                 if (o is bool bt)
                 {
-                    morkTLebaiJC.IceMakerConnect = bt;
+                    morkT.IceMakerConnect = bt;
                 }
             }));
             GetStatus("MakeIceDeviceStatus", new Action<object>((o) =>
             {
                 if (o is byte bt)
                 {
-                    morkTLebaiJC.IceMakerState = bt;
+                    morkT.IceMakerState = bt;
                 }
             }));
             #endregion
@@ -992,7 +748,7 @@ namespace BPASmartClient.MorkT_BarCounter
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.CoffeeIsConnected = b;
+                    morkT.CoffeeIsConnected = b;
                 }
             }));
 
@@ -1000,7 +756,7 @@ namespace BPASmartClient.MorkT_BarCounter
             {
                 if (o is DrCoffeeStatus coffeeStatus)
                 {
-                    morkTLebaiJC.DrCoffeeStatus = coffeeStatus;
+                    morkT.DrCoffeeStatus = coffeeStatus;
                 }
             }));
 
@@ -1008,7 +764,7 @@ namespace BPASmartClient.MorkT_BarCounter
             {
                 if (o is DrCoffeeAppStatus appStatus)
                 {
-                    morkTLebaiJC.CoffeeAppStatus = appStatus;
+                    morkT.CoffeeAppStatus = appStatus;
                 }
             }));
 
@@ -1016,14 +772,14 @@ namespace BPASmartClient.MorkT_BarCounter
             {
                 if (o is DrCoffeeWarning coffeeWarning)
                 {
-                    morkTLebaiJC.CoffeeWarning = coffeeWarning;
+                    morkT.CoffeeWarning = coffeeWarning;
                 }
             }));
             GetStatus("CoffeeFault", new Action<object>((o) =>
             {
                 if (o is DrCoffeeFault coffeeFault)
                 {
-                    morkTLebaiJC.CaffeeFault = coffeeFault;
+                    morkT.CaffeeFault = coffeeFault;
                 }
             }));
             #endregion
@@ -1040,63 +796,63 @@ namespace BPASmartClient.MorkT_BarCounter
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.SCChipIsConnect = b;
+                    morkT.SCChipIsConnect = b;
                 }
             }));
             GetStatus("SCChipGetInput0", new Action<object>((o) =>
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.SCChipInput0 = b;
+                    morkT.SCChipInput0 = b;
                 }
             }));
             GetStatus("SCChipGetInput1", new Action<object>((o) =>
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.SCChipInput1 = b;
+                    morkT.SCChipInput1 = b;
                 }
             }));
             GetStatus("SCChipGetInput2", new Action<object>((o) =>
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.SCChipInput2 = b;
+                    morkT.SCChipInput2 = b;
                 }
             }));
             GetStatus("SCChipGetInput3", new Action<object>((o) =>
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.SCChipInput3 = b;
+                    morkT.SCChipInput3 = b;
                 }
             }));
             GetStatus("SCChipGetInput4", new Action<object>((o) =>
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.SCChipInput4 = b;
+                    morkT.SCChipInput4 = b;
                 }
             }));
             GetStatus("SCChipGetInput5", new Action<object>((o) =>
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.SCChipInput5 = b;
+                    morkT.SCChipInput5 = b;
                 }
             }));
             GetStatus("SCChipGetInput6", new Action<object>((o) =>
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.SCChipInput6 = b;
+                    morkT.SCChipInput6 = b;
                 }
             }));
             GetStatus("SCChipGetInput7", new Action<object>((o) =>
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.SCChipInput7 = b;
+                    morkT.SCChipInput7 = b;
                 }
             }));
 
@@ -1106,14 +862,14 @@ namespace BPASmartClient.MorkT_BarCounter
             {
                 if (o is bool b)
                 {
-                    morkTLebaiJC.JuicerConnected = b;
+                    morkT.JuicerConnected = b;
                 }
             }));
             GetStatus("GetJuicerDeviceStatus", new Action<object>((o) =>
             {
                 if (o is int[] b)
                 {
-                    morkTLebaiJC.JuicerState = b;
+                    morkT.JuicerState = b;
                 }
             }));
             #endregion
@@ -1139,19 +895,19 @@ namespace BPASmartClient.MorkT_BarCounter
                     DeviceProcessLogShow("----开始模拟订单----");
                     if (msm.OrderNum == 1)
                     {
-                        morkTLebaiJC.morkOrderPushesCoffee.Enqueue(new OrderLocInfo() { Loc =(ushort)msm.DrinkCode, SuborderId = guid, GoodName="模拟咖啡订单" });
+                        morkT.morkOrderPushesCoffee.Enqueue(new OrderLocInfo() { Loc =(ushort)msm.DrinkCode, SuborderId = guid, GoodName="模拟咖啡订单" });
                     }
                     else if (msm.OrderNum == 2)
                     {
-                        morkTLebaiJC.morkOrderPushesJuicer.Enqueue(new OrderLocInfo() { Loc = (ushort) (msm.JuiceList + 51), makeID = msm.JuiceMakeID, SuborderId = guid, GoodName = "模拟果汁订单" });
+                        morkT.morkOrderPushesJuicer.Enqueue(new OrderLocInfo() { Loc = (ushort) (msm.JuiceList + 51), makeID = msm.JuiceMakeID, SuborderId = guid, GoodName = "模拟果汁订单" });
                     }
                     else if (msm.OrderNum == 3)
                     {
-                        morkTLebaiJC.morkOrderPushesTea.Enqueue(new OrderLocInfo() { SuborderId = guid, GoodName = "模拟茶水订单" });
+                        morkT.morkOrderPushesMilkTea.Enqueue(new OrderLocInfo() { SuborderId = guid, GoodName = "模拟茶水订单" });
                     }
                     else if (msm.OrderNum == 4)
                     {
-                        morkTLebaiJC.morkOrderPushesWater.Enqueue(new OrderLocInfo() { SuborderId = guid, GoodName = "模拟开水订单" });
+                        morkT.morkOrderPushesWater.Enqueue(new OrderLocInfo() { SuborderId = guid, GoodName = "模拟开水订单" });
                     }
                 }
             });
diff --git a/BPASmartClient.MorkT_BarCounter/GVL_MorkT.cs b/BPASmartClient.MorkT_BarCounter/GVL_MorkT.cs
index f531c404..af1ebad6 100644
--- a/BPASmartClient.MorkT_BarCounter/GVL_MorkT.cs
+++ b/BPASmartClient.MorkT_BarCounter/GVL_MorkT.cs
@@ -71,6 +71,13 @@ namespace BPASmartClient.MorkT_BarCounter
         public const int JUICE_放杯 = 20120;
         public const int JUICE_放杯检测 = 20120;
         #endregion
+
+
+        /// <summary>
+        /// <summary>
+        /// 咖啡订单队列
+        /// </summary>
+        public ConcurrentQueue<OrderLocInfo> morkOrderPushesAll = new ConcurrentQueue<OrderLocInfo>();
         /// <summary>
         /// <summary>
         /// 咖啡订单队列
@@ -99,18 +106,25 @@ namespace BPASmartClient.MorkT_BarCounter
         public bool MakeJuiceEnd = false;
 
         /// <summary>
-        /// 做茶订单队列
+        /// 出果汁完成，是否去取果汁
         /// </summary>
-        public ConcurrentQueue<OrderLocInfo> morkOrderPushesTea = new ConcurrentQueue<OrderLocInfo>();
+        public static ushort[] MilkTeaCHValue = new ushort[12] {200,200,200,200,200,200,200,200,200,200,200,200 };
         /// <summary>
-        /// 接水口是否有茶水杯
+        /// 做茶订单队列
         /// </summary>
-        public bool IsHaveTeaWaterCup = false;
+        public ConcurrentQueue<OrderLocInfo> morkOrderPushesMilkTea = new ConcurrentQueue<OrderLocInfo>();
         /// <summary>
-        /// 水已经接完，是否去取水杯
+        /// 接奶茶口是否有奶茶杯
         /// </summary>
-        public bool MakeTeaEnd = false;
+        public bool IsHaveTeaMilkTeaCup = false;
 
+        /// <summary>
+        /// 奶茶做完成
+        /// </summary>
+        public bool MakeMilkTeaEnd = false;
+        public static bool DI0 = false;
+        public static bool DI1 = false;
+        public static bool DI2 = false;
         /// <summary>
         /// 做开水订单队列
         /// </summary>
diff --git a/BPASmartClient.MorkT_BarCounter/PolymerBatching.cs b/BPASmartClient.MorkT_BarCounter/PolymerBatching.cs
index bf1d9f48..8c918a32 100644
--- a/BPASmartClient.MorkT_BarCounter/PolymerBatching.cs
+++ b/BPASmartClient.MorkT_BarCounter/PolymerBatching.cs
@@ -19,15 +19,15 @@ namespace BPASmartClient.MorkT_BarCounter
         /// <summary>
         /// 果汁
         /// </summary>
-        JUICE,
+        //JUICE,
         /// <summary>
         /// 茶水
         /// </summary>
-        TEA,
+        MilkTea,
         /// <summary>
         /// 水
         /// </summary>
-        WATER,
+        //WATER,
         /// <summary>
         /// 杯子
         /// </summary>
@@ -42,10 +42,10 @@ namespace BPASmartClient.MorkT_BarCounter
 
     internal class PolymerBatching
     {
-        internal const string Juicer_MAIN_BATCHIN1_LOC = "52";
-        internal const string Juicer_MAIN_BATCHIN2_LOC = "53";
-        internal const string Juicer_MAIN_BATCHIN3_LOC = "54";
-        internal const string Juicer_MAIN_BATCHIN4_LOC = "55";
+        //internal const string Juicer_MAIN_BATCHIN1_LOC = "52";
+        //internal const string Juicer_MAIN_BATCHIN2_LOC = "53";
+        //internal const string Juicer_MAIN_BATCHIN3_LOC = "54";
+        //internal const string Juicer_MAIN_BATCHIN4_LOC = "55";
         //internal const string Juicer_MAIN_BATCHIN5_LOC = "56";
         //internal const string Juicer_MAIN_BATCHIN6_LOC = "57";
         //internal const string Juicer_MAIN_BATCHIN7_LOC = "58";
@@ -80,12 +80,11 @@ namespace BPASmartClient.MorkT_BarCounter
             {"24",GOODS_TYPE.COFFEE},
             {"25",GOODS_TYPE.COFFEE},
             { COFFEE_HOLDER_LOC,GOODS_TYPE.CUP},
-            {"56",GOODS_TYPE.TEA },
-            {"61",GOODS_TYPE.WATER },
-            {Juicer_MAIN_BATCHIN1_LOC,GOODS_TYPE.JUICE},
-            {Juicer_MAIN_BATCHIN2_LOC,GOODS_TYPE.JUICE},
-            {Juicer_MAIN_BATCHIN3_LOC,GOODS_TYPE.JUICE},
-            {Juicer_MAIN_BATCHIN4_LOC,GOODS_TYPE.JUICE},
+            {"60",GOODS_TYPE.MilkTea },
+            //{Juicer_MAIN_BATCHIN1_LOC,GOODS_TYPE.JUICE},
+            //{Juicer_MAIN_BATCHIN2_LOC,GOODS_TYPE.JUICE},
+            //{Juicer_MAIN_BATCHIN3_LOC,GOODS_TYPE.JUICE},
+            //{Juicer_MAIN_BATCHIN4_LOC,GOODS_TYPE.JUICE},
             //{Juicer_MAIN_BATCHIN5_LOC,GOODS_TYPE.JUICE},
             //{Juicer_MAIN_BATCHIN6_LOC,GOODS_TYPE.JUICE},
             //{Juicer_MAIN_BATCHIN7_LOC,GOODS_TYPE.JUICE},
diff --git a/BPASmartClient.MorkT_BarCounter/View/DebugView.xaml b/BPASmartClient.MorkT_BarCounter/View/DebugView.xaml
index 673ac70c..618a5389 100644
--- a/BPASmartClient.MorkT_BarCounter/View/DebugView.xaml
+++ b/BPASmartClient.MorkT_BarCounter/View/DebugView.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:vm="clr-namespace:BPASmartClient.MorkT_BarCounter.ViewModel"
              mc:Ignorable="d" 
-             Name="调试界面"
+             Name="测试界面"
              d:DesignHeight="500" d:DesignWidth="1000" Unloaded="Dubug_Unloaded">
     <UserControl.DataContext>
         <vm:DebugViewModel/>
@@ -18,422 +18,100 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <Grid Grid.ColumnSpan="2">
+    <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="10*"/>
-            <ColumnDefinition Width="10*"/>
+            <ColumnDefinition></ColumnDefinition>
+            <ColumnDefinition></ColumnDefinition>
+            <ColumnDefinition></ColumnDefinition>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="10*"/>
-            <RowDefinition Height="10*"/>
-            <RowDefinition Height="15*"/>
+            <RowDefinition></RowDefinition>
+            <RowDefinition></RowDefinition>
         </Grid.RowDefinitions>
-        <Border BorderThickness="0,0,1,1" BorderBrush="DodgerBlue" Grid.Row="0" Grid.Column="0"></Border>
-        <Border BorderThickness="0,0,1,1" BorderBrush="DodgerBlue" Grid.Row="1" Grid.Column="0"></Border>
-        <Border BorderThickness="0,0,1,0" BorderBrush="DodgerBlue" Grid.Row="2" Grid.Column="0"></Border>
-        <Border BorderThickness="0,0,0,1" BorderBrush="DodgerBlue" Grid.Row="0" Grid.Column="1"></Border>
-        <Border BorderThickness="0,0,0,1" BorderBrush="DodgerBlue" Grid.Row="1" Grid.Column="1"></Border>
-        <Border BorderThickness="0,0,0,0" BorderBrush="DodgerBlue" Grid.Row="2" Grid.Column="1"></Border>
-        <GroupBox Grid.Row="0" Grid.Column="0"
-            FontFamily="楷体"
-            FontSize="20"
-            Header=" 乐白机器人 ">
-            
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                </Grid.RowDefinitions>
-                <Grid Grid.Row="0">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="连接状态:" />
-                        <TextBlock Text="{Binding RobotConnected}"
-                           Margin="40,0"/>
-                    </StackPanel>
-                </Grid>
-                <Grid Grid.Row="1">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="当前模式：" Margin="0,1"/>
-                        <TextBlock Text="{Binding RobotMode}"
-                               Margin="40,0"/>
-                    </StackPanel>
-                </Grid>
-                <Grid  Grid.Row="2">
-                    <DockPanel>
-                        <Button Content="启动"  Width="50" Height="40"
-                                Command="{Binding Button_RobotControlCommand}"
-                                CommandParameter="机器人启动">
-                        </Button>
-                        <Button Content="暂停" Width="50" Height="40"
-                                Command="{Binding Button_RobotControlCommand}"
-                                CommandParameter="暂停"/>
-                        <Button Content="恢复" Width="50" Height="40"
-                                Command="{Binding Button_RobotControlCommand}"
-                                CommandParameter="恢复"/>
-                        <Button Content="急停" Width="50" Height="40"
-                                Command="{Binding Button_RobotControlCommand}"
-                                CommandParameter="机器人急停"/>
-                    </DockPanel>
-                </Grid>
-                <Grid Grid.Row="0" Grid.Column="1" >
-                    <StackPanel Orientation="Horizontal" >
-                        <TextBlock>TCP DI:</TextBlock>
-                        <CheckBox IsEnabled="false" IsChecked="{Binding Robot_TCPDI0}" FontSize="14">DI0</CheckBox>
-                    </StackPanel>
-                </Grid>
-                <Grid Grid.Row="1" Grid.Column="1" >
-                    <StackPanel Orientation="Horizontal" >
-                        <TextBlock>DI:</TextBlock>
-                        <CheckBox IsEnabled="false" Name="Robot_DI0" FontSize="14" IsChecked="{Binding Robot_DI0}">DI0</CheckBox>
-                        <CheckBox IsEnabled="false" Name="Robot_DI1" FontSize="14" IsChecked="{Binding Robot_DI1}">DI1</CheckBox>
-                        <CheckBox IsEnabled="false" Name="Robot_DI2" FontSize="14" IsChecked="{Binding Robot_DI2}">DI2</CheckBox>
-                        <CheckBox IsEnabled="false" Name="Robot_DI3" FontSize="14" IsChecked="{Binding Robot_DI3}">DI3</CheckBox>
-                    </StackPanel>
-                </Grid>
-                <Grid Grid.Row="2" Grid.Column="1">
-                    <StackPanel Orientation="Horizontal" >
-                        <TextBlock>DO:</TextBlock>
-                        <ComboBox SelectedIndex="{Binding Robot_DOutput_Pin}">
-                            <ComboBoxItem IsSelected="true">DO0</ComboBoxItem>
-                            <ComboBoxItem>DO1</ComboBoxItem>
-                            <ComboBoxItem>DO2</ComboBoxItem>
-                            <ComboBoxItem>DO3</ComboBoxItem>
-                        </ComboBox>
-                        <ComboBox  SelectedIndex="{Binding Robot_DOutput_Value}">
-                            <ComboBoxItem IsSelected="true">true</ComboBoxItem>
-                            <ComboBoxItem>false</ComboBoxItem>
-                        </ComboBox>
-                        <Button Content="输出" Command="{Binding Robot_DOutput}"/>
-                    </StackPanel>
-                    
-                </Grid>
-            </Grid>
-        </GroupBox>
-        <GroupBox Grid.Row="1" Grid.Column="0"
-                Header="单片机控制"
-                FontSize="18"
-                FontFamily="楷体">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
-                </Grid.ColumnDefinitions>
-                <Grid Grid.Row="0">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock >连接状态:</TextBlock>
-                        <TextBlock Text="{Binding MCUConnected}" />
-                    </StackPanel>
-                </Grid>
-                <Grid Grid.Row="1">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock  FontSize="12">DI:</TextBlock>
-                        <CheckBox FontSize="12" IsEnabled="false" IsChecked="{Binding CH0}">DI0</CheckBox>
-                        <CheckBox FontSize="12" IsEnabled="false" Name="CH1">DI1</CheckBox>
-                        <CheckBox FontSize="12" IsEnabled="false" Name="CH2">DI2</CheckBox>
-                        <CheckBox FontSize="12" IsEnabled="false" Name="CH3">DI3</CheckBox>
-                        <CheckBox FontSize="12" IsEnabled="false" Name="CH4">DI4</CheckBox>
-                        <CheckBox FontSize="12" IsEnabled="false" Name="CH5">DI5</CheckBox>
-                        <CheckBox FontSize="12" IsEnabled="false" Name="CH6">DI6</CheckBox>
-                        <CheckBox FontSize="12" IsEnabled="false" Name="CH7">DI7</CheckBox>
-                    </StackPanel>
-                </Grid>
-                <Grid Grid.Row="2" Grid.Column="0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
-                    </Grid.ColumnDefinitions>
-                    <Grid Grid.Column="0">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock FontSize="12" HorizontalAlignment="Center">DO输出</TextBlock>
-                            <ComboBox Width="50" FontSize="12" HorizontalAlignment="Center" SelectedIndex="{Binding MCU_DO_CH}">
-                                <ComboBoxItem IsSelected="true">DO0</ComboBoxItem>
-                                <ComboBoxItem>DO1</ComboBoxItem>
-                                <ComboBoxItem>DO2</ComboBoxItem>
-                                <ComboBoxItem>DO3</ComboBoxItem>
-                                <ComboBoxItem>DO4</ComboBoxItem>
-                                <ComboBoxItem>DO5</ComboBoxItem>
-                                <ComboBoxItem>DO6</ComboBoxItem>
-                                <ComboBoxItem>DO7</ComboBoxItem>
-                            </ComboBox>
-                            <ComboBox FontSize="12" HorizontalAlignment="Center" SelectedIndex="{Binding MCU_DO_CH}">
-                                <ComboBoxItem IsSelected="true">True</ComboBoxItem>
-                                <ComboBoxItem>False</ComboBoxItem>
-                            </ComboBox>
-                            <Button Width="50" Command="{Binding Button_MCUDOuputCommand}">输出</Button>
-                        </StackPanel>
-                    </Grid>
-                    <Grid Grid.Column="1">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock  FontSize="12"  HorizontalAlignment="Center">舵机控制</TextBlock>
-                            <ComboBox Margin="0,0,0,0" FontSize="12" Width="60" SelectedIndex="{Binding MCU_PWM_CH}">
-                                <ComboBoxItem IsSelected="true">舵机1</ComboBoxItem>
-                                <ComboBoxItem>舵机2</ComboBoxItem>
-                                <ComboBoxItem>舵机3</ComboBoxItem>
-                                <ComboBoxItem>舵机4</ComboBoxItem>
-                            </ComboBox>
-                            <TextBox Width="50" Text="{Binding PWMInputNumber}"></TextBox>
-                            <Button FontSize="15"  HorizontalAlignment="Center"  Command="{Binding Button_MCUOuputCommand}">输出</Button>
-                        </StackPanel>
-                    </Grid>
-                </Grid>
-            </Grid>
-        </GroupBox>
-        <GroupBox Grid.Row="2" Grid.Column="0"
-            FontFamily="楷体"
-            FontSize="20"
-            Header=" 果汁机 ">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="5*"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="3*"/>
-                    <RowDefinition Height="3*"/>
-                    <RowDefinition Height="3*"/>
-                </Grid.RowDefinitions>
-                <Grid>
-                    <TextBlock Text="连接状态:" />
-                </Grid>
-                <Grid Grid.Column="1">
-                    <TextBlock Text="{Binding JuicerConnected}"
-                           Margin="120,0,0,0"/>
-                </Grid>
-                <Grid Grid.Row="1">
-                    <TextBlock Text="设备状态：" />
-                </Grid>
-                <Grid Grid.Column="1" Grid.Row="1">
-                    <StackPanel  Orientation="Horizontal" >
-                        <Button IsEnabled="False" Command="{Binding JuiceState_Heating}" >制热</Button>
-                        <Button IsEnabled="False" Command="{Binding JuiceState_Cooling}" >制冷</Button>
-                        <Button IsEnabled="False" Command="{Binding JuiceState_LackOfWater}" >缺水</Button>
-                        <Button IsEnabled="False" Command="{Binding JuiceState_ChildLocks}" >童锁</Button>
-                        <Button IsEnabled="False" Command="{Binding JuiceState_Using}"  >使用</Button>
-                    </StackPanel>
-                </Grid>
-                <Grid Grid.Row="2">
-                    <TextBlock>果汁:</TextBlock>
-                </Grid>
-                <Grid Grid.Column="1" Grid.Row="2">
-                    <StackPanel Orientation="Horizontal">
-                        <ComboBox SelectedItem="{Binding MakeJuice_Index}">
-                            <ComboBoxItem IsSelected="true">0</ComboBoxItem>
-                            <ComboBoxItem>1</ComboBoxItem>
-                            <ComboBoxItem>2</ComboBoxItem>
-                            <ComboBoxItem>3</ComboBoxItem>
-                            <ComboBoxItem>4</ComboBoxItem>
-                            <ComboBoxItem>5</ComboBoxItem>
-                            <ComboBoxItem>6</ComboBoxItem>
-                            <ComboBoxItem>7</ComboBoxItem>
-                        </ComboBox>
-                        <Button Command="{Binding Button_MakeJuiceCommand}" Content="制作" />
-                    </StackPanel>
-                </Grid>
-            </Grid>
-        </GroupBox>
-        <GroupBox Grid.Row="0" Grid.Column="1"
-                  Header="订单模拟"
-                  FontSize="18"
-                  FontFamily="楷体">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                </Grid.RowDefinitions>
-                <Grid Grid.Row="0" Grid.Column="0">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock>咖啡:</TextBlock>
-                        <ComboBox Margin="10,0"
-                                Width="100"
-                                ItemsSource="{Binding Coffees}"
-                                SelectedItem="{Binding SimOrderCoffeeList}" />
-                        <Button Command="{Binding SimOrderMakeCoffee}">制作</Button>
-                    </StackPanel>
-                </Grid>
-                <Grid Grid.Row="1" Grid.Column="0">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock>果汁:</TextBlock>
-                        <ComboBox SelectedIndex="{Binding SimOrder_JuiceList}">
-                            <ComboBoxItem IsSelected="true" >饮品1</ComboBoxItem>
-                            <ComboBoxItem>饮品2</ComboBoxItem>
-                            <ComboBoxItem>饮品3</ComboBoxItem>
-                            <ComboBoxItem>饮品4</ComboBoxItem>
-                        </ComboBox>
-                        <ComboBox SelectedItem="{Binding SimOrder_JuiceMakeID}">
-                            <ComboBoxItem IsSelected="true">热饮</ComboBoxItem>
-                            <ComboBoxItem>常温</ComboBoxItem>
-                            <ComboBoxItem>冷饮</ComboBoxItem>
-                        </ComboBox>
-                        <Button Command="{Binding SimOrderMakeJuice}">制作</Button>
-                    </StackPanel>
-                </Grid>
-                <Grid Grid.Row="0" Grid.Column="1">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock>开水:</TextBlock>
-                        <Button Command="{Binding SimOrderMakeWater}">制作</Button>
-                    </StackPanel>
-                </Grid>
-                <Grid Grid.Row="1" Grid.Column="1">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock>茶水:</TextBlock>
-                        <Button Command="{Binding SimOrderMakeTea}">制作</Button>
-                    </StackPanel>
-                </Grid>
-            </Grid>
-        </GroupBox>
-        <GroupBox Grid.Row="1" Grid.Column="1"
-                  Header="制冰机控制"
-                  FontSize="18"
-                  FontFamily="楷体">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                </Grid.RowDefinitions>
-                <Grid Grid.Row="0">
-                    <StackPanel Orientation="Horizontal" >
-                        <TextBlock>连接状态：</TextBlock>
-                        <TextBlock Text="{Binding IceMakerConnected}" />
-                    </StackPanel>
-                </Grid>
-                <Grid Grid.Row="0" Grid.Column="1">
-                    <StackPanel Orientation="Horizontal">
-                        <Button Command="{Binding IceMaker_BtnPowerOn}">开机</Button>
-                        <Button Command="{Binding IceMaker_BtnStandby}">待机</Button>
-                        <Button Command="{Binding IceMaker_BtnPump}"   >抽水</Button>
-                    </StackPanel>
-                </Grid>
-                <Grid Grid.Row="1" Grid.ColumnSpan="2">
-                    <StackPanel Orientation="Horizontal" >
-                        <TextBlock>设备状态：</TextBlock>
-                        <TextBlock Text="{Binding IceMakerState}" />
-                        <Button IsEnabled="False" Name="IceMaker_State1" >开机状态</Button>
-                        <Button IsEnabled="False" Name="IceMaker_State2" >待机状态</Button>
-                        <Button IsEnabled="False" Name="IceMaker_State3" >电机故障</Button>
-                        <Button IsEnabled="False" Name="IceMaker_State4" >冰满</Button>
-                    </StackPanel>
-                </Grid>
-                <Grid Grid.Row="2" Grid.Column="0">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock>控制：</TextBlock>
-                        <Button Command="{Binding IceMaker_BtnStart}">开始出冰</Button>
-                        <Button Command="{Binding IceMaker_BtnEnd}">结束出冰</Button>
-                    </StackPanel>
-                </Grid>
-                <Grid Grid.Row="2" Grid.Column="01">
-                    <StackPanel Orientation="Horizontal" >
-                        <TextBlock>出冰时间：</TextBlock>
-                        <TextBox Width="50" Text="{Binding IceMaker_IceTime}"></TextBox>
-                        <TextBlock>s</TextBlock>
-                        <Button Command="{Binding IceMaker_BtnSetIceTime}">设置</Button>
-                    </StackPanel>
-                </Grid>
-            </Grid>
-        </GroupBox>
-        <GroupBox Grid.Row="2" Grid.Column="1"
-            FontFamily="楷体"
-            FontSize="20"
-            Header=" 咖啡机">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition />
-                    <RowDefinition />
-                    <RowDefinition />
-                    <RowDefinition />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                </Grid.ColumnDefinitions>
-                <Grid Grid.Row="0">
-                    <TextBlock Text="连接状态" />
-                </Grid>
-                <Grid Grid.Row="0" Grid.Column="1">
-                    <TextBlock Text="{Binding CoffeeConnected}"/>
-                </Grid>
-                <Grid Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="2">
-                    <Grid.Resources>
-                        <Style TargetType="TextBlock">
-                            <Setter Property="HorizontalAlignment" Value="Left" />
-                            <Setter Property="VerticalAlignment" Value="Center" />
-                        </Style>
-                    </Grid.Resources>
-                    <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="2*" />
-                        <ColumnDefinition Width="3*" />
-                        <ColumnDefinition Width="2*" />
-                        <ColumnDefinition Width="3*" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock Height="23" Width="100" FontSize="18" HorizontalAlignment="Center">咖啡机状态</TextBlock>
-                    <TextBlock FontSize="18" 
-                            Grid.Column="1"
-                            Text="{Binding CoffeeStatus}" Height="23" />
-                    <TextBlock Grid.Column="2" Height="23" Width="80" FontSize="18">应用状态</TextBlock>
-                    <TextBlock FontSize="18"
-                            Grid.Column="3" 
-                            Text="{Binding AppStatus}" Height="23"/>
-                    <TextBlock Grid.Row="1" Grid.Column="0" Height="22" Width="80" FontSize="18">告警信息</TextBlock>
-                    <TextBlock FontSize="15"
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            Text="{Binding Warning}"  />
-                    <TextBlock Grid.Row="1" Grid.Column="2" Height="22" Width="80" FontSize="18">故障信息</TextBlock>
-                    <TextBlock FontSize="18"
-                            Grid.Row="1"
-                            Grid.Column="3"
-                            Text="{Binding CaffeeFault}" Height="22" Width="60" />
-                </Grid>
-                <Grid Grid.Row="3" Grid.ColumnSpan="2">
-                    <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
-                        <TextBlock>饮品</TextBlock>
-                        <ComboBox Margin="10,0"
-                                Width="100"
-                                ItemsSource="{Binding Coffees}"
-                                SelectedItem="{Binding SelectedCoffee}" />
-                        <Button Margin="10,0"
-                            Command="{Binding Button_MakeCoffeeCommand }"
-                                Content="制作"/>
-                        <Button Margin="10,0"
-                            Command="{Binding Button_StopMakeCoffeCommand}"
-                                Content="停止制作"/>
-                    </StackPanel>
-                </Grid>
-                <Grid Grid.Row="4"  Grid.ColumnSpan="2">
-                    <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
-                        <TextBlock>模式</TextBlock>
-                        <ComboBox Margin="10,0"
-                                Width="100"
-                                ItemsSource="{Binding CoffeeCmds}"
-                                SelectedItem="{Binding SelectedCoffeeCmd}"/>
-                        <Button Margin="10,0"
-                                Command="{Binding Button_CoffeeModeSetCommand}"
-                                Content="设置" Cursor="Hand"/>
-                    </StackPanel>
-                </Grid>
-            </Grid>
-        </GroupBox>
+        <WrapPanel>
+            <TextBlock Grid.Column="0" Height="22" Width="100" FontSize="14">机器人执行程序:</TextBlock>
+            <TextBox Margin="10" Width="80" Text="{Binding JakaRobotProgram}"></TextBox>
+            <Button Margin="10"  Content="启动" Width="50" Command="{Binding RobotControlCommand}"></Button>
+        </WrapPanel>
+        <WrapPanel Grid.Column="1">
+            <TextBlock Grid.Column="0" Height="22" Width="100" FontSize="14">咖啡机执行程序:</TextBlock>
+            <TextBox Margin="10" Width="80" Text="{Binding CoffeeKind}"></TextBox>
+            <Button Margin="10"  Content="启动" Width="50" Command="{Binding CoffeeControlCommand}"></Button>
+        </WrapPanel>
+        <Grid Grid.Column="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition></ColumnDefinition>
+                <ColumnDefinition></ColumnDefinition>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition></RowDefinition>
+                <RowDefinition></RowDefinition>
+                <RowDefinition></RowDefinition>
+                <RowDefinition></RowDefinition>
+                <RowDefinition></RowDefinition>
+                <RowDefinition></RowDefinition>
+                <RowDefinition></RowDefinition>
+            </Grid.RowDefinitions>
+            <WrapPanel Grid.Row="0" Grid.Column="0" >
+                <TextBlock Width="80" FontSize="14">通道1的值:</TextBlock>
+                <TextBox Margin="2" Width="50" Text="{Binding CH_Value[0]}"></TextBox>
+            </WrapPanel>
+            <WrapPanel Grid.Row="0" Grid.Column="1" >
+                <TextBlock Width="80" FontSize="14">通道2的值:</TextBlock>
+                <TextBox Margin="2" Width="50" Text="{Binding CH_Value[1]}"></TextBox>
+            </WrapPanel>
+            <WrapPanel Grid.Row="1" Grid.Column="0" >
+                <TextBlock Width="80" FontSize="14">通道3的值:</TextBlock>
+                <TextBox Margin="2" Width="50" Text="{Binding CH_Value[2]}"></TextBox>
+            </WrapPanel>
+            <WrapPanel Grid.Row="1" Grid.Column="1" >
+                <TextBlock Width="80" FontSize="14">通道4的值:</TextBlock>
+                <TextBox Margin="2" Width="50" Text="{Binding CH_Value[3]}"></TextBox>
+            </WrapPanel>
+            <WrapPanel Grid.Row="2" Grid.Column="0" >
+                <TextBlock Width="80" FontSize="14">通道5的值:</TextBlock>
+                <TextBox Margin="2" Width="50" Text="{Binding CH_Value[4]}"></TextBox>
+            </WrapPanel>
+            <WrapPanel Grid.Row="2" Grid.Column="1" >
+                <TextBlock Width="80"  FontSize="14">通道6的值:</TextBlock>
+                <TextBox Margin="2" Width="50" Text="{Binding CH_Value[5]}"></TextBox>
+            </WrapPanel>
+            <WrapPanel Grid.Row="3" Grid.Column="0" >
+                <TextBlock Width="80" FontSize="14">通道7的值:</TextBlock>
+                <TextBox Margin="2" Width="50" Text="{Binding CH_Value[6]}"></TextBox>
+            </WrapPanel>
+            <WrapPanel  Grid.Row="3" Grid.Column="1" >
+                <TextBlock Width="80" FontSize="14">通道8的值:</TextBlock>
+                <TextBox Margin="2" Width="50" Text="{Binding CH_Value[7]}"></TextBox>
+            </WrapPanel>
+            <WrapPanel Grid.Row="4" Grid.Column="0" >
+                <TextBlock Width="80" FontSize="14">通道9的值:</TextBlock>
+                <TextBox Margin="2" Width="50" Text="{Binding CH_Value[8]}"></TextBox>
+            </WrapPanel>
+            <WrapPanel  Grid.Row="4" Grid.Column="1" >
+                <TextBlock Width="80" FontSize="14">通道10的值:</TextBlock>
+                <TextBox Margin="2" Width="50" Text="{Binding CH_Value[9]}"></TextBox>
+            </WrapPanel>
+            <WrapPanel Grid.Row="5" Grid.Column="0" >
+                <TextBlock Width="80"  FontSize="14">通道11的值:</TextBlock>
+                <TextBox Margin="2" Width="50" Text="{Binding CH_Value[10]}"></TextBox>
+            </WrapPanel>
+            <WrapPanel Grid.Row="5" Grid.Column="1" >
+                <TextBlock Width="80" FontSize="14">通道12的值:</TextBlock>
+                <TextBox Margin="2" Width="50" Text="{Binding CH_Value[11]}"></TextBox>
+            </WrapPanel>
+            <WrapPanel Grid.Row="6" Grid.ColumnSpan="2" >
+                <TextBlock Height="22" Width="100" FontSize="14">味魔方执行程序:</TextBlock>
+                <TextBox Margin="2" Width="80" Text="{Binding MilkTeaCub}"></TextBox>
+                <Button Margin="2"  Content="启动" Width="50" Command="{Binding MikeTeaCupControlCommand}"></Button>
+                <Button Margin="2"  Content="设置参数" Width="60" Command="{Binding MikeTeaCupSetParCommand}"></Button>
+            </WrapPanel>
+        </Grid>
+
+        <WrapPanel Grid.Row="1">
+            <TextBlock Grid.Column="0" Height="22" Width="100" FontSize="14">电爪执行程序:</TextBlock>
+            <TextBox Margin="10" Width="80" Text="{Binding GripperProgam}"></TextBox>
+            <Button Margin="10"  Content="启动" Width="50" Command="{Binding GripperControlCommand}"></Button>
+        </WrapPanel>
     </Grid>
 </UserControl>
diff --git a/BPASmartClient.MorkT_BarCounter/View/TestView.xaml b/BPASmartClient.MorkT_BarCounter/View/TestView.xaml
new file mode 100644
index 00000000..2d68b53a
--- /dev/null
+++ b/BPASmartClient.MorkT_BarCounter/View/TestView.xaml
@@ -0,0 +1,439 @@
+<UserControl x:Class="BPASmartClient.MorkT_BarCounter.View.TestView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:vm="clr-namespace:BPASmartClient.MorkT_BarCounter.ViewModel"
+             mc:Ignorable="d" 
+             Name="测试界面"
+             d:DesignHeight="500" d:DesignWidth="1000" Unloaded="Dubug_Unloaded">
+    <UserControl.DataContext>
+        <vm:TestViewModel/>
+    </UserControl.DataContext>
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid Grid.ColumnSpan="2">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="10*"/>
+            <ColumnDefinition Width="10*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="10*"/>
+            <RowDefinition Height="10*"/>
+            <RowDefinition Height="15*"/>
+        </Grid.RowDefinitions>
+        <Border BorderThickness="0,0,1,1" BorderBrush="DodgerBlue" Grid.Row="0" Grid.Column="0"></Border>
+        <Border BorderThickness="0,0,1,1" BorderBrush="DodgerBlue" Grid.Row="1" Grid.Column="0"></Border>
+        <Border BorderThickness="0,0,1,0" BorderBrush="DodgerBlue" Grid.Row="2" Grid.Column="0"></Border>
+        <Border BorderThickness="0,0,0,1" BorderBrush="DodgerBlue" Grid.Row="0" Grid.Column="1"></Border>
+        <Border BorderThickness="0,0,0,1" BorderBrush="DodgerBlue" Grid.Row="1" Grid.Column="1"></Border>
+        <Border BorderThickness="0,0,0,0" BorderBrush="DodgerBlue" Grid.Row="2" Grid.Column="1"></Border>
+        <GroupBox Grid.Row="0" Grid.Column="0"
+            FontFamily="楷体"
+            FontSize="20"
+            Header=" 乐白机器人 ">
+            
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                </Grid.RowDefinitions>
+                <Grid Grid.Row="0">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="连接状态:" />
+                        <TextBlock Text="{Binding RobotConnected}"
+                           Margin="40,0"/>
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="1">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="当前模式：" Margin="0,1"/>
+                        <TextBlock Text="{Binding RobotMode}"
+                               Margin="40,0"/>
+                    </StackPanel>
+                </Grid>
+                <Grid  Grid.Row="2">
+                    <DockPanel>
+                        <Button Content="启动"  Width="50" Height="40"
+                                Command="{Binding Button_RobotControlCommand}"
+                                CommandParameter="机器人启动">
+                        </Button>
+                        <Button Content="暂停" Width="50" Height="40"
+                                Command="{Binding Button_RobotControlCommand}"
+                                CommandParameter="暂停"/>
+                        <Button Content="恢复" Width="50" Height="40"
+                                Command="{Binding Button_RobotControlCommand}"
+                                CommandParameter="恢复"/>
+                        <Button Content="急停" Width="50" Height="40"
+                                Command="{Binding Button_RobotControlCommand}"
+                                CommandParameter="机器人急停"/>
+                    </DockPanel>
+                </Grid>
+                <Grid Grid.Row="0" Grid.Column="1" >
+                    <StackPanel Orientation="Horizontal" >
+                        <TextBlock>TCP DI:</TextBlock>
+                        <CheckBox IsEnabled="false" IsChecked="{Binding Robot_TCPDI0}" FontSize="14">DI0</CheckBox>
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="1" >
+                    <StackPanel Orientation="Horizontal" >
+                        <TextBlock>DI:</TextBlock>
+                        <CheckBox IsEnabled="false" Name="Robot_DI0" FontSize="14" IsChecked="{Binding Robot_DI0}">DI0</CheckBox>
+                        <CheckBox IsEnabled="false" Name="Robot_DI1" FontSize="14" IsChecked="{Binding Robot_DI1}">DI1</CheckBox>
+                        <CheckBox IsEnabled="false" Name="Robot_DI2" FontSize="14" IsChecked="{Binding Robot_DI2}">DI2</CheckBox>
+                        <CheckBox IsEnabled="false" Name="Robot_DI3" FontSize="14" IsChecked="{Binding Robot_DI3}">DI3</CheckBox>
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="2" Grid.Column="1">
+                    <StackPanel Orientation="Horizontal" >
+                        <TextBlock>DO:</TextBlock>
+                        <ComboBox SelectedIndex="{Binding Robot_DOutput_Pin}">
+                            <ComboBoxItem IsSelected="true">DO0</ComboBoxItem>
+                            <ComboBoxItem>DO1</ComboBoxItem>
+                            <ComboBoxItem>DO2</ComboBoxItem>
+                            <ComboBoxItem>DO3</ComboBoxItem>
+                        </ComboBox>
+                        <ComboBox  SelectedIndex="{Binding Robot_DOutput_Value}">
+                            <ComboBoxItem IsSelected="true">true</ComboBoxItem>
+                            <ComboBoxItem>false</ComboBoxItem>
+                        </ComboBox>
+                        <Button Content="输出" Command="{Binding Robot_DOutput}"/>
+                    </StackPanel>
+                    
+                </Grid>
+            </Grid>
+        </GroupBox>
+        <GroupBox Grid.Row="1" Grid.Column="0"
+                Header="单片机控制"
+                FontSize="18"
+                FontFamily="楷体">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid Grid.Row="0">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock >连接状态:</TextBlock>
+                        <TextBlock Text="{Binding MCUConnected}" />
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="1">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock  FontSize="12">DI:</TextBlock>
+                        <CheckBox FontSize="12" IsEnabled="false" IsChecked="{Binding CH0}">DI0</CheckBox>
+                        <CheckBox FontSize="12" IsEnabled="false" Name="CH1">DI1</CheckBox>
+                        <CheckBox FontSize="12" IsEnabled="false" Name="CH2">DI2</CheckBox>
+                        <CheckBox FontSize="12" IsEnabled="false" Name="CH3">DI3</CheckBox>
+                        <CheckBox FontSize="12" IsEnabled="false" Name="CH4">DI4</CheckBox>
+                        <CheckBox FontSize="12" IsEnabled="false" Name="CH5">DI5</CheckBox>
+                        <CheckBox FontSize="12" IsEnabled="false" Name="CH6">DI6</CheckBox>
+                        <CheckBox FontSize="12" IsEnabled="false" Name="CH7">DI7</CheckBox>
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="2" Grid.Column="0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition></ColumnDefinition>
+                    </Grid.ColumnDefinitions>
+                    <Grid Grid.Column="0">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock FontSize="12" HorizontalAlignment="Center">DO输出</TextBlock>
+                            <ComboBox Width="50" FontSize="12" HorizontalAlignment="Center" SelectedIndex="{Binding MCU_DO_CH}">
+                                <ComboBoxItem IsSelected="true">DO0</ComboBoxItem>
+                                <ComboBoxItem>DO1</ComboBoxItem>
+                                <ComboBoxItem>DO2</ComboBoxItem>
+                                <ComboBoxItem>DO3</ComboBoxItem>
+                                <ComboBoxItem>DO4</ComboBoxItem>
+                                <ComboBoxItem>DO5</ComboBoxItem>
+                                <ComboBoxItem>DO6</ComboBoxItem>
+                                <ComboBoxItem>DO7</ComboBoxItem>
+                            </ComboBox>
+                            <ComboBox FontSize="12" HorizontalAlignment="Center" SelectedIndex="{Binding MCU_DO_CH}">
+                                <ComboBoxItem IsSelected="true">True</ComboBoxItem>
+                                <ComboBoxItem>False</ComboBoxItem>
+                            </ComboBox>
+                            <Button Width="50" Command="{Binding Button_MCUDOuputCommand}">输出</Button>
+                        </StackPanel>
+                    </Grid>
+                    <Grid Grid.Column="1">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock  FontSize="12"  HorizontalAlignment="Center">舵机控制</TextBlock>
+                            <ComboBox Margin="0,0,0,0" FontSize="12" Width="60" SelectedIndex="{Binding MCU_PWM_CH}">
+                                <ComboBoxItem IsSelected="true">舵机1</ComboBoxItem>
+                                <ComboBoxItem>舵机2</ComboBoxItem>
+                                <ComboBoxItem>舵机3</ComboBoxItem>
+                                <ComboBoxItem>舵机4</ComboBoxItem>
+                            </ComboBox>
+                            <TextBox Width="50" Text="{Binding PWMInputNumber}"></TextBox>
+                            <Button FontSize="15"  HorizontalAlignment="Center"  Command="{Binding Button_MCUOuputCommand}">输出</Button>
+                        </StackPanel>
+                    </Grid>
+                </Grid>
+            </Grid>
+        </GroupBox>
+        <GroupBox Grid.Row="2" Grid.Column="0"
+            FontFamily="楷体"
+            FontSize="20"
+            Header=" 果汁机 ">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="5*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="3*"/>
+                    <RowDefinition Height="3*"/>
+                    <RowDefinition Height="3*"/>
+                </Grid.RowDefinitions>
+                <Grid>
+                    <TextBlock Text="连接状态:" />
+                </Grid>
+                <Grid Grid.Column="1">
+                    <TextBlock Text="{Binding JuicerConnected}"
+                           Margin="120,0,0,0"/>
+                </Grid>
+                <Grid Grid.Row="1">
+                    <TextBlock Text="设备状态：" />
+                </Grid>
+                <Grid Grid.Column="1" Grid.Row="1">
+                    <StackPanel  Orientation="Horizontal" >
+                        <Button IsEnabled="False" Command="{Binding JuiceState_Heating}" >制热</Button>
+                        <Button IsEnabled="False" Command="{Binding JuiceState_Cooling}" >制冷</Button>
+                        <Button IsEnabled="False" Command="{Binding JuiceState_LackOfWater}" >缺水</Button>
+                        <Button IsEnabled="False" Command="{Binding JuiceState_ChildLocks}" >童锁</Button>
+                        <Button IsEnabled="False" Command="{Binding JuiceState_Using}"  >使用</Button>
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="2">
+                    <TextBlock>果汁:</TextBlock>
+                </Grid>
+                <Grid Grid.Column="1" Grid.Row="2">
+                    <StackPanel Orientation="Horizontal">
+                        <ComboBox SelectedItem="{Binding MakeJuice_Index}">
+                            <ComboBoxItem IsSelected="true">0</ComboBoxItem>
+                            <ComboBoxItem>1</ComboBoxItem>
+                            <ComboBoxItem>2</ComboBoxItem>
+                            <ComboBoxItem>3</ComboBoxItem>
+                            <ComboBoxItem>4</ComboBoxItem>
+                            <ComboBoxItem>5</ComboBoxItem>
+                            <ComboBoxItem>6</ComboBoxItem>
+                            <ComboBoxItem>7</ComboBoxItem>
+                        </ComboBox>
+                        <Button Command="{Binding Button_MakeJuiceCommand}" Content="制作" />
+                    </StackPanel>
+                </Grid>
+            </Grid>
+        </GroupBox>
+        <GroupBox Grid.Row="0" Grid.Column="1"
+                  Header="订单模拟"
+                  FontSize="18"
+                  FontFamily="楷体">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                </Grid.RowDefinitions>
+                <Grid Grid.Row="0" Grid.Column="0">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock>咖啡:</TextBlock>
+                        <ComboBox Margin="10,0"
+                                Width="100"
+                                ItemsSource="{Binding Coffees}"
+                                SelectedItem="{Binding SimOrderCoffeeList}" />
+                        <Button Command="{Binding SimOrderMakeCoffee}">制作</Button>
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="0">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock>果汁:</TextBlock>
+                        <ComboBox SelectedIndex="{Binding SimOrder_JuiceList}">
+                            <ComboBoxItem IsSelected="true" >饮品1</ComboBoxItem>
+                            <ComboBoxItem>饮品2</ComboBoxItem>
+                            <ComboBoxItem>饮品3</ComboBoxItem>
+                            <ComboBoxItem>饮品4</ComboBoxItem>
+                        </ComboBox>
+                        <ComboBox SelectedItem="{Binding SimOrder_JuiceMakeID}">
+                            <ComboBoxItem IsSelected="true">热饮</ComboBoxItem>
+                            <ComboBoxItem>常温</ComboBoxItem>
+                            <ComboBoxItem>冷饮</ComboBoxItem>
+                        </ComboBox>
+                        <Button Command="{Binding SimOrderMakeJuice}">制作</Button>
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="0" Grid.Column="1">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock>开水:</TextBlock>
+                        <Button Command="{Binding SimOrderMakeWater}">制作</Button>
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="1">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock>茶水:</TextBlock>
+                        <Button Command="{Binding SimOrderMakeTea}">制作</Button>
+                    </StackPanel>
+                </Grid>
+            </Grid>
+        </GroupBox>
+        <GroupBox Grid.Row="1" Grid.Column="1"
+                  Header="制冰机控制"
+                  FontSize="18"
+                  FontFamily="楷体">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                </Grid.RowDefinitions>
+                <Grid Grid.Row="0">
+                    <StackPanel Orientation="Horizontal" >
+                        <TextBlock>连接状态：</TextBlock>
+                        <TextBlock Text="{Binding IceMakerConnected}" />
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="0" Grid.Column="1">
+                    <StackPanel Orientation="Horizontal">
+                        <Button Command="{Binding IceMaker_BtnPowerOn}">开机</Button>
+                        <Button Command="{Binding IceMaker_BtnStandby}">待机</Button>
+                        <Button Command="{Binding IceMaker_BtnPump}"   >抽水</Button>
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="1" Grid.ColumnSpan="2">
+                    <StackPanel Orientation="Horizontal" >
+                        <TextBlock>设备状态：</TextBlock>
+                        <TextBlock Text="{Binding IceMakerState}" />
+                        <Button IsEnabled="False" Name="IceMaker_State1" >开机状态</Button>
+                        <Button IsEnabled="False" Name="IceMaker_State2" >待机状态</Button>
+                        <Button IsEnabled="False" Name="IceMaker_State3" >电机故障</Button>
+                        <Button IsEnabled="False" Name="IceMaker_State4" >冰满</Button>
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="2" Grid.Column="0">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock>控制：</TextBlock>
+                        <Button Command="{Binding IceMaker_BtnStart}">开始出冰</Button>
+                        <Button Command="{Binding IceMaker_BtnEnd}">结束出冰</Button>
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="2" Grid.Column="01">
+                    <StackPanel Orientation="Horizontal" >
+                        <TextBlock>出冰时间：</TextBlock>
+                        <TextBox Width="50" Text="{Binding IceMaker_IceTime}"></TextBox>
+                        <TextBlock>s</TextBlock>
+                        <Button Command="{Binding IceMaker_BtnSetIceTime}">设置</Button>
+                    </StackPanel>
+                </Grid>
+            </Grid>
+        </GroupBox>
+        <GroupBox Grid.Row="2" Grid.Column="1"
+            FontFamily="楷体"
+            FontSize="20"
+            Header=" 咖啡机">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid Grid.Row="0">
+                    <TextBlock Text="连接状态" />
+                </Grid>
+                <Grid Grid.Row="0" Grid.Column="1">
+                    <TextBlock Text="{Binding CoffeeConnected}"/>
+                </Grid>
+                <Grid Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="2">
+                    <Grid.Resources>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="HorizontalAlignment" Value="Left" />
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                    </Grid.Resources>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*" />
+                        <ColumnDefinition Width="3*" />
+                        <ColumnDefinition Width="2*" />
+                        <ColumnDefinition Width="3*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Height="23" Width="100" FontSize="18" HorizontalAlignment="Center">咖啡机状态</TextBlock>
+                    <TextBlock FontSize="18" 
+                            Grid.Column="1"
+                            Text="{Binding CoffeeStatus}" Height="23" />
+                    <TextBlock Grid.Column="2" Height="23" Width="80" FontSize="18">应用状态</TextBlock>
+                    <TextBlock FontSize="18"
+                            Grid.Column="3" 
+                            Text="{Binding AppStatus}" Height="23"/>
+                    <TextBlock Grid.Row="1" Grid.Column="0" Height="22" Width="80" FontSize="18">告警信息</TextBlock>
+                    <TextBlock FontSize="15"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Text="{Binding Warning}"  />
+                    <TextBlock Grid.Row="1" Grid.Column="2" Height="22" Width="80" FontSize="18">故障信息</TextBlock>
+                    <TextBlock FontSize="18"
+                            Grid.Row="1"
+                            Grid.Column="3"
+                            Text="{Binding CaffeeFault}" Height="22" Width="60" />
+                </Grid>
+                <Grid Grid.Row="3" Grid.ColumnSpan="2">
+                    <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
+                        <TextBlock>饮品</TextBlock>
+                        <ComboBox Margin="10,0"
+                                Width="100"
+                                ItemsSource="{Binding Coffees}"
+                                SelectedItem="{Binding SelectedCoffee}" />
+                        <Button Margin="10,0"
+                            Command="{Binding Button_MakeCoffeeCommand }"
+                                Content="制作"/>
+                        <Button Margin="10,0"
+                            Command="{Binding Button_StopMakeCoffeCommand}"
+                                Content="停止制作"/>
+                    </StackPanel>
+                </Grid>
+                <Grid Grid.Row="4"  Grid.ColumnSpan="2">
+                    <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
+                        <TextBlock>模式</TextBlock>
+                        <ComboBox Margin="10,0"
+                                Width="100"
+                                ItemsSource="{Binding CoffeeCmds}"
+                                SelectedItem="{Binding SelectedCoffeeCmd}"/>
+                        <Button Margin="10,0"
+                                Command="{Binding Button_CoffeeModeSetCommand}"
+                                Content="设置" Cursor="Hand"/>
+                    </StackPanel>
+                </Grid>
+            </Grid>
+        </GroupBox>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.MorkT_BarCounter/View/TestView.xaml.cs b/BPASmartClient.MorkT_BarCounter/View/TestView.xaml.cs
new file mode 100644
index 00000000..c2b2314c
--- /dev/null
+++ b/BPASmartClient.MorkT_BarCounter/View/TestView.xaml.cs
@@ -0,0 +1,37 @@
+using BPASmartClient.Helper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.MorkT_BarCounter.View
+{
+    /// <summary>
+    /// DebugView.xaml 的交互逻辑
+    /// </summary>
+    public partial class TestView : UserControl
+    {
+        public TestView()
+        {
+            InitializeComponent();
+        }
+
+        private void Dubug_Unloaded(object sender, RoutedEventArgs e)
+        {
+            ThreadManage.GetInstance().StopTask("MorkT-状态刷新");
+            ThreadManage.GetInstance().StopTask("MorkT-传感器监视");
+
+        }
+    }
+
+}
diff --git a/BPASmartClient.MorkT_BarCounter/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkT_BarCounter/ViewModel/DebugViewModel.cs
index 8cc3f0d7..c49d316d 100644
--- a/BPASmartClient.MorkT_BarCounter/ViewModel/DebugViewModel.cs
+++ b/BPASmartClient.MorkT_BarCounter/ViewModel/DebugViewModel.cs
@@ -11,6 +11,8 @@ using BPASmartClient.Model.冰淇淋.Enum;
 using BPASmartClient.Model.单片机;
 using BPASmartClient.Model.单片机.Enum;
 using BPASmartClient.Model.咖啡机.Enum;
+using BPASmartClient.Model.奶茶味魔方;
+using BPASmartClient.Model.电夹爪;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
@@ -19,368 +21,70 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading;
 namespace BPASmartClient.MorkT_BarCounter.ViewModel;
-    public class DebugViewModel : ObservableObject
+public class DebugViewModel : ObservableObject
+{
+    public DebugViewModel()
     {
-        
-        #region 乐白机器人
-        /// <summary>
-        /// 乐白机器人连接状态
-        /// </summary>
-        public string RobotConnected { get { return _robotConnected; } set { _robotConnected = value; OnPropertyChanged(); } }
-        private string _robotConnected { get; set; }
-        /// <summary>
-        /// 乐白机器人的模式状态
-        /// </summary>
-        public string RobotMode { get { return _robotMode; } set { _robotMode = value; OnPropertyChanged(); } }
-        private string _robotMode { get; set; }
-        /// <summary>
-        /// 机器人控制指令
-        /// </summary>
-        public RelayCommand<object> Button_RobotControlCommand { get; set; }
-
-        public RelayCommand Robot_DOutput { get; set; }
-        /// <summary>
-        /// 机器人控制
-        /// </summary>
-        /// <param name="o"></param>
-        private void Button_RobotControl(object o)
-        {
-            EventBus.EventBus.GetInstance().Publish(new LebaiRobot_LebaiControlEvent { DeviceId = DeviceId, LebaiControl = o.ToString() });
-        }
-        private void Button_RobotDoutput() 
+        RobotControlCommand = new RelayCommand(() => 
         {
-            bool DO_Value =int.Parse(Robot_DOutput_Value) == 0;
-            EventBus.EventBus.GetInstance().Publish(new LebaiRobot_SetOutPutEvent { Pin = int.Parse(Robot_DOutput_Pin), Value = DO_Value });
-        }
-        public string Robot_TCPDI0 { get { return _robot_TCPDI0; } set { _robot_TCPDI0 = value;OnPropertyChanged(); } }
-        private string _robot_TCPDI0;
-
-        public string Robot_DI0 { get { return _robot_DI0; } set { _robot_DI0 = value; OnPropertyChanged(); } }
-        private string _robot_DI0;
-        public string Robot_DI1 { get { return _robot_DI1; } set { _robot_DI1 = value; OnPropertyChanged(); } }
-        private string _robot_DI1;
-        public string Robot_DI2 { get { return _robot_DI2; } set { _robot_DI2 = value; OnPropertyChanged(); } }
-        private string _robot_DI2;
-        public string Robot_DI3 { get { return _robot_DI3; } set { _robot_DI3 = value; OnPropertyChanged(); } }
-        private string _robot_DI3;
-        
-
-        public string Robot_DOutput_Pin { get { return _robot_DOutput_Pin; } set { _robot_DOutput_Pin = value; OnPropertyChanged(); } }
-        private string _robot_DOutput_Pin { get; set; }
-        public string Robot_DOutput_Value { get { return _robot_DOutput_Valuet; } set { _robot_DOutput_Valuet = value; OnPropertyChanged(); } }
-        private string _robot_DOutput_Valuet { get; set; }
-        #endregion
-        #region 单片机
-        public string MCUConnected { get { return _mcuConnected; } set { _mcuConnected = value; OnPropertyChanged(); } }
-        private string _mcuConnected { get; set; }
-
-        public string MCUDI0 { get { return _mCUDI0; } set { _mCUDI0 = value; OnPropertyChanged(); } }
-        private string _mCUDI0 { get; set; }
-        public string MCUDI1 { get { return _mCUDI1; } set { _mCUDI1 = value; OnPropertyChanged(); } }
-        private string _mCUDI1 { get; set; }
-        public string MCUDI2 { get { return _mCUDI2; } set { _mCUDI2 = value; OnPropertyChanged(); } }
-        private string _mCUDI2 { get; set; }
-        public string MCUDI3 { get { return _mCUDI3; } set { _mCUDI3 = value; OnPropertyChanged(); } }
-        private string _mCUDI3 { get; set; }
-        public string MCUDI4 { get { return _mCUDI4; } set { _mCUDI4 = value; OnPropertyChanged(); } }
-        private string _mCUDI4 { get; set; }
-        public string MCUDI5 { get { return _mCUDI5; } set { _mCUDI5 = value; OnPropertyChanged(); } }
-        private string _mCUDI5 { get; set; }
-        public string MCUDI6 { get { return _mCUDI6; } set { _mCUDI6 = value; OnPropertyChanged(); } }
-        private string _mCUDI6 { get; set; }
-        public string MCUDI7 { get { return _mCUDI7; } set { _mCUDI7 = value; OnPropertyChanged(); } }
-        private string _mCUDI7 { get; set; }
-
-        public RelayCommand Button_MCUOuputCommand { get; set; }
-        public RelayCommand Button_MCUDOuputCommand { get; set; }
-
-        public int MCU_PWM_CH { get { return _choosePWM; } set { _choosePWM = value; OnPropertyChanged(); } }
-        private int _choosePWM = 1;
-        public int PWMInputNumber { get { return _pwmInputNumber; } set { _pwmInputNumber = value; OnPropertyChanged(); } }
-        private int _pwmInputNumber = 1;
+            new WriteJaka() { DeviceId = 126, TagName = "JaKaProgramName", Value = JakaRobotProgram }.Publish();
 
-        private int[] DICH { get { return _diCH; } set { _diCH = value; OnPropertyChanged(); } }
-        private int[] _diCH = new int[8];
-
-        public int MCU_DO_CH { get { return _mcuDO_CH; } set { _mcuDO_CH = value; OnPropertyChanged(); } }
-        private int _mcuDO_CH = 1;
-        public bool MCU_DO_Value { get { return _mcu_DO_Valuer; } set { _mcu_DO_Valuer = value; OnPropertyChanged(); } }
-        private bool _mcu_DO_Valuer = true;
-
-        private void Button_McuPWMOutput()
+        });
+        CoffeeControlCommand = new RelayCommand(() =>
         {
-            string sChoosePWM = Convert.ToString(MCU_PWM_CH + 1);
-            new WriteMcu() { TagName = "ServoControl", Address = sChoosePWM, Value = PWMInputNumber }.Publish();
-        }
-        private void Button_McuDOutput()
+            new DRCoffee_MakeCoffeeEvent() { DeviceId = 126, DrinkCode = (DrCoffeeDrinksCode)(CoffeeKind) }.Publish();
+        });
+        MikeTeaCupControlCommand = new RelayCommand(() =>
         {
-            string sChooseDO = Convert.ToString(MCU_DO_CH + 1);
-            new WriteMcu() { TagName = "OutputControl", Address = sChooseDO, Value = MCU_DO_Value }.Publish();
-        }
-        #endregion
-        #region 果汁机
-        /// <summary>
-        /// 果汁机的连接状态
-        /// </summary>
-        public string JuicerConnected { get { return _JuicerConnected; } set { _JuicerConnected = value; OnPropertyChanged(); } }
-        private string _JuicerConnected { get; set; }
-
-        public string JuiceState_Heating { get { return _juiceState_Heating; } set { _juiceState_Heating = value;OnPropertyChanged(); } }
-        public string _juiceState_Heating { get; set; }
-        public string JuiceState_Cooling { get { return _juiceState_Cooling; } set { _juiceState_Cooling = value; OnPropertyChanged(); } }
-        public string _juiceState_Cooling { get; set; }
-        public string JuiceState_LackOfWater { get { return _juiceState_LackOfWater; } set { _juiceState_LackOfWater = value; OnPropertyChanged(); } }
-        public string _juiceState_LackOfWater { get; set; }
-        public string JuiceState_ChildLocks { get { return _juiceState_ChildLocks; } set { _juiceState_ChildLocks = value; OnPropertyChanged(); } }
-        public string _juiceState_ChildLocks { get; set; }
-        public string JuiceState_Using { get { return _juiceState_Using; } set { _juiceState_Using = value; OnPropertyChanged(); } }
-        public string _juiceState_Using { get; set; }
-
-        public string MakeJuice_Index { get { return _makeJuice_Index; } set { _makeJuice_Index = value; OnPropertyChanged(); } }
-        public string _makeJuice_Index { get; set; }
-    
-        public RelayCommand Button_MakeJuiceCommand { get; set; }
-
-        public void Button_MakeJuice() 
+            new MilkTea_MakeMilkTeaEvent() { DeviceId = 126, TagName = "ParameterSet", MilkTeaKind = GVL_MorkT.MilkTeaCHValue }.Publish();  //写入奶茶参数
+            new MilkTea_MakeMilkTeaEvent() { DeviceId = 126, TagName = "Start" }.Publish();
+        });
+        GripperControlCommand = new RelayCommand(() =>
         {
-            new WriteJuicer() { Value = MakeJuice_Index }.Publish();
-        }
-        #endregion
-        #region 制冰机
-        public string IceMakerConnect { get { return _iceMakerConnect; } set { _iceMakerConnect = value;OnPropertyChanged(); } }
-        private string _iceMakerConnect { get; set; }
-        public string IceMakerState { get { return _iceMakerState; } set { _iceMakerState = value; OnPropertyChanged(); } }
-        private string _iceMakerState { get; set; }
-        public int IceMaker_IceTime { get { return _iceMaker_IceTime; } set { _iceMaker_IceTime = value; OnPropertyChanged(); } }
-        private int _iceMaker_IceTime = 3;
-
-        #region 订单模拟
-        public RelayCommand SimOrderMakeCoffee  { get; set; }
-        public RelayCommand SimOrderMakeJuice   { get; set; }
-        public RelayCommand SimOrderMakeTea     { get; set; }
-        public RelayCommand SimOrderMakeWater   { get; set; }
-
-        public int SimOrder_JuiceList { get { return _simOrder_JuiceList; } set { _simOrder_JuiceList = value; OnPropertyChanged(); } }
-        public int _simOrder_JuiceList { get; set; }
-        public string SimOrder_JuiceMakeID { get { return _simOrder_JuiceMakeID; } set { _simOrder_JuiceMakeID = value; OnPropertyChanged(); } }
-        public string _simOrder_JuiceMakeID { get; set; }
-        #endregion
-
-        public RelayCommand IceMaker_BtnPowerOn { get; set; }
-        public RelayCommand IceMaker_BtnStandby { get; set;}
-        public RelayCommand IceMaker_BtnPump { get; set;}
-
-        public RelayCommand IceMaker_BtnStart { get; set; }
-        public RelayCommand IceMaker_BtnEnd { get; set; }
-        public RelayCommand IceMaker_BtnSetIceTime { get; set; }
-
-        private void IceMaker_BtnPowerOnCommand() 
-        {
-            new PowerOnMakeIce().Publish();
-        }
-        private void IceMaker_BtnStandbyCommand() 
-        {
-            new StandbyMakeIce().Publish();
-        }
-        private void IceMaker_BtnPumpCommand()
-        {
-            new PumpMakeIce().Publish();
-        }
-        private void IceMaker_BtnStartCommand()
-        {
-            new StartMakeIce().Publish();   
-        }
-        private void IceMaker_BtnEndCommand()
-        {
-            new StopMakeIce().Publish();
-        }
-        private void IceMaker_BtnSetIceTimeCommand()
-        {
-            new SetIceNumber{ Value= IceMaker_IceTime }.Publish();
-        }
-        #endregion
-        #region 咖啡机
-        /// <summary>
-        /// 咖啡机连接状态
-        /// </summary>
-        public string CoffeeConnected { get { return _coffeeConnected; } set { _coffeeConnected = value; OnPropertyChanged(); } }
-        private string _coffeeConnected { get; set; }
-        /// <summary>
-        /// 咖啡机状态
-        /// </summary>
-        public string CoffeeStatus { get { return _coffeeStatus; } set { _coffeeStatus = value; OnPropertyChanged(); } }
-        private string _coffeeStatus { get; set; }
-        /// <summary>
-        /// 应用状态
-        /// </summary>
-        public string AppStatus { get { return _appStatus; } set { _appStatus = value; OnPropertyChanged(); } }
-        private string _appStatus { get; set; }
-        /// <summary>
-        /// 告警
-        /// </summary>
-        public string Warning { get { return _warning; } set { _warning = value; OnPropertyChanged(); } }
-        public string _warning { get; set; }
-        /// <summary>
-        /// 故障信息
-        /// </summary>
-        public string CaffeeFault { get { return _caffeeFault; } set { _caffeeFault = value; OnPropertyChanged(); } }
-        public string _caffeeFault { get; set; }
-
-        public List<string> Coffees { get; set; } = new List<string>();
-        public string SelectedCoffee { get { return _selectedCoffee; } set { _selectedCoffee = value; OnPropertyChanged(); } }
-        public string _selectedCoffee { get; set; }
-
-        public List<string> CoffeeCmds { get; set; } = new List<string>();
-        public string SelectedCoffeeCmd { get; set; }
-
-    
-        public string SimOrderCoffeeList { get { return _simOrderCoffeeList; } set { _simOrderCoffeeList = value; OnPropertyChanged(); } }
-        public string _simOrderCoffeeList { get; set; }
-        
-        /// <summary>
-        /// 制作咖啡
-        /// </summary>
-        public RelayCommand Button_MakeCoffeeCommand { get; set; }
-        /// <summary>
-        /// 停止制作咖啡
-        /// </summary>
-        public RelayCommand Button_StopMakeCoffeCommand { get; set; }
-        /// <summary>
-        /// 咖啡模式设置
-        /// </summary>
-        public RelayCommand Button_CoffeeModeSetCommand { get; set; }
-
-        private void Button_MakeCoffee()
-        {
-            EventBus.EventBus.GetInstance().Publish(new DRCoffee_MakeCoffeeEvent() { DeviceId = DeviceId, DrinkCode = (DrCoffeeDrinksCode)Enum.Parse(typeof(DrCoffeeDrinksCode), SelectedCoffee) });
-        }
-        private void Button_StopMakeCoffe()
-        {
-            EventBus.EventBus.GetInstance().Publish(new DRCoffee_CancelMakeCoffeeEvent() { DeviceId = DeviceId });
-        }
-        private void Button_CoffeeModeSet()
-        {
-            EventBus.EventBus.GetInstance().Publish(new DRCoffee_CoffeeCommCmdEvent() { DeviceId = DeviceId, CommCmd = (DrCoffeeCommCmd)Enum.Parse(typeof(DrCoffeeCommCmd), SelectedCoffeeCmd) });
-        }
-
-        #endregion
-        /// <summary>
-        /// 设备ID
-        /// </summary>
-        public int DeviceId { get; set; }
-        /// <summary>
-        /// 设备数据
-        /// </summary>
-        public ObservableCollection<VariableMonitor> variableMonitors { get; set; }
-        
-        public DebugViewModel()
-        {
-            SimOrderMakeCoffee = new RelayCommand(() =>
-            {
-                new MorkTSimOrder() { OrderNum = 1, DrinkCode = (DrCoffeeDrinksCode)Enum.Parse(typeof(DrCoffeeDrinksCode), SimOrderCoffeeList) }.Publish();
-            });
-            SimOrderMakeJuice = new RelayCommand(() =>
-            {
-                new MorkTSimOrder() { OrderNum = 2, JuiceList = SimOrder_JuiceList, JuiceMakeID = SimOrder_JuiceMakeID }.Publish();
-            });
-            SimOrderMakeTea = new RelayCommand(() =>
+            string value = GripperProgam + "";
+            if (value.Length == 1)
             {
-                new MorkTSimOrder() { OrderNum = 3 }.Publish();
-            });
-            SimOrderMakeWater = new RelayCommand(() =>
-            {
-                new MorkTSimOrder() { OrderNum = 4 }.Publish();
-            });
-            Button_RobotControlCommand = new RelayCommand<object>(Button_RobotControl);
-            Robot_DOutput = new RelayCommand(Button_RobotDoutput);
-
-            Button_MakeCoffeeCommand = new RelayCommand(Button_MakeCoffee);
-            Button_StopMakeCoffeCommand = new RelayCommand(Button_StopMakeCoffe);
-            Button_CoffeeModeSetCommand = new RelayCommand(Button_CoffeeModeSet);
-            
-            Button_MCUOuputCommand = new RelayCommand(Button_McuPWMOutput);
-            Button_MCUDOuputCommand = new RelayCommand(Button_McuDOutput);
-
-            Button_MakeJuiceCommand = new RelayCommand(Button_MakeJuice);
-
-            IceMaker_BtnPowerOn = new RelayCommand(IceMaker_BtnPowerOnCommand);
-            IceMaker_BtnStandby = new RelayCommand(IceMaker_BtnStandbyCommand);
-            IceMaker_BtnPump = new RelayCommand(IceMaker_BtnPumpCommand);
-            IceMaker_BtnStart = new RelayCommand(IceMaker_BtnStartCommand);
-            IceMaker_BtnEnd = new RelayCommand(IceMaker_BtnEndCommand);
-            IceMaker_BtnSetIceTime = new RelayCommand(IceMaker_BtnSetIceTimeCommand);
-            
-            foreach (DrCoffeeDrinksCode code in Enum.GetValues(typeof(DrCoffeeDrinksCode)))
+                value = "000" + value;
+            }
+            else if (value.Length == 2)
             {
-                Coffees.Add(code.ToString());
+                value = "00" + value;
             }
-            SelectedCoffee = Coffees[0];
-            SimOrderCoffeeList = Coffees[0];
-            foreach (DrCoffeeCommCmd code in Enum.GetValues(typeof(DrCoffeeCommCmd)))
+            else if (value.Length == 3)
             {
-                CoffeeCmds.Add(code.ToString());
+                value = "0" + value;
             }
-            SelectedCoffeeCmd = CoffeeCmds[0];
-
-            Plugin.GetInstance()?.GetPlugin<DeviceMgr>()?.GetDevices().ForEach(device =>
+            else 
             {
-                if (device.Name == "MorkT") DeviceId = device.DeviceId
-                ;
-            });
-            ThreadManage.GetInstance().StartLong(new Action(() =>
+                value = "1350";
+            }
+            new WriteGripper() { DeviceId = 126, TagName = "PWMControl", CH_Number = "0", PWMOutput = value }.Publish();//夹爪的幅度控制
+        });
+        MikeTeaCupSetParCommand = new RelayCommand(() =>
+        {
+            for (int i = 0; i < 12; i++)
             {
-                variableMonitors = Plugin.GetInstance()?.GetPlugin<DeviceMgr>()?.GetDevices()?.FirstOrDefault(p => p.DeviceId == DeviceId)?.variableMonitors;
-                if (variableMonitors != null && variableMonitors.Count > 0)
-                {
-                    #region 机器人
-                    RobotConnected = variableMonitors.FirstOrDefault(p => p.Notes == "机器人连接状态").CurrentValue == "True" ? "已连接" : "未连接";
-                    RobotMode = variableMonitors.FirstOrDefault(p => p.Notes == "机器人状态").CurrentValue;
-                    Robot_TCPDI0 = variableMonitors.FirstOrDefault(p => p.Notes == "机器人TCP输入状态").CurrentValue;
-                    Robot_DI0 = variableMonitors.FirstOrDefault(p => p.Notes == "机器人输入0状态").CurrentValue;
-                    Robot_DI1 = variableMonitors.FirstOrDefault(p => p.Notes == "机器人输入1状态").CurrentValue;
-                    Robot_DI2 = variableMonitors.FirstOrDefault(p => p.Notes == "机器人输入2状态").CurrentValue;
-                    Robot_DI3 = variableMonitors.FirstOrDefault(p => p.Notes == "机器人输入3状态").CurrentValue;
-
-                    #endregion
-
-                    #region 咖啡机
-                    CoffeeConnected = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机连接状态").CurrentValue == "True" ? "已连接" : "未连接";
-                    CoffeeStatus = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机状态").CurrentValue;
-                    AppStatus = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机应用状态").CurrentValue;
-                    Warning = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机告警").CurrentValue;
-                    CaffeeFault = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机故障").CurrentValue;
-                    #endregion
-
-                    #region 单片机
-                    MCUConnected = variableMonitors.FirstOrDefault(p => p.Notes == "单片机连接状态").CurrentValue == "True" ? "已连接" : "未连接";
-                    MCUDI0 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入0状态").CurrentValue;
-                    MCUDI1 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入1状态").CurrentValue;
-                    MCUDI2 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入2状态").CurrentValue;
-                    MCUDI3 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入3状态").CurrentValue;
-                    MCUDI4 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入4状态").CurrentValue;
-                    MCUDI5 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入5状态").CurrentValue;
-                    MCUDI6 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入6状态").CurrentValue;
-                    MCUDI7 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入7状态").CurrentValue;
-                    #endregion
-
-                    #region 制冰机
-                    IceMakerConnect = variableMonitors.FirstOrDefault(p => p.Notes == "制冰机连接状态").CurrentValue == "True" ? "已连接" : "未连接";
-                    IceMakerState = variableMonitors.FirstOrDefault(p => p.Notes == "制冰机设备状态").CurrentValue;
-                    #endregion
-                    
-
-                    #region 果汁机
-                    JuicerConnected = variableMonitors.FirstOrDefault(p => p.Notes == "果汁机连接状态").CurrentValue == "True" ? "已连接" : "未连接";
-                    JuiceState_Heating = variableMonitors.FirstOrDefault(p => p.Notes == "果汁机制热").CurrentValue;
-                    JuiceState_Cooling = variableMonitors.FirstOrDefault(p => p.Notes == "果汁机制冷").CurrentValue;
-                    JuiceState_LackOfWater = variableMonitors.FirstOrDefault(p => p.Notes == "果汁机缺水").CurrentValue;
-                    JuiceState_ChildLocks = variableMonitors.FirstOrDefault(p => p.Notes == "果汁机童锁").CurrentValue;
-                    JuiceState_Using = variableMonitors.FirstOrDefault(p => p.Notes == "果汁机使用").CurrentValue;
-
-                    #endregion
-                }
-                Thread.Sleep(500);
-            }), "MorkT-状态刷新");
-        }
+                GVL_MorkT.MilkTeaCHValue[i] = (ushort)CH_Value[i];
+            }
+        });
     }
+    public int JakaRobotProgram { get { return _JakaRobotProgram; } set { _JakaRobotProgram = value; OnPropertyChanged(); } }
+    private int _JakaRobotProgram { get; set; }
+    public RelayCommand RobotControlCommand { get; set; }
+    public RelayCommand MikeTeaCupSetParCommand { get; set; }
+    public int CoffeeKind { get { return _CoffeeKind; } set { _CoffeeKind = value; OnPropertyChanged(); } }
+    private int _CoffeeKind { get; set; }
+    public RelayCommand CoffeeControlCommand { get; set; }
+
+    public int MilkTeaCub { get { return _MilkTeaCub; } set { _MilkTeaCub = value; OnPropertyChanged(); } }
+    private int _MilkTeaCub { get; set; }
+    public RelayCommand MikeTeaCupControlCommand { get; set; }
+    public int GripperProgam { get { return _GripperProgam; } set { _GripperProgam = value; OnPropertyChanged(); } }
+    private int _GripperProgam { get; set; }
+
+    public int[] CH_Value { get { return _CH_Value; } set { _CH_Value = value; OnPropertyChanged(); } }
+    private int[] _CH_Value { get; set; } = new int[12] {200,200,200,200,200,200,200,200,200,200,200,200 };
+
+    public RelayCommand GripperControlCommand { get; set; }
+}
 
diff --git a/BPASmartClient.MorkT_BarCounter/ViewModel/TestViewModel.cs b/BPASmartClient.MorkT_BarCounter/ViewModel/TestViewModel.cs
new file mode 100644
index 00000000..194eb312
--- /dev/null
+++ b/BPASmartClient.MorkT_BarCounter/ViewModel/TestViewModel.cs
@@ -0,0 +1,386 @@
+using BPASmartClient.Business;
+using BPASmartClient.Device;
+using BPASmartClient.DRCoffee;
+using BPASmartClient.EventBus;
+using BPASmartClient.Helper;
+using BPASmartClient.LebaiRobot;
+using BPASmartClient.Message;
+using BPASmartClient.Model;
+using BPASmartClient.Model.乐白机器人;
+using BPASmartClient.Model.冰淇淋.Enum;
+using BPASmartClient.Model.单片机;
+using BPASmartClient.Model.单片机.Enum;
+using BPASmartClient.Model.咖啡机.Enum;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
+namespace BPASmartClient.MorkT_BarCounter.ViewModel;
+    public class TestViewModel : ObservableObject
+    {
+        
+        #region 乐白机器人
+        /// <summary>
+        /// 乐白机器人连接状态
+        /// </summary>
+        public string RobotConnected { get { return _robotConnected; } set { _robotConnected = value; OnPropertyChanged(); } }
+        private string _robotConnected { get; set; }
+        /// <summary>
+        /// 乐白机器人的模式状态
+        /// </summary>
+        public string RobotMode { get { return _robotMode; } set { _robotMode = value; OnPropertyChanged(); } }
+        private string _robotMode { get; set; }
+        /// <summary>
+        /// 机器人控制指令
+        /// </summary>
+        public RelayCommand<object> Button_RobotControlCommand { get; set; }
+
+        public RelayCommand Robot_DOutput { get; set; }
+        /// <summary>
+        /// 机器人控制
+        /// </summary>
+        /// <param name="o"></param>
+        private void Button_RobotControl(object o)
+        {
+            EventBus.EventBus.GetInstance().Publish(new LebaiRobot_LebaiControlEvent { DeviceId = DeviceId, LebaiControl = o.ToString() });
+        }
+        private void Button_RobotDoutput() 
+        {
+            bool DO_Value =int.Parse(Robot_DOutput_Value) == 0;
+            EventBus.EventBus.GetInstance().Publish(new LebaiRobot_SetOutPutEvent { Pin = int.Parse(Robot_DOutput_Pin), Value = DO_Value });
+        }
+        public string Robot_TCPDI0 { get { return _robot_TCPDI0; } set { _robot_TCPDI0 = value;OnPropertyChanged(); } }
+        private string _robot_TCPDI0;
+
+        public string Robot_DI0 { get { return _robot_DI0; } set { _robot_DI0 = value; OnPropertyChanged(); } }
+        private string _robot_DI0;
+        public string Robot_DI1 { get { return _robot_DI1; } set { _robot_DI1 = value; OnPropertyChanged(); } }
+        private string _robot_DI1;
+        public string Robot_DI2 { get { return _robot_DI2; } set { _robot_DI2 = value; OnPropertyChanged(); } }
+        private string _robot_DI2;
+        public string Robot_DI3 { get { return _robot_DI3; } set { _robot_DI3 = value; OnPropertyChanged(); } }
+        private string _robot_DI3;
+        
+
+        public string Robot_DOutput_Pin { get { return _robot_DOutput_Pin; } set { _robot_DOutput_Pin = value; OnPropertyChanged(); } }
+        private string _robot_DOutput_Pin { get; set; }
+        public string Robot_DOutput_Value { get { return _robot_DOutput_Valuet; } set { _robot_DOutput_Valuet = value; OnPropertyChanged(); } }
+        private string _robot_DOutput_Valuet { get; set; }
+        #endregion
+        #region 单片机
+        public string MCUConnected { get { return _mcuConnected; } set { _mcuConnected = value; OnPropertyChanged(); } }
+        private string _mcuConnected { get; set; }
+
+        public string MCUDI0 { get { return _mCUDI0; } set { _mCUDI0 = value; OnPropertyChanged(); } }
+        private string _mCUDI0 { get; set; }
+        public string MCUDI1 { get { return _mCUDI1; } set { _mCUDI1 = value; OnPropertyChanged(); } }
+        private string _mCUDI1 { get; set; }
+        public string MCUDI2 { get { return _mCUDI2; } set { _mCUDI2 = value; OnPropertyChanged(); } }
+        private string _mCUDI2 { get; set; }
+        public string MCUDI3 { get { return _mCUDI3; } set { _mCUDI3 = value; OnPropertyChanged(); } }
+        private string _mCUDI3 { get; set; }
+        public string MCUDI4 { get { return _mCUDI4; } set { _mCUDI4 = value; OnPropertyChanged(); } }
+        private string _mCUDI4 { get; set; }
+        public string MCUDI5 { get { return _mCUDI5; } set { _mCUDI5 = value; OnPropertyChanged(); } }
+        private string _mCUDI5 { get; set; }
+        public string MCUDI6 { get { return _mCUDI6; } set { _mCUDI6 = value; OnPropertyChanged(); } }
+        private string _mCUDI6 { get; set; }
+        public string MCUDI7 { get { return _mCUDI7; } set { _mCUDI7 = value; OnPropertyChanged(); } }
+        private string _mCUDI7 { get; set; }
+
+        public RelayCommand Button_MCUOuputCommand { get; set; }
+        public RelayCommand Button_MCUDOuputCommand { get; set; }
+
+        public int MCU_PWM_CH { get { return _choosePWM; } set { _choosePWM = value; OnPropertyChanged(); } }
+        private int _choosePWM = 1;
+        public int PWMInputNumber { get { return _pwmInputNumber; } set { _pwmInputNumber = value; OnPropertyChanged(); } }
+        private int _pwmInputNumber = 1;
+
+        private int[] DICH { get { return _diCH; } set { _diCH = value; OnPropertyChanged(); } }
+        private int[] _diCH = new int[8];
+
+        public int MCU_DO_CH { get { return _mcuDO_CH; } set { _mcuDO_CH = value; OnPropertyChanged(); } }
+        private int _mcuDO_CH = 1;
+        public bool MCU_DO_Value { get { return _mcu_DO_Valuer; } set { _mcu_DO_Valuer = value; OnPropertyChanged(); } }
+        private bool _mcu_DO_Valuer = true;
+
+        private void Button_McuPWMOutput()
+        {
+            string sChoosePWM = Convert.ToString(MCU_PWM_CH + 1);
+            new WriteMcu() { TagName = "ServoControl", Address = sChoosePWM, Value = PWMInputNumber }.Publish();
+        }
+        private void Button_McuDOutput()
+        {
+            string sChooseDO = Convert.ToString(MCU_DO_CH + 1);
+            new WriteMcu() { TagName = "OutputControl", Address = sChooseDO, Value = MCU_DO_Value }.Publish();
+        }
+        #endregion
+        #region 果汁机
+        /// <summary>
+        /// 果汁机的连接状态
+        /// </summary>
+        public string JuicerConnected { get { return _JuicerConnected; } set { _JuicerConnected = value; OnPropertyChanged(); } }
+        private string _JuicerConnected { get; set; }
+
+        public string JuiceState_Heating { get { return _juiceState_Heating; } set { _juiceState_Heating = value;OnPropertyChanged(); } }
+        public string _juiceState_Heating { get; set; }
+        public string JuiceState_Cooling { get { return _juiceState_Cooling; } set { _juiceState_Cooling = value; OnPropertyChanged(); } }
+        public string _juiceState_Cooling { get; set; }
+        public string JuiceState_LackOfWater { get { return _juiceState_LackOfWater; } set { _juiceState_LackOfWater = value; OnPropertyChanged(); } }
+        public string _juiceState_LackOfWater { get; set; }
+        public string JuiceState_ChildLocks { get { return _juiceState_ChildLocks; } set { _juiceState_ChildLocks = value; OnPropertyChanged(); } }
+        public string _juiceState_ChildLocks { get; set; }
+        public string JuiceState_Using { get { return _juiceState_Using; } set { _juiceState_Using = value; OnPropertyChanged(); } }
+        public string _juiceState_Using { get; set; }
+
+        public string MakeJuice_Index { get { return _makeJuice_Index; } set { _makeJuice_Index = value; OnPropertyChanged(); } }
+        public string _makeJuice_Index { get; set; }
+    
+        public RelayCommand Button_MakeJuiceCommand { get; set; }
+
+        public void Button_MakeJuice() 
+        {
+            new WriteJuicer() { Value = MakeJuice_Index }.Publish();
+        }
+        #endregion
+        #region 制冰机
+        public string IceMakerConnect { get { return _iceMakerConnect; } set { _iceMakerConnect = value;OnPropertyChanged(); } }
+        private string _iceMakerConnect { get; set; }
+        public string IceMakerState { get { return _iceMakerState; } set { _iceMakerState = value; OnPropertyChanged(); } }
+        private string _iceMakerState { get; set; }
+        public int IceMaker_IceTime { get { return _iceMaker_IceTime; } set { _iceMaker_IceTime = value; OnPropertyChanged(); } }
+        private int _iceMaker_IceTime = 3;
+
+        #region 订单模拟
+        public RelayCommand SimOrderMakeCoffee  { get; set; }
+        public RelayCommand SimOrderMakeJuice   { get; set; }
+        public RelayCommand SimOrderMakeTea     { get; set; }
+        public RelayCommand SimOrderMakeWater   { get; set; }
+
+        public int SimOrder_JuiceList { get { return _simOrder_JuiceList; } set { _simOrder_JuiceList = value; OnPropertyChanged(); } }
+        public int _simOrder_JuiceList { get; set; }
+        public string SimOrder_JuiceMakeID { get { return _simOrder_JuiceMakeID; } set { _simOrder_JuiceMakeID = value; OnPropertyChanged(); } }
+        public string _simOrder_JuiceMakeID { get; set; }
+        #endregion
+
+        public RelayCommand IceMaker_BtnPowerOn { get; set; }
+        public RelayCommand IceMaker_BtnStandby { get; set;}
+        public RelayCommand IceMaker_BtnPump { get; set;}
+
+        public RelayCommand IceMaker_BtnStart { get; set; }
+        public RelayCommand IceMaker_BtnEnd { get; set; }
+        public RelayCommand IceMaker_BtnSetIceTime { get; set; }
+
+        private void IceMaker_BtnPowerOnCommand() 
+        {
+            new PowerOnMakeIce().Publish();
+        }
+        private void IceMaker_BtnStandbyCommand() 
+        {
+            new StandbyMakeIce().Publish();
+        }
+        private void IceMaker_BtnPumpCommand()
+        {
+            new PumpMakeIce().Publish();
+        }
+        private void IceMaker_BtnStartCommand()
+        {
+            new StartMakeIce().Publish();   
+        }
+        private void IceMaker_BtnEndCommand()
+        {
+            new StopMakeIce().Publish();
+        }
+        private void IceMaker_BtnSetIceTimeCommand()
+        {
+            new SetIceNumber{ Value= IceMaker_IceTime }.Publish();
+        }
+        #endregion
+        #region 咖啡机
+        /// <summary>
+        /// 咖啡机连接状态
+        /// </summary>
+        public string CoffeeConnected { get { return _coffeeConnected; } set { _coffeeConnected = value; OnPropertyChanged(); } }
+        private string _coffeeConnected { get; set; }
+        /// <summary>
+        /// 咖啡机状态
+        /// </summary>
+        public string CoffeeStatus { get { return _coffeeStatus; } set { _coffeeStatus = value; OnPropertyChanged(); } }
+        private string _coffeeStatus { get; set; }
+        /// <summary>
+        /// 应用状态
+        /// </summary>
+        public string AppStatus { get { return _appStatus; } set { _appStatus = value; OnPropertyChanged(); } }
+        private string _appStatus { get; set; }
+        /// <summary>
+        /// 告警
+        /// </summary>
+        public string Warning { get { return _warning; } set { _warning = value; OnPropertyChanged(); } }
+        public string _warning { get; set; }
+        /// <summary>
+        /// 故障信息
+        /// </summary>
+        public string CaffeeFault { get { return _caffeeFault; } set { _caffeeFault = value; OnPropertyChanged(); } }
+        public string _caffeeFault { get; set; }
+
+        public List<string> Coffees { get; set; } = new List<string>();
+        public string SelectedCoffee { get { return _selectedCoffee; } set { _selectedCoffee = value; OnPropertyChanged(); } }
+        public string _selectedCoffee { get; set; }
+
+        public List<string> CoffeeCmds { get; set; } = new List<string>();
+        public string SelectedCoffeeCmd { get; set; }
+
+    
+        public string SimOrderCoffeeList { get { return _simOrderCoffeeList; } set { _simOrderCoffeeList = value; OnPropertyChanged(); } }
+        public string _simOrderCoffeeList { get; set; }
+        
+        /// <summary>
+        /// 制作咖啡
+        /// </summary>
+        public RelayCommand Button_MakeCoffeeCommand { get; set; }
+        /// <summary>
+        /// 停止制作咖啡
+        /// </summary>
+        public RelayCommand Button_StopMakeCoffeCommand { get; set; }
+        /// <summary>
+        /// 咖啡模式设置
+        /// </summary>
+        public RelayCommand Button_CoffeeModeSetCommand { get; set; }
+
+        private void Button_MakeCoffee()
+        {
+            EventBus.EventBus.GetInstance().Publish(new DRCoffee_MakeCoffeeEvent() { DeviceId = DeviceId, DrinkCode = (DrCoffeeDrinksCode)Enum.Parse(typeof(DrCoffeeDrinksCode), SelectedCoffee) });
+        }
+        private void Button_StopMakeCoffe()
+        {
+            EventBus.EventBus.GetInstance().Publish(new DRCoffee_CancelMakeCoffeeEvent() { DeviceId = DeviceId });
+        }
+        private void Button_CoffeeModeSet()
+        {
+            EventBus.EventBus.GetInstance().Publish(new DRCoffee_CoffeeCommCmdEvent() { DeviceId = DeviceId, CommCmd = (DrCoffeeCommCmd)Enum.Parse(typeof(DrCoffeeCommCmd), SelectedCoffeeCmd) });
+        }
+
+        #endregion
+        /// <summary>
+        /// 设备ID
+        /// </summary>
+        public int DeviceId { get; set; }
+        /// <summary>
+        /// 设备数据
+        /// </summary>
+        public ObservableCollection<VariableMonitor> variableMonitors { get; set; }
+        
+        public TestViewModel()
+        {
+            SimOrderMakeCoffee = new RelayCommand(() =>
+            {
+                new MorkTSimOrder() { OrderNum = 1, DrinkCode = (DrCoffeeDrinksCode)Enum.Parse(typeof(DrCoffeeDrinksCode), SimOrderCoffeeList) }.Publish();
+            });
+            SimOrderMakeJuice = new RelayCommand(() =>
+            {
+                new MorkTSimOrder() { OrderNum = 2, JuiceList = SimOrder_JuiceList, JuiceMakeID = SimOrder_JuiceMakeID }.Publish();
+            });
+            SimOrderMakeTea = new RelayCommand(() =>
+            {
+                new MorkTSimOrder() { OrderNum = 3 }.Publish();
+            });
+            SimOrderMakeWater = new RelayCommand(() =>
+            {
+                new MorkTSimOrder() { OrderNum = 4 }.Publish();
+            });
+            Button_RobotControlCommand = new RelayCommand<object>(Button_RobotControl);
+            Robot_DOutput = new RelayCommand(Button_RobotDoutput);
+
+            Button_MakeCoffeeCommand = new RelayCommand(Button_MakeCoffee);
+            Button_StopMakeCoffeCommand = new RelayCommand(Button_StopMakeCoffe);
+            Button_CoffeeModeSetCommand = new RelayCommand(Button_CoffeeModeSet);
+            
+            Button_MCUOuputCommand = new RelayCommand(Button_McuPWMOutput);
+            Button_MCUDOuputCommand = new RelayCommand(Button_McuDOutput);
+
+            Button_MakeJuiceCommand = new RelayCommand(Button_MakeJuice);
+
+            IceMaker_BtnPowerOn = new RelayCommand(IceMaker_BtnPowerOnCommand);
+            IceMaker_BtnStandby = new RelayCommand(IceMaker_BtnStandbyCommand);
+            IceMaker_BtnPump = new RelayCommand(IceMaker_BtnPumpCommand);
+            IceMaker_BtnStart = new RelayCommand(IceMaker_BtnStartCommand);
+            IceMaker_BtnEnd = new RelayCommand(IceMaker_BtnEndCommand);
+            IceMaker_BtnSetIceTime = new RelayCommand(IceMaker_BtnSetIceTimeCommand);
+            
+            foreach (DrCoffeeDrinksCode code in Enum.GetValues(typeof(DrCoffeeDrinksCode)))
+            {
+                Coffees.Add(code.ToString());
+            }
+            SelectedCoffee = Coffees[0];
+            SimOrderCoffeeList = Coffees[0];
+            foreach (DrCoffeeCommCmd code in Enum.GetValues(typeof(DrCoffeeCommCmd)))
+            {
+                CoffeeCmds.Add(code.ToString());
+            }
+            SelectedCoffeeCmd = CoffeeCmds[0];
+
+            Plugin.GetInstance()?.GetPlugin<DeviceMgr>()?.GetDevices().ForEach(device =>
+            {
+                if (device.Name == "MorkT") DeviceId = device.DeviceId
+                ;
+            });
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                variableMonitors = Plugin.GetInstance()?.GetPlugin<DeviceMgr>()?.GetDevices()?.FirstOrDefault(p => p.DeviceId == DeviceId)?.variableMonitors;
+                if (variableMonitors != null && variableMonitors.Count > 0)
+                {
+                    #region 机器人
+                    RobotConnected = variableMonitors.FirstOrDefault(p => p.Notes == "机器人连接状态").CurrentValue == "True" ? "已连接" : "未连接";
+                    RobotMode = variableMonitors.FirstOrDefault(p => p.Notes == "机器人状态").CurrentValue;
+                    Robot_TCPDI0 = variableMonitors.FirstOrDefault(p => p.Notes == "机器人TCP输入状态").CurrentValue;
+                    Robot_DI0 = variableMonitors.FirstOrDefault(p => p.Notes == "机器人输入0状态").CurrentValue;
+                    Robot_DI1 = variableMonitors.FirstOrDefault(p => p.Notes == "机器人输入1状态").CurrentValue;
+                    Robot_DI2 = variableMonitors.FirstOrDefault(p => p.Notes == "机器人输入2状态").CurrentValue;
+                    Robot_DI3 = variableMonitors.FirstOrDefault(p => p.Notes == "机器人输入3状态").CurrentValue;
+
+                    #endregion
+
+                    #region 咖啡机
+                    CoffeeConnected = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机连接状态").CurrentValue == "True" ? "已连接" : "未连接";
+                    CoffeeStatus = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机状态").CurrentValue;
+                    AppStatus = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机应用状态").CurrentValue;
+                    Warning = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机告警").CurrentValue;
+                    CaffeeFault = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机故障").CurrentValue;
+                    #endregion
+
+                    #region 单片机
+                    MCUConnected = variableMonitors.FirstOrDefault(p => p.Notes == "单片机连接状态").CurrentValue == "True" ? "已连接" : "未连接";
+                    MCUDI0 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入0状态").CurrentValue;
+                    MCUDI1 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入1状态").CurrentValue;
+                    MCUDI2 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入2状态").CurrentValue;
+                    MCUDI3 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入3状态").CurrentValue;
+                    MCUDI4 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入4状态").CurrentValue;
+                    MCUDI5 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入5状态").CurrentValue;
+                    MCUDI6 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入6状态").CurrentValue;
+                    MCUDI7 = variableMonitors.FirstOrDefault(p => p.Notes == "单片机输入7状态").CurrentValue;
+                    #endregion
+
+                    #region 制冰机
+                    IceMakerConnect = variableMonitors.FirstOrDefault(p => p.Notes == "制冰机连接状态").CurrentValue == "True" ? "已连接" : "未连接";
+                    IceMakerState = variableMonitors.FirstOrDefault(p => p.Notes == "制冰机设备状态").CurrentValue;
+                    #endregion
+                    
+
+                    #region 果汁机
+                    JuicerConnected = variableMonitors.FirstOrDefault(p => p.Notes == "果汁机连接状态").CurrentValue == "True" ? "已连接" : "未连接";
+                    JuiceState_Heating = variableMonitors.FirstOrDefault(p => p.Notes == "果汁机制热").CurrentValue;
+                    JuiceState_Cooling = variableMonitors.FirstOrDefault(p => p.Notes == "果汁机制冷").CurrentValue;
+                    JuiceState_LackOfWater = variableMonitors.FirstOrDefault(p => p.Notes == "果汁机缺水").CurrentValue;
+                    JuiceState_ChildLocks = variableMonitors.FirstOrDefault(p => p.Notes == "果汁机童锁").CurrentValue;
+                    JuiceState_Using = variableMonitors.FirstOrDefault(p => p.Notes == "果汁机使用").CurrentValue;
+
+                    #endregion
+                }
+                Thread.Sleep(500);
+            }), "MorkT-状态刷新");
+        }
+    }
+
diff --git a/BPASmartClient.MorkT_Container/Control_MorkT_Container.cs b/BPASmartClient.MorkT_Container/Control_MorkT_Container.cs
index a34ebd62..b51c2cfb 100644
--- a/BPASmartClient.MorkT_Container/Control_MorkT_Container.cs
+++ b/BPASmartClient.MorkT_Container/Control_MorkT_Container.cs
@@ -284,7 +284,7 @@ namespace BPASmartClient.MorkT_Container
 
             Sence(GVL_MorkT.攀华_放杯);
             Wait();
-            while (!morkTLebaiJC.RobotGetInput0)
+            if (!morkTLebaiJC.RobotGetInput0)
             {
                 DeviceProcessLogShow("咖啡杯未安全放置在放杯位");
             }
diff --git a/BPASmartClient.Morkt.JAKA.JC/Control_MORKJC.cs b/BPASmartClient.Morkt.JAKA.JC/Control_MORKJC.cs
index 0bb1e825..d5ec18bd 100644
--- a/BPASmartClient.Morkt.JAKA.JC/Control_MORKJC.cs
+++ b/BPASmartClient.Morkt.JAKA.JC/Control_MORKJC.cs
@@ -386,8 +386,8 @@ namespace BPASmartClient.MorktJAKAJC
                 if (resultTakeCup == 1)
                 {
                     DeviceProcessLogShow("咖啡杯取杯完成");
-                    new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_接咖啡 }.Publish();
-                    Wait(int.Parse(JakaModel.SENCE_接咖啡));
+                    new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_取杯位_接咖啡 }.Publish();
+                    Wait(int.Parse(JakaModel.SENCE_取杯位_接咖啡));
 
                     new DRCoffee_MakeCoffeeEvent() { DeviceId = DeviceId, DrinkCode = (DrCoffeeDrinksCode)int.Parse(mainMaterialLoc) }.Publish();  //接咖啡控制 //DrCoffeeDrinksCode.热水
                     are.WaitOne(1000 * 180);
@@ -401,8 +401,8 @@ namespace BPASmartClient.MorktJAKAJC
         }
         private void PutCoffeeCup()
         {
-            new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_放咖啡杯 }.Publish();
-            Wait(int.Parse(JakaModel.SENCE_放咖啡杯));
+            new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_接咖啡_放咖啡杯 }.Publish();
+            Wait(int.Parse(JakaModel.SENCE_接咖啡_放咖啡杯));
             int resultputCup = putCup();
             if (resultputCup == 1)
             {
@@ -735,8 +735,8 @@ namespace BPASmartClient.MorktJAKAJC
                 Thread.Sleep(100);
                 new WriteJaka() { TagName = "Set_RobotAO1", Value = 0 }.Publish();
                 Wait(0);
-                new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_取杯 }.Publish();
-                Wait(int.Parse(JakaModel.SENCE_取杯));
+                new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_取杯位检测_取杯位 }.Publish();
+                Wait(int.Parse(JakaModel.SENCE_取杯位检测_取杯位));
                 //取杯到位，使用落杯器
                 new WriteJaka() { TagName = "JakaDOutput", DO_Index = 1, Value = true }.Publish();
                 if (sensor_Sign(1)==1 ) 
@@ -768,8 +768,8 @@ namespace BPASmartClient.MorktJAKAJC
                             Thread.Sleep(100);
                             new WriteJaka() { TagName = "JakaDOutput", DO_Index = 0, Value = true }.Publish();
                             Thread.Sleep(100);
-                            new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_取杯 }.Publish();
-                            Wait(int.Parse(JakaModel.SENCE_取杯));
+                            new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_取杯位检测_取杯位 }.Publish();
+                            Wait(int.Parse(JakaModel.SENCE_取杯位检测_取杯位));
                             getCup_cnt = getCup_cnt + 1;
                             Thread.Sleep(100);
                             new WriteJaka() { TagName = "JakaDOutput", DO_Index = 0, Value = false }.Publish();
diff --git a/BPASmartClient.RobotGripper/BPASmartClient.RobotGripper.csproj b/BPASmartClient.RobotGripper/BPASmartClient.RobotGripper.csproj
new file mode 100644
index 00000000..e7b2574f
--- /dev/null
+++ b/BPASmartClient.RobotGripper/BPASmartClient.RobotGripper.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+	  <TargetFramework>net6.0</TargetFramework>
+	  <ImplicitUsings>enable</ImplicitUsings>
+	  <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" />
+    <ProjectReference Include="..\BPASmartClient.Peripheral\BPASmartClient.Peripheral.csproj" />
+    <ProjectReference Include="..\BPASmartClient.SerialPort\BPASmartClient.SerialPort.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/BPASmartClient.RobotGripper/RobotGripperMachine.cs b/BPASmartClient.RobotGripper/RobotGripperMachine.cs
new file mode 100644
index 00000000..7a55e09a
--- /dev/null
+++ b/BPASmartClient.RobotGripper/RobotGripperMachine.cs
@@ -0,0 +1,50 @@
+using System;
+using BPASmartClient.Peripheral;
+using BPASmartClient.SerialPort;
+using BPASmartClient.Model.���צ;
+using static BPASmartClient.EventBus.EventBus;
+using BPASmartClient.EventBus;
+
+namespace BPASmartClient.RobotGripper
+{
+    public class RobotGripperMachine:BasePeripheral
+    {
+        RobotGripperHelper machineHelper = new RobotGripperHelper();
+        public override void Init()
+        {
+            machineHelper.Open(communicationPar.SerialPort, communicationPar.BaudRate);
+            EventBus.EventBus.GetInstance().Subscribe<WriteGripper>(DeviceId,delegate(IEvent @event, EventCallBackHandle callBack) 
+            {
+                if (@event == null) return;
+                var par = @event as WriteGripper;
+                switch (par?.TagName) 
+                {
+                    case "PWMControl":
+                        machineHelper.Write(Convert.ToByte(par?.CH_Number), Convert.ToString(par?.PWMOutput));
+                        break;
+                    default:
+                        break;
+                }
+            });
+        }
+        public override void Start()
+        {
+
+        }
+
+        public override void Stop()
+        {
+            machineHelper.Stop(communicationPar.SerialPort);
+        }
+
+        public override void WriteData(string address, object value)
+        {
+
+        }
+
+        protected override void InitStatus()
+        {
+
+        }
+    }
+}
diff --git a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1ViewModel.cs b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1ViewModel.cs
index 8566b80a..832ee997 100644
--- a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1ViewModel.cs
+++ b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1ViewModel.cs
@@ -62,7 +62,7 @@ namespace BPASmartClient.ScreenLib
                     if (Main.GetInstance.mqttDatasDic.ContainsKey(type))
                     {
                         ScreenModelSplitMeals modelMaxWok = Main.GetInstance.mqttDatasDic[type] as ScreenModelSplitMeals;
-                        if (modelMaxWok != null && modelMaxWok.Alarm != null)
+                        if (modelMaxWok != null && modelMaxWok.Alarm != null)   
                             modelMaxWok.Alarm = modelMaxWok.Alarm?.OrderByDescending(k => DateTime.Parse(k.AlarmTime)).ToList();
                         ViewData = modelMaxWok;
 
diff --git a/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs b/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs
index 7af35177..8b1a29b1 100644
--- a/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs
+++ b/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs
@@ -236,6 +236,7 @@ namespace BPASmartClient.ScreenLib
                         string str = JsonConvert.SerializeObject(_Statsall?.OrderByDescending(k => k.Count)?.ToList());
                         StatsCountAll= JsonConvert.DeserializeObject<ObservableCollection<StatsAllModel>>(str);
                     }
+                    //假数据
                 }));
                 Thread.Sleep(1000);
             }), $"{DateTime.Now},线程服务");
diff --git a/BPASmartClient.SerialPort/RobotGripperHelper.cs b/BPASmartClient.SerialPort/RobotGripperHelper.cs
new file mode 100644
index 00000000..9e285a25
--- /dev/null
+++ b/BPASmartClient.SerialPort/RobotGripperHelper.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.IO;
+using System.IO.Ports;
+using System.Threading;
+using System.Collections.Concurrent;
+using BPASmartClient.Message;
+using BPASmartClient.Helper;
+
+namespace BPASmartClient.SerialPort
+{
+    public class RobotGripperHelper
+    {
+
+        private System.IO.Ports.SerialPort comPort = new System.IO.Ports.SerialPort();
+        public bool IsOpen => comPort.IsOpen;
+
+        public bool Open(string portName, int baudRate)
+        {
+            if (!System.IO.Ports.SerialPort.GetPortNames().Contains(portName))
+            {
+                MessageLog.GetInstance.Show($"{portName} 串口不存在");
+            }
+            if (!comPort.IsOpen)
+            {
+                comPort.PortName = portName;
+                comPort.BaudRate = baudRate;
+                comPort.DataBits = 8;
+                comPort.Parity = Parity.None;
+                comPort.StopBits = StopBits.One;
+                /*comPort.ReadTimeout = 1000;
+                comPort.WriteTimeout = 1000;*/
+                //comPort.RtsEnable = true; //设置为 true后会读取不到数据
+                comPort.DtrEnable = true;//获取或设置一个值，该值在串行通信过程中启用数据终端就绪 (DTR) 信号。
+                //comPort.RtsEnable = true;//获取或设置一个值，该值指示在串行通信中是否启用请求发送 (RTS) 信号
+                try
+                {
+                    comPort.Open();
+                }
+                catch (Exception ex)
+                {
+                    MessageLog.GetInstance.ShowEx(ex.ToString());
+                }
+            }
+           /* ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                
+                Thread.Sleep(5000);
+            }), $"开启电爪设备通讯", true);*/
+            MessageLog.GetInstance.Show($"{portName} 串口打开成功");
+            return comPort.IsOpen;
+        }
+        public bool Stop(string portName)
+        {
+            comPort.Close();
+            MessageLog.GetInstance.Show($"{portName} 串口关闭成功");
+            return comPort.IsOpen;
+        }
+        /// <summary>
+        /// 舵机控制  #000P1300T1000!
+        /// </summary>
+        /// <param name="index">通道号 0 - 5</param>
+        /// <param name="value">夹爪幅度 0500 - 2500</param>
+        /// <param name="time">夹爪时间 0000-9999</param>
+        public void Write(byte index,string value,string time ="1000")
+        {
+            byte[] PwmNumber = Encoding.ASCII.GetBytes(value);
+            byte[] Times = Encoding.ASCII.GetBytes(time);
+            //byte[] buffers = new byte[15] { 0x23, 0x30, 0x30, 0x30, 0x50, PwmNumber[0], PwmNumber[1], PwmNumber[2], PwmNumber[3], 0x54, Times[0], Times[1], Times[2], Times[3], 0x21 };
+            byte[] buffers = new byte[15] { 0x23, 0x30, 0x30, 0x30, 0x50, 0x31, 0x30, 0x35,0x30, 0x54, 0x31,0x30,0x30,0x30, 0x21 };
+            if (IsOpen) comPort.Write(buffers, 0, buffers.Length);
+        }
+    }
+}
diff --git a/DosingSystem/App.xaml.cs b/DosingSystem/App.xaml.cs
index b051e05c..292ba878 100644
--- a/DosingSystem/App.xaml.cs
+++ b/DosingSystem/App.xaml.cs
@@ -56,7 +56,7 @@ namespace BPASmartClient.DosingSystem
         protected override void OnExit(ExitEventArgs e)
         {
             base.OnExit(e);
-            Json<LocaPar>.Save();
+            Json<LocalRecipe>.Save();
             Json<DevicePar>.Save();
             Json<LocaMaterial>.Save();
             BPASmartClient.CustomResource.Pages.Model.MessageNotify.GetInstance.LogSave();
@@ -290,7 +290,7 @@ namespace BPASmartClient.DosingSystem
         private void DataInit()
         {
             //Config.GetInstance.Init();
-            Json<LocaPar>.Read();
+            Json<LocalRecipe>.Read();
             Json<DevicePar>.Read();
             Json<LocaMaterial>.Read();
         }
diff --git a/DosingSystem/Model/DeviceInquire.cs b/DosingSystem/Model/DeviceInquire.cs
index bcd7e89b..cdbe12db 100644
--- a/DosingSystem/Model/DeviceInquire.cs
+++ b/DosingSystem/Model/DeviceInquire.cs
@@ -177,12 +177,13 @@ namespace BPASmartClient.DosingSystem
                 Ping myPing = new Ping();
                 myPing.PingCompleted += new PingCompletedEventHandler(_myPing_PingCompleted);
                 myPing.SendAsync(item, 1000, null);
+                
             });
         }
 
         private void _myPing_PingCompleted(object sender, PingCompletedEventArgs e)
         {
-            if (e.Reply.Status == IPStatus.Success)
+            if (e.Reply != null && e.Reply.Status == IPStatus.Success)
             {
                 string ip = e.Reply.Address.ToString();
                 if (!DeviceLists.ContainsKey(ip))
@@ -208,13 +209,13 @@ namespace BPASmartClient.DosingSystem
                                     BottomDeviceCurrentStatuses.Add(new DeviceCurrentStatus() { DeviceName = DeviceName });
 
 
-                                for (int i = 0; i < Json<LocaPar>.Data.Recipes.Count; i++)
+                                for (int i = 0; i < Json<LocalRecipe>.Data.Recipes.Count; i++)
                                 {
-                                    for (int m = 0; m < Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.Count; m++)
+                                    for (int m = 0; m < Json<LocalRecipe>.Data.Recipes.ElementAt(i).RawMaterials.Count; m++)
                                     {
-                                        if (Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).DeviceIp == ip)
+                                        if (Json<LocalRecipe>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).DeviceIp == ip)
                                         {
-                                            Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).RawMaterialName = DeviceName;
+                                            Json<LocalRecipe>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).RawMaterialName = DeviceName;
                                         }
                                     }
                                 }
@@ -278,7 +279,11 @@ namespace BPASmartClient.DosingSystem
                 }
                 else IPQueues.Enqueue(e.Reply.Address.ToString());
             }
-            else IPQueues.Enqueue(e.Reply.Address.ToString());
+            else
+            {
+                if(e.Reply !=null)
+                    IPQueues.Enqueue(e.Reply.Address.ToString());
+            }
         }
     }
 
diff --git a/DosingSystem/Model/par/LocaPar.cs b/DosingSystem/Model/par/LocalRecipe.cs
similarity index 93%
rename from DosingSystem/Model/par/LocaPar.cs
rename to DosingSystem/Model/par/LocalRecipe.cs
index 992f898f..8b5cc4ae 100644
--- a/DosingSystem/Model/par/LocaPar.cs
+++ b/DosingSystem/Model/par/LocalRecipe.cs
@@ -9,7 +9,7 @@ using BPASmartClient.Model;
 
 namespace BPASmartClient.DosingSystem
 {
-    public class LocaPar
+    public class LocalRecipe
     {
         public ObservableCollection<RecipeModel> Recipes { get; set; } = new ObservableCollection<RecipeModel>();
 
diff --git a/DosingSystem/View/NewRecipeView.xaml.cs b/DosingSystem/View/NewRecipeView.xaml.cs
index 4e8e1be4..b2d9eefa 100644
--- a/DosingSystem/View/NewRecipeView.xaml.cs
+++ b/DosingSystem/View/NewRecipeView.xaml.cs
@@ -26,7 +26,7 @@ namespace BPASmartClient.DosingSystem.View
             this.btClose.Click += (o, e) => { this.Close(); };
             this.br.MouseLeftButtonDown += (o, e) => { if (e.LeftButton == MouseButtonState.Pressed) this.DragMove(); };
             ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "CloseNewRecipeView", true);
-            this.Unloaded += (o, s) => { Json<LocaPar>.Save(); };
+            this.Unloaded += (o, s) => { Json<LocalRecipe>.Save(); };
         }
 
         private void cb_SelectionChanged(object sender, SelectionChangedEventArgs e)
diff --git a/DosingSystem/View/RecipeSettingsView.xaml.cs b/DosingSystem/View/RecipeSettingsView.xaml.cs
index 55bf6e65..fe2f5a1d 100644
--- a/DosingSystem/View/RecipeSettingsView.xaml.cs
+++ b/DosingSystem/View/RecipeSettingsView.xaml.cs
@@ -30,7 +30,7 @@ namespace BPASmartClient.DosingSystem.View
 
         private void RecipeSettingsView_Unloaded(object sender, RoutedEventArgs e)
         {
-            Json<LocaPar>.Save();
+            Json<LocalRecipe>.Save();
         }
 
         //public static void SetAlignment()
diff --git a/DosingSystem/ViewModel/ChangeDeviceNameViewModel.cs b/DosingSystem/ViewModel/ChangeDeviceNameViewModel.cs
index c5a76db4..614de6ed 100644
--- a/DosingSystem/ViewModel/ChangeDeviceNameViewModel.cs
+++ b/DosingSystem/ViewModel/ChangeDeviceNameViewModel.cs
@@ -38,11 +38,11 @@ namespace BPASmartClient.DosingSystem.ViewModel
                             res.RawMaterialName = DeviceName;
                             DeviceInquire.GetInstance.devices.ElementAt(index).DeviceName = DeviceName;
                             DeviceInquire.GetInstance.GetDevice(IpAddress).SetDeviceName(DeviceName);//设置PLC名称
-                            for (int i = 0; i < Json<LocaPar>.Data.Recipes.Count; i++)
+                            for (int i = 0; i < Json<LocalRecipe>.Data.Recipes.Count; i++)
                             {
-                                for (int m = 0; m < Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.Count; m++)
+                                for (int m = 0; m < Json<LocalRecipe>.Data.Recipes.ElementAt(i).RawMaterials.Count; m++)
                                 {
-                                    Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).RawMaterialName = DeviceName;
+                                    Json<LocalRecipe>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).RawMaterialName = DeviceName;
                                 }
                             }
                             ActionManage.GetInstance.Send("ChangeDeviceNameViewClose");
diff --git a/DosingSystem/ViewModel/NewRecipeViewModel.cs b/DosingSystem/ViewModel/NewRecipeViewModel.cs
index cb6f474b..54da0130 100644
--- a/DosingSystem/ViewModel/NewRecipeViewModel.cs
+++ b/DosingSystem/ViewModel/NewRecipeViewModel.cs
@@ -37,7 +37,7 @@ namespace BPASmartClient.DosingSystem.ViewModel
                         RawMaterials.Add(item);
                     }
                     RecipCode = rm.RecipCode;
-                    Index = Array.FindIndex(Json<LocaPar>.Data.Recipes.ToArray(), p => p.RecipeName == RecipeName);
+                    Index = Array.FindIndex(Json<LocalRecipe>.Data.Recipes.ToArray(), p => p.RecipeName == RecipeName);
                 }
             }), "Details", true);
 
@@ -82,17 +82,17 @@ namespace BPASmartClient.DosingSystem.ViewModel
                 }
 
                 //编辑配方
-                if (Index >= 0 && Index < Json<LocaPar>.Data.Recipes.Count)
+                if (Index >= 0 && Index < Json<LocalRecipe>.Data.Recipes.Count)
                 {
-                    var res = Array.FindIndex(Json<LocaPar>.Data.Recipes.ToArray(), p => p.RecipeName == RecipeName);
+                    var res = Array.FindIndex(Json<LocalRecipe>.Data.Recipes.ToArray(), p => p.RecipeName == RecipeName);
                     if (res >= 0 && res != Index)
                     {
                         ErrorInfo = "配方名称已经存在！";
                         MessageNotify.GetInstance.ShowDialog("配方名称已经存在！", DialogType.Warning);
                         return;
                     }
-                    Json<LocaPar>.Data.Recipes.ElementAt(Index).RecipeName = RecipeName;
-                    Json<LocaPar>.Data.Recipes.ElementAt(Index).RawMaterials.Clear();
+                    Json<LocalRecipe>.Data.Recipes.ElementAt(Index).RecipeName = RecipeName;
+                    Json<LocalRecipe>.Data.Recipes.ElementAt(Index).RawMaterials.Clear();
                     RawMaterials.ToList()?.ForEach(item =>
                     {
                         var res = DeviceInquire.GetInstance.devices.FirstOrDefault(p => p.DeviceName == item.RawMaterialName);
@@ -105,14 +105,14 @@ namespace BPASmartClient.DosingSystem.ViewModel
                         {
                             item.RawMaterialSource = 0;
                         }
-                        Json<LocaPar>.Data.Recipes.ElementAt(Index).RawMaterials.Add(item);
+                        Json<LocalRecipe>.Data.Recipes.ElementAt(Index).RawMaterials.Add(item);
                     });
-                    Json<LocaPar>.Save();
+                    Json<LocalRecipe>.Save();
                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{RecipeName} 配方编辑完成");
                 }
                 else //新建配方
                 {
-                    if (Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipeName == RecipeName) != null)
+                    if (Json<LocalRecipe>.Data.Recipes.FirstOrDefault(p => p.RecipeName == RecipeName) != null)
                     {
                         ErrorInfo = "配方名称已存在！";
                         MessageNotify.GetInstance.ShowDialog("配方名称已经存在！", DialogType.Warning);
@@ -133,12 +133,12 @@ namespace BPASmartClient.DosingSystem.ViewModel
                         }
                         TempRawMaterials.Add(item);
                     });
-                    Json<LocaPar>.Data.Recipes.Add(new RecipeModel()
+                    Json<LocalRecipe>.Data.Recipes.Add(new RecipeModel()
                     {
                         RecipeName = RecipeName,
                         RawMaterials = TempRawMaterials,
                     });
-                    Json<LocaPar>.Save();
+                    Json<LocalRecipe>.Save();
                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"新建配方成功!");
                 }
                 ActionManage.GetInstance.Send("CloseNewRecipeView");
@@ -177,9 +177,9 @@ namespace BPASmartClient.DosingSystem.ViewModel
             var dates = date.Split("-").ToList();
             StringBuilder sb = new StringBuilder();
             dates?.ForEach((item) => { sb.Append(item); });
-            Json<LocaPar>.Data.Recipes.Add(new RecipeModel()
+            Json<LocalRecipe>.Data.Recipes.Add(new RecipeModel()
             {
-                SerialNum = Json<LocaPar>.Data.Recipes.Count + 1,
+                SerialNum = Json<LocalRecipe>.Data.Recipes.Count + 1,
                 RawMaterials = RawMaterials,
                 RecipCode = sb.ToString(),
                 RecipeName = RecipeName,
diff --git a/DosingSystem/ViewModel/RecipeControlViewModel.cs b/DosingSystem/ViewModel/RecipeControlViewModel.cs
index 0198a7da..41efb490 100644
--- a/DosingSystem/ViewModel/RecipeControlViewModel.cs
+++ b/DosingSystem/ViewModel/RecipeControlViewModel.cs
@@ -45,7 +45,7 @@ namespace BPASmartClient.DosingSystem.ViewModel
                         await Task.Factory.StartNew(new Action(() =>
                         {
                             Recipes.ElementAt(index).IsEnable = true;
-                            Json<LocaPar>.Data.Recipes.ElementAt(index).IsEnable = true;
+                            Json<LocalRecipe>.Data.Recipes.ElementAt(index).IsEnable = true;
                             Recipes.ElementAt(index).Are.Set();
                             App.Current.Dispatcher.Invoke(new Action(() => { recipeProcesses.Clear(); }));
                             SiemensDevice.GetInstance.MySiemens.Write("M10.5", true);
@@ -89,7 +89,7 @@ namespace BPASmartClient.DosingSystem.ViewModel
                        
                     }
                     Recipes.ElementAt(index).IsEnable = false;
-                    Json<LocaPar>.Data.Recipes.ElementAt(index).IsEnable = false;
+                    Json<LocalRecipe>.Data.Recipes.ElementAt(index).IsEnable = false;
                 }
                 MessageNotify.GetInstance.ShowUserLog($"下发工单 {Recipes.ElementAt(index).RecipeName}");
                 RecipeNames.Enqueue(deviceName);
@@ -124,7 +124,7 @@ namespace BPASmartClient.DosingSystem.ViewModel
 
                         #region 配方下发到PLC操作相关
                         //配方数据写入到输送机
-                        var res = Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipeName == CurrentRecipeName);
+                        var res = Json<LocalRecipe>.Data.Recipes.FirstOrDefault(p => p.RecipeName == CurrentRecipeName);
                         /*List<int> recipeData = new List<int>();*/
                         List<int> BarrelNum = new List<int>();
                         if (res != null)
@@ -574,7 +574,7 @@ namespace BPASmartClient.DosingSystem.ViewModel
                                         else
                                         {
                                             int a1 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == cnt);
-                                            Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a1).DeviceName && p.Loc == barrel);
+                                            Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName ==              DeviceInquire.GetInstance.devices.ElementAt(a1).DeviceName && p.Loc == barrel);
                                         }
                                         if (Location1 >= 0)
                                         {
@@ -654,7 +654,7 @@ namespace BPASmartClient.DosingSystem.ViewModel
                                     int recipIndex = Array.FindIndex(Recipes.ToArray(), p => p.RecipeName == CurrentRecipeName);
                                     App.Current.Dispatcher.Invoke(new Action(() => { recipeProcesses.Clear(); }));
                                     Recipes.ElementAt(recipIndex).IsEnable = true;
-                                    Json<LocaPar>.Data.Recipes.ElementAt(recipIndex).IsEnable = true;
+                                    Json<LocalRecipe>.Data.Recipes.ElementAt(recipIndex).IsEnable = true;
                                     Recipes.ElementAt(recipIndex).Are.Set();
                                     Thread.Sleep(100);
                                 }
@@ -672,7 +672,7 @@ namespace BPASmartClient.DosingSystem.ViewModel
 
         public BPARelayCommand<object> CancelRecipeCommand { get; set; }
 
-        public static ObservableCollection<RecipeModel> Recipes { get; set; } = Json<LocaPar>.Data.Recipes;
+        public static ObservableCollection<RecipeModel> Recipes { get; set; } = Json<LocalRecipe>.Data.Recipes;
 
         public static string CurrentRecipeName { get { return _RecipeName; } set { _RecipeName = value; OnStaticPropertyChanged(); } }
         private static string _RecipeName;
diff --git a/DosingSystem/ViewModel/RecipeSettingsViewModel.cs b/DosingSystem/ViewModel/RecipeSettingsViewModel.cs
index 903a0212..7e97422b 100644
--- a/DosingSystem/ViewModel/RecipeSettingsViewModel.cs
+++ b/DosingSystem/ViewModel/RecipeSettingsViewModel.cs
@@ -24,7 +24,7 @@ namespace BPASmartClient.DosingSystem.ViewModel
     {
         public RecipeSettingsViewModel()
         {
-            Recipes = Json<LocaPar>.Data.Recipes;
+            Recipes = Json<LocalRecipe>.Data.Recipes;
 
             NewMaterital = new BPARelayCommand(() =>
             {
@@ -39,7 +39,7 @@ namespace BPASmartClient.DosingSystem.ViewModel
             });
             SaveRecipe = new BPARelayCommand(() =>
             {
-                Json<LocaPar>.Save();
+                Json<LocalRecipe>.Save();
                 MessageNotify.GetInstance.ShowUserLog("保存配方");
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"配方保存成功!");
             });
@@ -49,11 +49,11 @@ namespace BPASmartClient.DosingSystem.ViewModel
                 {
                     if (MessageNotify.GetInstance.ShowDialog($"是否删除【{o.ToString()}】配方,删除后数据将永久丢失！无法找回", DialogType.Warning))
                     {
-                        var res = Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipeName == o.ToString());
+                        var res = Json<LocalRecipe>.Data.Recipes.FirstOrDefault(p => p.RecipeName == o.ToString());
                         if (res.IsEnable)
                         {
-                            if (res != null) Json<LocaPar>.Data.Recipes.Remove(res);
-                            Json<LocaPar>.Save();
+                            if (res != null) Json<LocalRecipe>.Data.Recipes.Remove(res);
+                            Json<LocalRecipe>.Save();
                             NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"配方删除成功!");
                             MessageNotify.GetInstance.ShowUserLog($"删除配方 {res.RecipeName}");
                         }
@@ -69,7 +69,7 @@ namespace BPASmartClient.DosingSystem.ViewModel
             {
                 if (!string.IsNullOrEmpty(o?.ToString()))
                 {
-                    var res = Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipeName == o.ToString());
+                    var res = Json<LocalRecipe>.Data.Recipes.FirstOrDefault(p => p.RecipeName == o.ToString());
                     if (res != null)
                     {
                         NewRecipeView nrv = new NewRecipeView();
diff --git a/SmartClient.sln b/SmartClient.sln
index 2dd4ef5d..f075fdb1 100644
--- a/SmartClient.sln
+++ b/SmartClient.sln
@@ -202,7 +202,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.DosingSystem
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "设备监控", "设备监控", "{106E84C1-CAC5-4F14-9E31-201D3202C9FD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.MaxWokControl", "BPASmartClient.MaxWokControl\BPASmartClient.MaxWokControl.csproj", "{888382C0-6750-4E81-BED3-0F38775DCCCB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MaxWokControl", "BPASmartClient.MaxWokControl\BPASmartClient.MaxWokControl.csproj", "{888382C0-6750-4E81-BED3-0F38775DCCCB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkS3", "BPASmartClient.MorkS3\BPASmartClient.MorkS3.csproj", "{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.RobotGripper", "BPASmartClient.RobotGripper\BPASmartClient.RobotGripper.csproj", "{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.MilkTeaCube", "BPASmartClient.MilkTeaCube\BPASmartClient.MilkTeaCube.csproj", "{915F0718-B7AC-428D-ACD5-7DAACC28539F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1898,6 +1904,66 @@ Global
 		{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|x64.Build.0 = Release|Any CPU
 		{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|x86.ActiveCfg = Release|Any CPU
 		{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|x86.Build.0 = Release|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Debug|x64.Build.0 = Debug|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Debug|x86.Build.0 = Debug|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Release|ARM.Build.0 = Release|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Release|ARM64.Build.0 = Release|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Release|x64.ActiveCfg = Release|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Release|x64.Build.0 = Release|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Release|x86.ActiveCfg = Release|Any CPU
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}.Release|x86.Build.0 = Release|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Debug|x64.Build.0 = Debug|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Debug|x86.Build.0 = Debug|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Release|ARM.Build.0 = Release|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Release|ARM64.Build.0 = Release|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Release|x64.ActiveCfg = Release|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Release|x64.Build.0 = Release|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Release|x86.ActiveCfg = Release|Any CPU
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}.Release|x86.Build.0 = Release|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Debug|x64.Build.0 = Debug|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Debug|x86.Build.0 = Debug|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Release|ARM.Build.0 = Release|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Release|ARM64.Build.0 = Release|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Release|x64.ActiveCfg = Release|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Release|x64.Build.0 = Release|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Release|x86.ActiveCfg = Release|Any CPU
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1992,6 +2058,9 @@ Global
 		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
 		{106E84C1-CAC5-4F14-9E31-201D3202C9FD} = {7BE13E55-D8B1-4232-AE63-8BF122633297}
 		{888382C0-6750-4E81-BED3-0F38775DCCCB} = {106E84C1-CAC5-4F14-9E31-201D3202C9FD}
+		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}
+		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F} = {666CB1A9-562E-453A-A2C7-FD9D77CFDFDD}
+		{915F0718-B7AC-428D-ACD5-7DAACC28539F} = {666CB1A9-562E-453A-A2C7-FD9D77CFDFDD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC}

From 0cf3d2e264e5f8c1093dcdfe864e9e30a2da4a83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Thu, 16 Feb 2023 16:17:18 +0800
Subject: [PATCH 07/96] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88morks=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.Device/BaseDevice.cs           |  9 ++--
 BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs    | 54 +++++++++++--------
 .../Control_MorkSUpgradedVer.cs               | 50 +++++++++--------
 .../GVL_MorkSUpgradedVer.cs                   |  2 +
 .../NoodleShidModel.cs                        | 21 ++++++++
 .../OrderStatusViewModel.cs                   | 16 +++---
 6 files changed, 95 insertions(+), 57 deletions(-)
 create mode 100644 BPASmartClient.MorkSUpgradedVer/NoodleShidModel.cs

diff --git a/BPASmartClient.Device/BaseDevice.cs b/BPASmartClient.Device/BaseDevice.cs
index dfb1b7ff..e5b10552 100644
--- a/BPASmartClient.Device/BaseDevice.cs
+++ b/BPASmartClient.Device/BaseDevice.cs
@@ -104,7 +104,7 @@ namespace BPASmartClient.Device
         /// </summary>
         protected ConcurrentDictionary<string, object> peripheralStatus = new ConcurrentDictionary<string, object>();
 
-        protected 
+        protected
 
         /// <summary>
         /// 外设设备集合
@@ -145,7 +145,7 @@ namespace BPASmartClient.Device
         /// </summary>
         /// <param name="address"></param>
         /// <param name="value"></param>
-        public void WriteControlExact(string address, object value,int i)
+        public void WriteControlExact(string address, object value, int i)
         {
             if (peripherals != null)
             {
@@ -205,7 +205,7 @@ namespace BPASmartClient.Device
                             Status.Update($"{TypeName}.{key}", peripheral.GetAllStatus()[key]);
                         }
                     }
-                    if(dicPort2peripheralStatus.ContainsKey(i))
+                    if (dicPort2peripheralStatus.ContainsKey(i))
                     {
                         dicPort2peripheralStatus[i] = newPeripheralStatus;
                     }
@@ -361,6 +361,7 @@ namespace BPASmartClient.Device
                         {
                             ThreadManage.GetInstance().StopTask($"GvlStatusMonitor:{DeviceId}", new Action(() =>
                             {
+                                ActionManage.GetInstance.Send("ClearOrders");
                                 ResetProgram();
                                 ResetStatus();
                                 InitTask();
@@ -380,7 +381,7 @@ namespace BPASmartClient.Device
             {
                 ReadData();
                 Thread.Sleep(10);
-            }), $"ReadData:{DeviceId}",true);
+            }), $"ReadData:{DeviceId}", true);
             #endregion
 
             #region 任务流程
diff --git a/BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs b/BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs
index 53bbb097..07f19945 100644
--- a/BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs
+++ b/BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs
@@ -14,36 +14,44 @@ namespace BPASmartClient.PLC
         ModbusTcp modbusTcp = new ModbusTcp();
         public override void Init()
         {
-            Task.Run(new Action(() => { modbusTcp.ModbusTcpConnect(communicationPar.IPAddress, communicationPar.IPPort); })); //PLC 设备连接
-
-            Thread.Sleep(1000);
-
-            ThreadManage.GetInstance().StartLong(new Action(() =>
+            modbusTcp.IsReconnect = true;
+            Task.Run(new Action(() =>
             {
-                IsConnected = modbusTcp.Connected;
-                if (!IsConnected) IsWork = false;
-                while (IsConnected)
+                modbusTcp.ConnectOk = new Action(() =>
                 {
-                    IsWork = true;
-                    foreach (var par in variables)
+                    ThreadManage.GetInstance().StartLong(new Action(() =>
                     {
-                        if (par?.Address.Length > 0)
+                        IsConnected = modbusTcp.Connected;
+                        if (!IsConnected) IsWork = false;
+                        while (IsConnected)
                         {
-                            var res = modbusTcp.Read(par.Address, (ushort)par.ReadLeng);
-                            if (status.ContainsKey(par.Address))
-                            {
-                                status[par.Address] = res;
-                            }
-                            else
+                            IsWork = true;
+                            foreach (var par in variables)
                             {
-                                status.TryAdd(par.Address, res);
+                                if (par?.Address.Length > 0)
+                                {
+                                    var res = modbusTcp.Read(par.Address, (ushort)par.ReadLeng);
+                                    if (status.ContainsKey(par.Address))
+                                    {
+                                        status[par.Address] = res;
+                                    }
+                                    else
+                                    {
+                                        status.TryAdd(par.Address, res);
+                                    }
+                                }
                             }
+                            Thread.Sleep(100);
                         }
-                    }
-                    Thread.Sleep(100);
-                }
-                Thread.Sleep(1000);
-            }), $"设备[{DeviceId}][{modbusTcp.IPAdress}]PLC读取线程", true);
+                        Thread.Sleep(1000);
+                    }), $"设备[{DeviceId}][{modbusTcp.IPAdress}]PLC读取线程", true);
+                });
+                modbusTcp.ModbusTcpConnect(communicationPar.IPAddress, communicationPar.IPPort);
+            })); //PLC 设备连接
+
+            Thread.Sleep(1000);
+
+
 
             //写入数据
             EventBus.EventBus.GetInstance().Subscribe<WriteModel>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index 1cc13130..a62caf77 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -323,6 +323,12 @@ namespace BPASmartClient.MorkSUpgradedVer
             mORKS.TakeBowlTaskCount = mORKS.TakeBowlTask.Count;
             mORKS.RBTakeNoodleTaskCount = mORKS.RBTakeNoodleTask.Count;
 
+            for (int i = 0; i < Json<MorksPar>.Data.parSets.Count; i++)
+            {
+                mORKS.nsm.ElementAt(i).IsShield = Json<MorksPar>.Data.parSets.ElementAt(i).IsShield;
+                mORKS.nsm.ElementAt(i).NoodleCookerStatus = mORKS.NoodleCookerStatus[i];
+            }
+
         }
 
         /// <summary>
@@ -507,7 +513,6 @@ namespace BPASmartClient.MorkSUpgradedVer
                                         {
                                             if (!mORKS.TurntableLowPosition)
                                             {
-                                                //WriteData("M32.7", false); 定位完成复位
                                                 DeviceProcessLogShow($"执行了转台启动互锁信号复位");
                                             }
                                             TurntableStart(loc);
@@ -562,29 +567,29 @@ namespace BPASmartClient.MorkSUpgradedVer
             {
                 if (mORKS.CurrentLoc == mORKS.CurrentFeedbackLoc)
                 {
-                    int loc = Array.FindIndex(mORKS.NoodleCookerStatus, p => p == false);//查找煮面炉空闲位置
+                    //int loc = Array.FindIndex(mORKS.NoodleCookerStatus, p => p == false);//查找煮面炉空闲位置
+                    int loc = mORKS.nsm.ToList().FindIndex(p => p.NoodleCookerStatus == false && p.IsShield == false);//查找煮面炉空闲位置
                     if (loc >= 0 && loc <= 5)
                     {
-                        if (!Json<MorksPar>.Data.parSets.ElementAt(loc).IsShield)//检查该煮面篮是否被屏蔽
+                        //if (!Json<MorksPar>.Data.parSets.ElementAt(loc).IsShield)//检查该煮面篮是否被屏蔽
+                        //{
+                        if (mORKS.RBTakeNoodleTask.TryDequeue(out OrderLocInfo orderLocInfo))
                         {
-                            if (mORKS.RBTakeNoodleTask.TryDequeue(out OrderLocInfo orderLocInfo))
-                            {
-                                //写入煮面时间
-                                List<ushort> values = new List<ushort>();
-                                values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
-                                values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
-                                WriteData($"VW{324 + (loc * 4)}", values.ToArray());
-
-                                mORKS.CurrentLoc = 0;
-                                mORKS.CookNodelId[loc] = orderLocInfo.SuborderId;
-                                mORKS.NoodleCookerStatus[loc] = true;
-                                SetFallNoodleLoc((ushort)(loc + 1));
-                                //机器人开始取面
-                                OrderChange(orderLocInfo.SuborderId, ORDER_STATUS.COOKING);
-                                DeviceProcessLogShow($"订单【{orderLocInfo.SuborderId}】,机器人倒面至【{loc + 1}】号煮面栏");
-
-                                mORKS.TakeNoodleInterlock = true;
-                            }
+                            //写入煮面时间
+                            List<ushort> values = new List<ushort>();
+                            values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
+                            values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
+                            WriteData($"VW{324 + (loc * 4)}", values.ToArray());
+
+                            mORKS.CurrentLoc = 0;
+                            mORKS.CookNodelId[loc] = orderLocInfo.SuborderId;
+                            mORKS.NoodleCookerStatus[loc] = true;
+                            SetFallNoodleLoc((ushort)(loc + 1));
+                            //机器人开始取面
+                            OrderChange(orderLocInfo.SuborderId, ORDER_STATUS.COOKING);
+                            DeviceProcessLogShow($"订单【{orderLocInfo.SuborderId}】,机器人倒面至【{loc + 1}】号煮面栏");
+
+                            mORKS.TakeNoodleInterlock = true;
                         }
                     }
                 }
@@ -657,7 +662,8 @@ namespace BPASmartClient.MorkSUpgradedVer
             }
 
             int OutMealRequstCount = mORKS.CookNoodleCom.Where(p => p == true).ToList().Count;
-            int mlCount = mORKS.NoodleCookerStatus.Where(p => p == true).ToList().Count;
+            //int mlCount = mORKS.NoodleCookerStatus.Where(p => p == true).ToList().Count - Json<MorksPar>.Data.parSets.Where(x => x.IsShield == true).ToList().Count;
+            int mlCount = mORKS.nsm.Where(p => p.NoodleCookerStatus == true && p.IsShield == false).ToList().Count;
             int index = Array.FindIndex(mORKS.CookNodelId, p => p == mORKS.IngredientsCompleteId);
 
             bool isok = index >= 0 && index < mORKS.CookNoodleCom.Length && mORKS.CookNoodleCom[index];
diff --git a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
index 159574ed..e923f434 100644
--- a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
@@ -107,6 +107,8 @@ namespace BPASmartClient.MorkSUpgradedVer
         public List<DoOrderEvent> doOrderEvents { get; set; } = new List<DoOrderEvent>();
 
         public List<string> HistorySuborderId { get; set; } = new List<string>();
+
+        public NoodleShidModel[] nsm { get; set; } = new NoodleShidModel[6] { new NoodleShidModel(), new NoodleShidModel(), new NoodleShidModel(), new NoodleShidModel(), new NoodleShidModel(), new NoodleShidModel() };
         #endregion
 
         #region 订单ID记录
diff --git a/BPASmartClient.MorkSUpgradedVer/NoodleShidModel.cs b/BPASmartClient.MorkSUpgradedVer/NoodleShidModel.cs
new file mode 100644
index 00000000..6a9d27c8
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/NoodleShidModel.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkSUpgradedVer
+{
+    public class NoodleShidModel
+    {
+        /// <summary>
+        /// 是否被屏蔽，true:屏蔽,false:未屏蔽
+        /// </summary>
+        public bool IsShield { get; set; }
+
+        /// <summary>
+        /// 是否忙碌，true:忙碌，FALSE：空闲
+        /// </summary>
+        public bool NoodleCookerStatus { get; set; }
+    }
+}
diff --git a/BPASmartClient.ViewModel/OrderStatusViewModel.cs b/BPASmartClient.ViewModel/OrderStatusViewModel.cs
index fcab5843..ab3b4d1a 100644
--- a/BPASmartClient.ViewModel/OrderStatusViewModel.cs
+++ b/BPASmartClient.ViewModel/OrderStatusViewModel.cs
@@ -38,14 +38,14 @@ namespace BPASmartClient.ViewModel
         public static void Init()
         {
             //清除订单数据
-            //ActionManage.GetInstance.Register(new Action(() =>
-            //{
-            //    Application.Current.Dispatcher.Invoke(() =>
-            //    {
-            //        orderStatusLists.Clear();
-            //        WaitTakeMeal.Clear();
-            //    });
-            //}), "ClearOrders");
+            ActionManage.GetInstance.Register(new Action(() =>
+            {
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    orderStatusLists.Clear();
+                    WaitTakeMeal.Clear();
+                });
+            }), "ClearOrders");
 
             ActionManage.GetInstance.Register(new Action<object[]>((o) =>
             {

From 4bdd812966b0de94f9ecc69118649ebf02a4f8f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Thu, 23 Feb 2023 18:00:29 +0800
Subject: [PATCH 08/96] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Control_MorkSUpgradedVer.cs               | 50 ++++++++++---------
 BPASmartClient/BPASmartClient.csproj          |  1 -
 DosingSystem/App.xaml.cs                      |  2 +
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index a62caf77..fef122c1 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -488,44 +488,48 @@ namespace BPASmartClient.MorkSUpgradedVer
             else
             {
                 //正常轮询
-                if (mORKS.SiloInPlace && !mORKS.Feeding && mORKS.InitComplete && !mORKS.AllowTakeNoodle && mORKS.RBTakeNoodleTask.Count > 0)
+                if (Delay.GetInstance("到位检测延时").Start(mORKS.SiloInPlace, 2))
                 {
-                    var result = orderMaterialDelivery.BatchingInfo.Where(p => p.BatchingId == mORKS.RBTakeNoodleTask.ElementAt(0).BatchingId).ToList();
-                    if (result != null)
+                    if (mORKS.SiloInPlace && !mORKS.Feeding && mORKS.InitComplete && !mORKS.AllowTakeNoodle && mORKS.RBTakeNoodleTask.Count > 0)
                     {
-                        var res = result.FirstOrDefault(P => P.BatchingLoc == mORKS.CurrentFeedbackLoc.ToString());
-                        if (mORKS.TurntableLowPosition && res != null)
-                        {
-                            TurntableStart(mORKS.CurrentFeedbackLoc);
-                            mORKS.TurntableLocLists.Clear();
-                            mORKS.AllowTakeNoodle = true;
-                            DeviceProcessLogShow($"控制机器人去转台【{mORKS.CurrentFeedbackLoc}】号位置取面");
-                        }
-                        else
+
+                        var result = orderMaterialDelivery.BatchingInfo.Where(p => p.BatchingId == mORKS.RBTakeNoodleTask.ElementAt(0).BatchingId).ToList();
+                        if (result != null)
                         {
-                            if (!mORKS.TurntableInterlock)
+                            var res = result.FirstOrDefault(P => P.BatchingLoc == mORKS.CurrentFeedbackLoc.ToString());
+                            if (mORKS.TurntableLowPosition && res != null)
+                            {
+                                TurntableStart(mORKS.CurrentFeedbackLoc);
+                                mORKS.TurntableLocLists.Clear();
+                                mORKS.AllowTakeNoodle = true;
+                                DeviceProcessLogShow($"控制机器人去转台【{mORKS.CurrentFeedbackLoc}】号位置取面");
+                            }
+                            else
                             {
-                                foreach (var item in result)
+                                if (!mORKS.TurntableInterlock)
                                 {
-                                    if (ushort.TryParse(item.BatchingLoc, out ushort loc))
+                                    foreach (var item in result)
                                     {
-                                        if (mORKS.CurrentFeedbackLoc != loc && !mORKS.TurntableLocLists.Contains(loc))
+                                        if (ushort.TryParse(item.BatchingLoc, out ushort loc))
                                         {
-                                            if (!mORKS.TurntableLowPosition)
+                                            if (mORKS.CurrentFeedbackLoc != loc && !mORKS.TurntableLocLists.Contains(loc))
                                             {
-                                                DeviceProcessLogShow($"执行了转台启动互锁信号复位");
+                                                if (!mORKS.TurntableLowPosition)
+                                                {
+                                                    DeviceProcessLogShow($"执行了转台启动互锁信号复位");
+                                                }
+                                                TurntableStart(loc);
+                                                DeviceProcessLogShow($"没有物料检测的启动转台控制,转台位置：[{loc}]");
+                                                break;
                                             }
-                                            TurntableStart(loc);
-                                            DeviceProcessLogShow($"没有物料检测的启动转台控制,转台位置：[{loc}]");
-                                            break;
+                                            else if (mORKS.CurrentFeedbackLoc == loc && !mORKS.TurntableLocLists.Contains(loc)) mORKS.TurntableLocLists.Add(loc);
                                         }
-                                        else if (mORKS.CurrentFeedbackLoc == loc && !mORKS.TurntableLocLists.Contains(loc)) mORKS.TurntableLocLists.Add(loc);
                                     }
                                 }
                             }
                         }
+                        else DeviceProcessLogShow("未找到可用的物料信息");
                     }
-                    else DeviceProcessLogShow("未找到可用的物料信息");
                 }
             }
 
diff --git a/BPASmartClient/BPASmartClient.csproj b/BPASmartClient/BPASmartClient.csproj
index b1233974..3231f725 100644
--- a/BPASmartClient/BPASmartClient.csproj
+++ b/BPASmartClient/BPASmartClient.csproj
@@ -46,7 +46,6 @@
     <ProjectReference Include="..\BPASmartClient.MorkT_HQ\BPASmartClient.MorkTHQ.csproj" />
     <ProjectReference Include="..\BPASmartClient.SCChip\BPASmartClient.SCChip.csproj" />
     <ProjectReference Include="..\BPASmartClient.ViewModel\BPASmartClient.ViewModel.csproj" />
-    <ProjectReference Include="..\FryPot_DosingSystem\FryPot_DosingSystem.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/DosingSystem/App.xaml.cs b/DosingSystem/App.xaml.cs
index 292ba878..49e8932b 100644
--- a/DosingSystem/App.xaml.cs
+++ b/DosingSystem/App.xaml.cs
@@ -65,6 +65,8 @@ namespace BPASmartClient.DosingSystem
 
         private void MenuInit()
         {
+            NfcServer.GetInstance.Init();
+
             #region 配方管理菜单
             ObservableCollection<SubMenumodel> RecipeManage = new ObservableCollection<SubMenumodel>();
             RecipeManage.Add(new SubMenumodel()

From 25b26e8ea02adbafb9d9c9798f41bb6a2e7b48dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Tue, 7 Mar 2023 17:17:51 +0800
Subject: [PATCH 09/96] =?UTF-8?q?=E7=85=AE=E9=9D=A2=E6=9C=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkS/Control_Morks.cs         | 23 ++++-
 BPASmartClient.MorkS/Model/MorksPar.cs        |  5 +
 BPASmartClient.MorkS/View/ParSet.xaml         | 31 ++++++-
 .../ViewModel/ParSetViewModel.cs              |  8 +-
 DosingSystem/Model/DeviceInquire.cs           | 93 ++++++++++++-------
 5 files changed, 124 insertions(+), 36 deletions(-)

diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index 392448eb..31dd41f2 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -34,7 +34,7 @@ namespace BPASmartClient.MorkS
 
         public override void DoMain()
         {
-            MonitorViewModel.DeviceId = DeviceId;   
+            MonitorViewModel.DeviceId = DeviceId;
             ServerInit();
             DataParse();
             Json<MorksPar>.Read();
@@ -406,7 +406,7 @@ namespace BPASmartClient.MorkS
                 TakeBowlControl(orderLocInfo.Loc);
                 SetRecipeNumber(orderLocInfo.RecipeNumber);
                 OrderChange(mORKS.TakeBowlId, ORDER_STATUS.COOKING);
-                DeviceProcessLogShow($"订单【{ mORKS.TakeBowlId}】执行取碗控制,位置:[{orderLocInfo.Loc}]");
+                DeviceProcessLogShow($"订单【{mORKS.TakeBowlId}】执行取碗控制,位置:[{orderLocInfo.Loc}]");
                 mORKS.TakeBowlInterlock = true;
             }
         }
@@ -619,7 +619,7 @@ namespace BPASmartClient.MorkS
                         mORKS.OutMealName = mORKS.IngredientsCompleteName;
                         mORKS.IngredientsCompleteId = string.Empty;
                         mORKS.CookNodelId[loc] = string.Empty;
-                        DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{ mORKS.OutMealId}");
+                        DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{mORKS.OutMealId}");
 
                         mORKS.OutNoodleing = true;
                     }
@@ -653,6 +653,12 @@ namespace BPASmartClient.MorkS
                 WaitMeaLSpeak(mORKS.OutMealName);
             }
 
+            //加汤
+            if (Delay.GetInstance("加汤延时判断").Start(mORKS.TakeMealDetect && mORKS.CookCompleteFlatBit, 1))
+            {
+                AddSoup();
+            }
+
             //取餐完成逻辑处理
             if (Delay.GetInstance("CompleteChange1").Start(!mORKS.TakeMealDetect, 1) && mORKS.CookCompleteFlatBit == true)
             {
@@ -792,6 +798,17 @@ namespace BPASmartClient.MorkS
             WriteData("VW6", loc);
         }
 
+        /// <summary>
+        /// 加汤控制
+        /// </summary>
+        private async void AddSoup()
+        {
+            //M0.6
+            WriteData("M0.6", true);
+            await Task.Delay(Convert.ToInt32(Json<MorksPar>.Data.AddSoupTime * 1000));
+            WriteData("M0.6", false);
+        }
+
         /// <summary>
         /// 取碗控制
         /// </summary>
diff --git a/BPASmartClient.MorkS/Model/MorksPar.cs b/BPASmartClient.MorkS/Model/MorksPar.cs
index ce8a62f9..77b6eb6d 100644
--- a/BPASmartClient.MorkS/Model/MorksPar.cs
+++ b/BPASmartClient.MorkS/Model/MorksPar.cs
@@ -12,5 +12,10 @@ namespace BPASmartClient.MorkS.Model
     internal class MorksPar
     {
         public ObservableCollection<ParSet> parSets { get; set; } = new ObservableCollection<ParSet>();
+
+        /// <summary>
+        /// 加汤时间，单位秒
+        /// </summary>
+        public float AddSoupTime { get; set; } = 2;
     }
 }
diff --git a/BPASmartClient.MorkS/View/ParSet.xaml b/BPASmartClient.MorkS/View/ParSet.xaml
index e7974246..76207e4e 100644
--- a/BPASmartClient.MorkS/View/ParSet.xaml
+++ b/BPASmartClient.MorkS/View/ParSet.xaml
@@ -76,7 +76,12 @@
 
         <!--  参数放置面板  -->
         <Grid Grid.Row="2">
-            <ItemsControl ItemsSource="{Binding parSets}">
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition Height="50" />
+            </Grid.RowDefinitions>
+
+            <ItemsControl Grid.Row="0" ItemsSource="{Binding parSets}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
@@ -122,6 +127,30 @@
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
 
+            <StackPanel Grid.Row="1" Orientation="Horizontal">
+                <TextBlock
+                    FontSize="21"
+                     Margin="40 0 0 0"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="加汤时间:" />
+                <TextBox
+                    Width="100"
+                    Margin="10,0,0,0"
+                    VerticalAlignment="Center"
+                    Background="Transparent"
+                    BorderBrush="#FF23CACA"
+                    CaretBrush="Aqua"
+                    FontFamily="楷体"
+                    FontSize="21"
+                    Foreground="#ff34f7f7"
+                    Text="{Binding AddSoup}" />
+                <TextBlock
+                    FontSize="21"
+                    Margin="10 0 0 0"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="(秒)" />
+            </StackPanel>
+
         </Grid>
 
     </Grid>
diff --git a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
index 2639b78c..b99f3a7f 100644
--- a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
+++ b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
@@ -19,13 +19,19 @@ namespace BPASmartClient.MorkS.ViewModel
             SaveInfoCommand = new RelayCommand(SaveSettingData);
 
             ActionManage.GetInstance.Register(SaveSettingData, "初始化设定煮面时间");
-            
+
         }
 
         public RelayCommand SaveInfoCommand { get; set; }
 
         public ObservableCollection<ParSet> parSets { get; set; } = Json<MorksPar>.Data.parSets;
 
+        /// <summary>
+        /// 加汤时间设置
+        /// </summary>
+        public float AddSoup { get { return Json<MorksPar>.Data.AddSoupTime; } set { Json<MorksPar>.Data.AddSoupTime = value; OnPropertyChanged(); } }
+
+
         private void SaveSettingData()
         {
             List<ushort> values = new List<ushort>();
diff --git a/DosingSystem/Model/DeviceInquire.cs b/DosingSystem/Model/DeviceInquire.cs
index cdbe12db..d674e6c9 100644
--- a/DosingSystem/Model/DeviceInquire.cs
+++ b/DosingSystem/Model/DeviceInquire.cs
@@ -59,11 +59,42 @@ namespace BPASmartClient.DosingSystem
                     }
                 }
                 Thread.Sleep(200);
-            }), "设备状态监听",true);
+            }), "设备状态监听", true);
+        }
+
+        private void aa(int num, string name)
+        {
+            DeviceLists.TryAdd($"192.168.1.{num}", new DeviceStatus() { DeviceName = $"{name}" });
+            TopDeviceCurrentStatuses.Add(new DeviceCurrentStatus()
+            {
+                DeviceName = $"{name}",
+                DeviceNum = num,
+                Weight = new Random().Next(100, 10000) / 100.0
+            });
+            Global.DeviceRawMaterials.Add(new RawMaterialModel()
+            {
+                DeviceIp = $"192.168.1.{num}",
+                RawMaterialName = $"{name}",
+            });
+            devices.Add(new Devices()
+            {
+                DeviceName = $"{name}",
+                DeviceNum = num,
+                IpAddress = $"192.168.1.{num}",
+            });
         }
 
         private void TestData()
         {
+
+            //aa(1, "盐");
+            //aa(2, "郫县豆瓣");
+            //aa(3, "芥菜");
+            //aa(4, "调味剂");
+            //aa(5, "香料");
+            //aa(6, "鸡精");
+            //aa(7, "味精");
+
             for (int i = 0; i < 8; i++)
             {
                 DeviceLists.TryAdd($"192.168.1.{i + 1}", new DeviceStatus() { DeviceName = $"测试设备{i + 1}" });
@@ -169,7 +200,7 @@ namespace BPASmartClient.DosingSystem
             }*/
             for (int i = 0; i < 15; i++)
             {
-                IPLists.Add($"{IPSegment}{(i+1)*10}");
+                IPLists.Add($"{IPSegment}{(i + 1) * 10}");
             }
 
             IPLists.ForEach((item) =>
@@ -177,7 +208,7 @@ namespace BPASmartClient.DosingSystem
                 Ping myPing = new Ping();
                 myPing.PingCompleted += new PingCompletedEventHandler(_myPing_PingCompleted);
                 myPing.SendAsync(item, 1000, null);
-                
+
             });
         }
 
@@ -281,7 +312,7 @@ namespace BPASmartClient.DosingSystem
             }
             else
             {
-                if(e.Reply !=null)
+                if (e.Reply != null)
                     IPQueues.Enqueue(e.Reply.Address.ToString());
             }
         }
@@ -356,39 +387,39 @@ namespace BPASmartClient.DosingSystem
                 var res = Json<DevicePar>.Data.deviceParModels.FirstOrDefault(p => p.MaterialName == DeviceName);
                 if (res != null)
                 {
-                    prop1:
-                        modbusTcp.SetReal(DeviceAddress.SlowlyAddWeight, res.SlowlyAddWeight);
-                        var Value1 = (float)this.modbusTcp.GetReal(DeviceAddress.SlowlyAddWeight);
-                        if (Value1 != null && Value1.ToString() != res.SlowlyAddWeight.ToString()) goto prop1;
+                prop1:
+                    modbusTcp.SetReal(DeviceAddress.SlowlyAddWeight, res.SlowlyAddWeight);
+                    var Value1 = (float)this.modbusTcp.GetReal(DeviceAddress.SlowlyAddWeight);
+                    if (Value1 != null && Value1.ToString() != res.SlowlyAddWeight.ToString()) goto prop1;
                     prop2:
-                        modbusTcp.SetReal(DeviceAddress.PreCloseValveWeight, res.PreCloseValveWeight);
-                        var Value2 = (float)this.modbusTcp.GetReal(DeviceAddress.PreCloseValveWeight);
-                        if (Value2 != null && Value2.ToString() != res.PreCloseValveWeight.ToString()) goto prop2;
+                    modbusTcp.SetReal(DeviceAddress.PreCloseValveWeight, res.PreCloseValveWeight);
+                    var Value2 = (float)this.modbusTcp.GetReal(DeviceAddress.PreCloseValveWeight);
+                    if (Value2 != null && Value2.ToString() != res.PreCloseValveWeight.ToString()) goto prop2;
                     prop3:
-                        modbusTcp.SetUint(DeviceAddress.RapidAcceleration, (uint)res.RapidAcceleration);
-                        var Value3 = this.modbusTcp.GetUint(DeviceAddress.RapidAcceleration);
-                        if (Value3 != null && Value3.ToString() != res.RapidAcceleration.ToString()) goto prop3;
+                    modbusTcp.SetUint(DeviceAddress.RapidAcceleration, (uint)res.RapidAcceleration);
+                    var Value3 = this.modbusTcp.GetUint(DeviceAddress.RapidAcceleration);
+                    if (Value3 != null && Value3.ToString() != res.RapidAcceleration.ToString()) goto prop3;
                     prop4:
-                        modbusTcp.SetUint(DeviceAddress.SlowAcceleration, (uint)res.SlowAcceleration);
-                        var Value4 = this.modbusTcp.GetUint(DeviceAddress.SlowAcceleration);
-                        if (Value4 != null && Value4.ToString() != res.SlowAcceleration.ToString()) goto prop4;
-                    prop5:    
-                        modbusTcp.SetUint(DeviceAddress.ServoManualSpeed, (uint)res.ServoManualSpeed);
-                        var Value5 = this.modbusTcp.GetUint(DeviceAddress.ServoManualSpeed);
-                        if (Value5 != null && Value5.ToString() != res.ServoManualSpeed.ToString()) goto prop5;
+                    modbusTcp.SetUint(DeviceAddress.SlowAcceleration, (uint)res.SlowAcceleration);
+                    var Value4 = this.modbusTcp.GetUint(DeviceAddress.SlowAcceleration);
+                    if (Value4 != null && Value4.ToString() != res.SlowAcceleration.ToString()) goto prop4;
+                    prop5:
+                    modbusTcp.SetUint(DeviceAddress.ServoManualSpeed, (uint)res.ServoManualSpeed);
+                    var Value5 = this.modbusTcp.GetUint(DeviceAddress.ServoManualSpeed);
+                    if (Value5 != null && Value5.ToString() != res.ServoManualSpeed.ToString()) goto prop5;
                     prop6:
-                        modbusTcp.SetUint(DeviceAddress.SiloUpperLimitWeight, (uint)res.SiloUpperLimitWeight);
-                        var Value6 = this.modbusTcp.GetUint(DeviceAddress.SiloUpperLimitWeight);
-                        if (Value6 != null && Value6.ToString() != res.SiloUpperLimitWeight.ToString()) goto prop6;
+                    modbusTcp.SetUint(DeviceAddress.SiloUpperLimitWeight, (uint)res.SiloUpperLimitWeight);
+                    var Value6 = this.modbusTcp.GetUint(DeviceAddress.SiloUpperLimitWeight);
+                    if (Value6 != null && Value6.ToString() != res.SiloUpperLimitWeight.ToString()) goto prop6;
                     prop7:
-                        modbusTcp.SetUint(DeviceAddress.LowerLimitWeightOfSilo, (uint)res.LowerLimitWeightOfSilo);
-                        var Value7 = this.modbusTcp.GetUint(DeviceAddress.LowerLimitWeightOfSilo);
-                        if (Value7 != null && Value7.ToString() != res.LowerLimitWeightOfSilo.ToString()) goto prop7;
+                    modbusTcp.SetUint(DeviceAddress.LowerLimitWeightOfSilo, (uint)res.LowerLimitWeightOfSilo);
+                    var Value7 = this.modbusTcp.GetUint(DeviceAddress.LowerLimitWeightOfSilo);
+                    if (Value7 != null && Value7.ToString() != res.LowerLimitWeightOfSilo.ToString()) goto prop7;
                     prop8:
-                        modbusTcp.SetUint(DeviceAddress.StirringSpeed, (uint)res.StirringSpeed);
-                        var Value8 = this.modbusTcp.GetUint(DeviceAddress.StirringSpeed);
-                        if (Value8 != null && Value8.ToString() != res.StirringSpeed.ToString()) goto prop8;
-                        MessageNotify.GetInstance.ShowRunLog($"{res.MaterialName},配料参数下发完成");
+                    modbusTcp.SetUint(DeviceAddress.StirringSpeed, (uint)res.StirringSpeed);
+                    var Value8 = this.modbusTcp.GetUint(DeviceAddress.StirringSpeed);
+                    if (Value8 != null && Value8.ToString() != res.StirringSpeed.ToString()) goto prop8;
+                    MessageNotify.GetInstance.ShowRunLog($"{res.MaterialName},配料参数下发完成");
                 }
                 //prop9:
                 //    modbusTcp.SetReal(DeviceAddress.WeightSet, Value);//写入配方重量

From 1d3c4cf335d44da1e1270b7f54ed803df6773cfa Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Tue, 7 Mar 2023 17:33:15 +0800
Subject: [PATCH 10/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Model/AlarmHelper.cs                |    2 +-
 .../Pages/View/RunLogView.xaml                |    2 +-
 .../Pages/View/UserLogView.xaml               |    2 +-
 BPASmartClient.JXJFoodBigStation/App.xaml.cs  |   11 +-
 .../BPASmartClient.JXJFoodBigStation.csproj   |    7 +
 .../Model/GVL_BigStation.cs                   |   59 +-
 .../Model/HK_PLC/HKDeviceStatus.cs            |   14 +-
 .../Model/HK_PLC/HKPlcCommAddress.cs          |   13 -
 .../Model/HK_PLC/StockBinName.cs              |   28 +-
 .../Model/HardWare/BomMaterial.cs             |   16 +
 .../Model/ProcessControl.cs                   |  901 +++++++----
 .../Model/RawMaterial/RawMaterial.cs          |   14 +-
 .../Model/Siemens/SiemensDeviceStatus.cs      |   77 +-
 .../View/BomOfMaterialView.xaml               |  122 ++
 .../View/BomOfMaterialView.xaml.cs            |   28 +
 .../View/ManualFlowView.xaml                  |   85 +-
 .../View/SiemensRecipeSendDownView.xaml       |    2 +-
 .../View/StockBinRawMaterialView.xaml         |   36 +-
 .../ViewModel/BomOfMaterialViewModel.cs       |   75 +
 .../ViewModel/ManualFlowViewModel.cs          |   69 +-
 .../ViewModel/RecipeInfosViewModel.cs         |   10 +-
 .../ViewModel/RecipeSendDownViewModel.cs      |    2 +-
 .../ViewModel/StockBinRawMaterialViewModel.cs |   28 +-
 .../App.xaml.cs                               |    9 +-
 .../Model/GVL/PlcCommAttribute.cs             |   20 +
 .../Model/GVL/PlcInfos.cs                     |   27 +
 .../Model/GVL_SmallStation.cs                 |   73 +-
 .../Model/HK_PLC/DataComm.cs                  |   41 -
 .../Model/HK_PLC/HKDeviceRead.cs              |   16 +
 .../Model/HK_PLC/HKDeviceStatus.cs            |   71 +-
 .../Model/HK_PLC/PlcReadAddressDB3.cs         |  171 ++-
 .../Model/ProcessControl.cs                   | 1315 ++++++++++-------
 .../Model/RawMaterial/DeviceInquire.cs        |    8 +-
 .../Model/RawMaterial/DeviceParModel.cs       |    3 +
 .../Model/Siemens/RemoteRecipeData.cs         |    1 +
 .../Model/Siemens/RemoteRecipeDataColl.cs     |    2 +
 .../Model/Siemens/SiemensDeviceStatus.cs      |   58 +-
 .../View/DeviceMaterialParView.xaml           |   33 +-
 .../View/ManualFlowView.xaml                  |    4 +-
 .../View/PlcVarMonitorView.xaml               |   99 ++
 .../View/PlcVarMonitorView.xaml.cs            |   28 +
 .../View/RobotView.xaml                       |  197 +--
 .../ViewModel/ManualFlowViewModel.cs          |   34 +-
 .../ViewModel/PlcVarMonitorViewModel.cs       |   23 +
 .../ViewModel/RobotViewModel.cs               |   87 +-
 .../ViewModel/StockBinRawMaterialViewModel.cs |    2 +-
 BPASmartClient.JakaRobot/JaKaHelper.cs        |    3 +-
 BPASmartClient.S7Net/EntityClassResolution.cs |    2 +-
 .../ViewModel/RecipeControlViewModel.cs       |    2 +-
 SmartClient.sln                               |    4 +-
 WpfControlLibrary1/AssemblyInfo.cs            |   10 +
 WpfControlLibrary1/UserControl1.xaml          |   12 +
 WpfControlLibrary1/UserControl1.xaml.cs       |   28 +
 WpfControlLibrary1/WpfControlLibrary1.csproj  |    9 +
 54 files changed, 2699 insertions(+), 1296 deletions(-)
 delete mode 100644 BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKPlcCommAddress.cs
 create mode 100644 BPASmartClient.JXJFoodBigStation/Model/HardWare/BomMaterial.cs
 create mode 100644 BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml
 create mode 100644 BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml.cs
 create mode 100644 BPASmartClient.JXJFoodBigStation/ViewModel/BomOfMaterialViewModel.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcCommAttribute.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcInfos.cs
 delete mode 100644 BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/DataComm.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceRead.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
 create mode 100644 BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/ViewModel/PlcVarMonitorViewModel.cs
 create mode 100644 WpfControlLibrary1/AssemblyInfo.cs
 create mode 100644 WpfControlLibrary1/UserControl1.xaml
 create mode 100644 WpfControlLibrary1/UserControl1.xaml.cs
 create mode 100644 WpfControlLibrary1/WpfControlLibrary1.csproj

diff --git a/BPASmartClient.CustomResource/Pages/Model/AlarmHelper.cs b/BPASmartClient.CustomResource/Pages/Model/AlarmHelper.cs
index 785250d5..a1aa60c6 100644
--- a/BPASmartClient.CustomResource/Pages/Model/AlarmHelper.cs
+++ b/BPASmartClient.CustomResource/Pages/Model/AlarmHelper.cs
@@ -25,7 +25,7 @@ namespace BPASmartClient.CustomResource.Pages.Model
                 if (string.IsNullOrEmpty(name)) name = typeof(AlarmT).Name;
                 if (_Instance == null) _Instance = new ConcurrentDictionary<string, AlarmT>();
                 if (!_Instance.ContainsKey(name)) _Instance.TryAdd(name, new AlarmT());
-                return _Instance[name]; 
+                return _Instance[name];
             }
         }
         private AlarmHelper() { }
diff --git a/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml b/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
index e265a036..3067d1df 100644
--- a/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
+++ b/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
@@ -234,7 +234,7 @@
         <ScrollViewer
             Grid.Row="2"
             HorizontalScrollBarVisibility="Hidden"
-            VerticalScrollBarVisibility="Hidden">
+            VerticalScrollBarVisibility="Visible">
 
             <Grid>
                 <!--#region 实时报警信息-->
diff --git a/BPASmartClient.CustomResource/Pages/View/UserLogView.xaml b/BPASmartClient.CustomResource/Pages/View/UserLogView.xaml
index 94b69fe5..58ac02a5 100644
--- a/BPASmartClient.CustomResource/Pages/View/UserLogView.xaml
+++ b/BPASmartClient.CustomResource/Pages/View/UserLogView.xaml
@@ -310,7 +310,7 @@
         <ScrollViewer
             Grid.Row="2"
             HorizontalScrollBarVisibility="Hidden"
-            VerticalScrollBarVisibility="Hidden">
+            VerticalScrollBarVisibility="Visible">
 
             <Grid>
                 <!--#region 实时报警信息-->
diff --git a/BPASmartClient.JXJFoodBigStation/App.xaml.cs b/BPASmartClient.JXJFoodBigStation/App.xaml.cs
index fc562273..354b9dc1 100644
--- a/BPASmartClient.JXJFoodBigStation/App.xaml.cs
+++ b/BPASmartClient.JXJFoodBigStation/App.xaml.cs
@@ -57,6 +57,7 @@ namespace BPASmartClient.JXJFoodBigStation
             Json<LocalRecipe>.Save();
             Json<RemoteRecipe>.Save();
             Json<RawMaterialData>.Save();
+            Json<BomMaterial>.Save();
             base.OnExit(e);
             MessageNotify.GetInstance.LogSave();
             ThreadManage.GetInstance().Dispose();
@@ -104,6 +105,13 @@ namespace BPASmartClient.JXJFoodBigStation
                 AssemblyName = "BPASmartClient.JXJFoodBigStation",
                 ToggleWindowPath = "View.StockBinRawMaterialView"
             });
+            StockBinManage.Add(new SubMenumodel()
+            {
+                SubMenuName = "MES原料数据",
+                SubMenuPermission = new Permission[] { Permission.管理员 },
+                AssemblyName = "BPASmartClient.JXJFoodBigStation",
+                ToggleWindowPath = "View.BomOfMaterialView"
+            });
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
             {
                 MainMenuIcon = "&#xe683;",
@@ -141,7 +149,7 @@ namespace BPASmartClient.JXJFoodBigStation
             InfoLog.Add(new SubMenumodel()
             {
                 SubMenuName = "调试日志",
-                SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员, Permission.技术员 },
+                SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员 },
                 AssemblyName = "BPASmartClient.CustomResource",
                 ToggleWindowPath = "Pages.View.DebugLogView"
             });
@@ -223,6 +231,7 @@ namespace BPASmartClient.JXJFoodBigStation
             Json<LocalRecipe>.Read();
             Json<RemoteRecipe>.Read();
             Json<RawMaterialData>.Read();
+            Json<BomMaterial>.Read();
         }
 
     }
diff --git a/BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj b/BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj
index 6a9d7c00..d487ecaa 100644
--- a/BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj
+++ b/BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj
@@ -32,6 +32,9 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
+    <Compile Update="View\BomOfMaterialView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="View\StockBinRawMaterialView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -52,6 +55,10 @@
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="View\BomOfMaterialView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="View\StockBinRawMaterialView.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <SubType>Designer</SubType>
diff --git a/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs b/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs
index 476ffcf6..624df1bd 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs
@@ -16,13 +16,32 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// plc心跳上传
         /// </summary>
         public static bool HeartBeatFromPlc { get; set; }
+        /// <summary>
+        /// 订单取消的状态位
+        /// </summary>
         public static bool Order_Cancel { get; set; }
-
+        /// <summary>
+        /// 订单取消的配方号
+        /// </summary>
         public static string Order_CancelRecipeCode { get; set; } = "";
+        public static int Order_CancelStep { get; set; }
+        /// <summary>
+        /// 第一个配方的配料时间
+        /// </summary>
         public static DateTime DosingRecipe1Time { get; set; }
+        /// <summary>
+        /// 第二个配方的配料时间
+        /// </summary>
         public static DateTime DosingRecipe2Time { get; set; }
+        /// <summary>
+        /// 第三个配方的配料时间
+        /// </summary>
         public static DateTime DosingRecipe3Time { get; set; }
+        /// <summary>
+        /// 第四个配方的配料时间
+        /// </summary>
         public static DateTime DosingRecipe4Time { get; set; }
+
         /// <summary>
         /// plc心跳下发
         /// </summary>
@@ -48,14 +67,29 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// </summary>
         public static bool IsUseLocalRecipe { get; set; } = false;
 
+        /// <summary>
+        /// 洗桶的标识符
+        /// </summary>
         public static bool BarrelWasherSign { get; set; }
         /// <summary>
         /// 订单请求
         /// </summary>
         public static bool Order_Request { get; set; } = false;
+        /// <summary>
+        /// 下发配方的状态位
+        /// </summary>
         public static int SiemensSendRecipeStatus { get; set; } = 0;
 
+        /// <summary>
+        /// 大料站最大的料仓数目
+        /// </summary>
         public const int Max_DosingSotckBinNum = 14;
+        public static StockBinName stockBinName { get; set; } = new StockBinName();
+
+        /// <summary>
+        /// 原料的名称和原料编号对应，Mes提供的信息
+        /// </summary>
+        public static Dictionary<string, string> RawMaterialsNameCode { get; set; } = new Dictionary<string, string>();
 
         public static ushort AGVPutTray { get; set; }
         public static ushort AGVGetTray { get; set; }
@@ -64,30 +98,37 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         public static ushort TrayCylinder { get; set; }
 
         public static DB_Read HKPlc_Read = new DB_Read();
-        public static bool IsUseLocalName { get; set; } = true;
 
-        public static bool IsAllowHKPlcConnect { get; set; }
-        public static bool IsAllowSiemensConnect { get; set; }
         /// <summary>
-        /// 海科plc初始化完成标志
+        /// 是否连接海科PLC
         /// </summary>
-        public static bool HKPlcInitComple { get; set; }
+        public static bool IsAllowHKPlcConnect { get; set; }
         /// <summary>
-        /// 西门子plc初始化完成标志
+        /// 是否连接西门子PLC
         /// </summary>
-        public static bool SiemensInitComple { get; set; }
+        public static bool IsAllowSiemensConnect { get; set; }
 
         /// <summary>
-        /// 
+        /// 配方1配料完成
         /// </summary>
         public static bool Recipe1DosingFinish { get; set; } = false;
+        /// <summary>
+        /// 配方2配料完成
+        /// </summary>
         public static bool Recipe2DosingFinish { get; set; } = false;
+        /// <summary>
+        /// 配方3配料完成
+        /// </summary>
         public static bool Recipe3DosingFinish { get; set; } = false;
+        /// <summary>
+        /// 配方4配料完成
+        /// </summary>
         public static bool Recipe4DosingFinish { get; set; } = false;
 
         /// <summary>
         /// 订单是否是洗桶
         /// </summary>
         public static bool Order_IsWashingBarrel { get; set; } = false;
+        public static int TrayEnable { get; set; } = 15;
     }
 }
diff --git a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
index aa60f2d7..b384f96d 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
@@ -18,7 +18,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
         public bool IsConnected => HK_PLC_S7.IsConnected;
         public DB_Read PlcRead = new DB_Read();
         public DL_DataColl_DB DataColl =new DL_DataColl_DB();
-        public StockBinName StockBinName = new StockBinName();
         public void Init()
         {
             try
@@ -29,12 +28,17 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
             catch (Exception ex) {
                 MessageNotify.GetInstance.ShowRunLog("DB99块初始化值 失败");
             }
-            ThreadManage.GetInstance().StartLong(new Action(() => 
-            {
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {/*
+                var res = HK_PLC_S7.ReadClass<StockBinName>(97);//料仓里原料的编码
+                if (res != null && res is StockBinName data9)
+                {
+                    GVL_BigStation.stockBinName = data9;
+                }*/
                 if (IsConnected)
                 {
                     var res1 = HK_PLC_S7.ReadClass<DB_Read>(98);
-                    var res2 = HK_PLC_S7.ReadClass<StockBinName>(97);
+                    var res2 = HK_PLC_S7.ReadClass<StockBinName>(97);//料仓里原料的编码
                     if (res1 != null && res1 is DB_Read data1)
                     {
                         PlcRead = data1;
@@ -42,7 +46,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
                     }
                     if (res2 != null && res2 is StockBinName data2)
                     {
-                        StockBinName = data2;
+                        GVL_BigStation.stockBinName = data2;
                     }
                     var res3 = HK_PLC_S7.ReadClass<DL_DataColl_DB>(48);
                     if (res3 != null && res3 is DL_DataColl_DB data)
diff --git a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKPlcCommAddress.cs b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKPlcCommAddress.cs
deleted file mode 100644
index b571013d..00000000
--- a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKPlcCommAddress.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
-{
-    public class HKPlcCommAddress
-    {
-
-    }
-}
diff --git a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/StockBinName.cs b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/StockBinName.cs
index d3fc305f..0aa62220 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/StockBinName.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/StockBinName.cs
@@ -9,33 +9,33 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
 {
     public class StockBinName
     {
-        [Siemens(6)]
+        [Siemens(4)]
         public string RawMaterialName1 { get; set; } = "";
-        [Siemens(6)]
+        [Siemens(4)]
         public string RawMaterialName2 { get; set; } = "";
-        [Siemens(6)]
+        [Siemens(4)]
         public string RawMaterialName3 { get; set; } = "";
-        [Siemens(6)]
+        [Siemens(4)]
         public string RawMaterialName4 { get; set; } = "";
-        [Siemens(6)]
+        [Siemens(4)]
         public string RawMaterialName5 { get; set; } = "";
-        [Siemens(6)]
+        [Siemens(4)]
         public string RawMaterialName6 { get; set; } = "";
-        [Siemens(6)]
+        [Siemens(4)]
         public string RawMaterialName7 { get; set; } = "";
-        [Siemens(6)]
+        [Siemens(4)]
         public string RawMaterialName8 { get; set; } = "";
-        [Siemens(6)]
+        [Siemens(4)]
         public string RawMaterialName9 { get; set; } = "";
-        [Siemens(6)]
+        [Siemens(4)]
         public string RawMaterialName10 { get; set; } = "";
-        [Siemens(6)]
+        [Siemens(4)]
         public string RawMaterialName11 { get; set; } = "";
-        [Siemens(6)]
+        [Siemens(4)]
         public string RawMaterialName12 { get; set; } = "";
-        [Siemens(6)]
+        [Siemens(4)]
         public string RawMaterialName13 { get; set; } = "";
-        [Siemens(6)]
+        [Siemens(4)]
         public string RawMaterialName14 { get; set; } = "";
     }
 }
diff --git a/BPASmartClient.JXJFoodBigStation/Model/HardWare/BomMaterial.cs b/BPASmartClient.JXJFoodBigStation/Model/HardWare/BomMaterial.cs
new file mode 100644
index 00000000..6dc11273
--- /dev/null
+++ b/BPASmartClient.JXJFoodBigStation/Model/HardWare/BomMaterial.cs
@@ -0,0 +1,16 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodBigStation.Model
+{
+    public class BomMaterial
+    {
+        public ObservableCollection<RawMaterial> RawMaterials { get; set; } = new ObservableCollection<RawMaterial>();
+
+    }
+}
diff --git a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
index 52566728..b5f1a742 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Configuration;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -46,8 +47,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// <summary>
         /// 原料的名称和料仓的位置对应
         /// </summary>
-        public Dictionary<string, short> RawMaterialsNamePos = new Dictionary<string, short>();
-        public ObservableCollection<RawMaterial> RawMaterialsInfo => Json<RawMaterialData>.Data.RawMaterial;
+        public ConcurrentDictionary<int, string> RawMaterialsNamePos = new ConcurrentDictionary<int, string>();
+        /// <summary>
+        /// 硬件料仓的原料信息
+        /// </summary>
+        public ObservableCollection<RawMaterial> HardWareRawMaterialInfo { get; set; } = new ObservableCollection<RawMaterial>();
+        public ObservableCollection<RawMaterial> RawMaterialsInfo { get; set; } = new ObservableCollection<RawMaterial>();
         /// <summary>
         /// 西门子配方队列
         /// </summary>
@@ -62,10 +67,17 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         public ConcurrentQueue<string> LocalRecipeQueue2 = new ConcurrentQueue<string>();
         public ConcurrentQueue<string> LocalRecipeQueue3 = new ConcurrentQueue<string>();
         public ConcurrentQueue<string> LocalRecipeQueue4 = new ConcurrentQueue<string>();
+
+        /// <summary>
+        /// 海科PLC的IP
+        /// </summary>
+        public string HK_PLC_IP = ConfigurationManager.AppSettings["HKPlc_IP"];
+        /// <summary>
+        /// 西门子PLC的IP
+        /// </summary>
+        public string Siemens_PLC_IP = ConfigurationManager.AppSettings["Siemens_IP"];
         public void Init()
         {
-            testRawMaterialNameData();//自定义料仓名称
-            ActionManage.GetInstance.CancelRegister("SiemensSendRecipe");
             ActionManage.GetInstance.Register(new Action<object>((res) =>
             {
                 ObservableCollection<RawMaterial> RawMaterials = new ObservableCollection<RawMaterial>();
@@ -76,19 +88,20 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         RawMaterials.Clear();
                         for (int i = 0; i < GVL_BigStation.Max_DosingSotckBinNum; i++)
                         {
-                            if (RawMaterialsNamePos.ContainsKey(recipe.Material[i].Material_Name))
+                            int index = RawMaterialsNamePos.Values.ToList().IndexOf(recipe.Material[i].Material_Name);
+                            if (index>=0)
                             {
                                 RawMaterials.Add(new RawMaterial()
                                 {
                                     RawMaterialName = recipe.Material[i].Material_Name,
                                     RawMaterialBarrelNum = recipe.Material[i].Material_BarrelNum,
                                     RawMaterialWeight = recipe.Material[i].Material_Weight,
-                                    RawMaterialLocation = (int)RawMaterialsNamePos[recipe.Material[i].Material_Name]
+                                    RawMaterialLocation = RawMaterialsNamePos.Keys.ToList()[index]
                                 });
                             }
                             else
                             {
-                                MessageNotify.GetInstance.ShowAlarmLog($"本地原料名称和西门子下发的原料名称无法对应，原料位置：{i}");
+                                MessageNotify.GetInstance.ShowAlarmLog($"本地原料名称和西门子下发的原料名称无法对应，原料名称：{recipe.Material[i].Material_Name},");
                             }
                         }
                         App.Current.Dispatcher.Invoke(() =>
@@ -105,155 +118,10 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                 }
             }), "SiemensSendRecipe", true);
-            string HK_PLC_IP = ConfigurationManager.AppSettings["HKPlc_IP"];
-            string Siemens_PLC_IP = ConfigurationManager.AppSettings["Siemens_IP"];
-            GVL_BigStation.IsAllowHKPlcConnect = ConfigurationManager.AppSettings["HKPlc_Connect"].ToLower() == "true" ? true : false;
-            GVL_BigStation.IsAllowSiemensConnect = ConfigurationManager.AppSettings["Siemens_Connect"].ToLower() == "true" ? true : false;
-            try
-            {
-                if (GVL_BigStation.IsAllowHKPlcConnect)
-                {
-                    HKDevice.HK_PLC_S7.Connect(S7.Net.CpuType.S71500, HK_PLC_IP);
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageNotify.GetInstance.ShowAlarmLog("海科plc连接失败，等待重新连接");
-            }
-            finally 
-            {
-                HKDevice.Init();
-                MessageNotify.GetInstance.ShowRunLog("海科plc初始化");
-                if (HKDevice.IsConnected && GVL_BigStation.IsAllowHKPlcConnect)
-                {
-                    MessageNotify.GetInstance.ShowRunLog("海科plc连接成功");
-                }
-            }
-            try
-            {
-                if (GVL_BigStation.IsAllowSiemensConnect)
-                {
-                    SiemensDevice.Siemens_PLC_S7.Connect(S7.Net.CpuType.S71500, Siemens_PLC_IP);
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageNotify.GetInstance.ShowAlarmLog("西门子plc连接失败，等待重新连接");
-            }
-            finally 
-            {
-                SiemensDevice.Init();
-                MessageNotify.GetInstance.ShowRunLog("西门子plc初始化");
-                if (SiemensDevice.IsConnected && GVL_BigStation.IsAllowSiemensConnect)
-                {
-                    MessageNotify.GetInstance.ShowRunLog("西门子plc连接成功");
-                }
-            }
-            ThreadManage.GetInstance().StartLong(new Action(() =>
-            {
-                if (!HKDevice.IsConnected && GVL_BigStation.IsAllowHKPlcConnect)
-                {
-                    HKDevice.HK_PLC_S7.Connect(S7.Net.CpuType.S71500, HK_PLC_IP);
-                    MessageNotify.GetInstance.ShowRunLog("海科plc重新连接成功");
-                }
-                if (!SiemensDevice.IsConnected && GVL_BigStation.IsAllowSiemensConnect)
-                {
-                    SiemensDevice.Siemens_PLC_S7.Connect(S7.Net.CpuType.S71500, Siemens_PLC_IP);
-                    MessageNotify.GetInstance.ShowRunLog("西门子plc重新连接");
-                }
-                GVL_BigStation.HeartBeatToPlc = !GVL_BigStation.HeartBeatToPlc;
-                HKDevice.HK_PLC_S7.Write("DB99.DBX0.0", GVL_BigStation.HeartBeatToPlc);
-                GVL_BigStation.HeartBeatFromPlc = HKDevice.PlcRead.HeartBeat;//读取plc心跳
-                if (HKDevice.IsConnected)
-                {
-                    if (GVL_BigStation.AGVPutTray.GetBitValue(1))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX0.7", true);
-                    }
-                    else 
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX0.7", false);
-                    }
-                    if (GVL_BigStation.AGVPutTray.GetBitValue(2))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.0", true);
-                    }
-                    else 
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.0", false);
-                    }
-                    if (GVL_BigStation.AGVPutTray.GetBitValue(3))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.1", true);
-                    }
-                    else
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.1", false);
-                    }
-                    if (GVL_BigStation.AGVPutTray.GetBitValue(4))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.2", true);
-                    }
-                    else
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.2", false);
-                    }
-                    if (GVL_BigStation.AGVPutTray.GetBitValue(5))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.3", true);
-                    }
-                    else
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.3", false);
-                    }
-                    GVL_BigStation.TraySensor = GVL_BigStation.TraySensor.SetBitValue(1, HKDevice.PlcRead.Tray1Sensor);
-                    GVL_BigStation.TraySensor = GVL_BigStation.TraySensor.SetBitValue(2, HKDevice.PlcRead.Tray2Sensor);
-                    GVL_BigStation.TraySensor = GVL_BigStation.TraySensor.SetBitValue(3, HKDevice.PlcRead.Tray3Sensor);
-                    GVL_BigStation.TraySensor = GVL_BigStation.TraySensor.SetBitValue(4, HKDevice.PlcRead.Tray4Sensor);
-                    GVL_BigStation.TraySensor = GVL_BigStation.TraySensor.SetBitValue(5, HKDevice.PlcRead.Tray5Sensor);
-                    GVL_BigStation.TrayCylinder = GVL_BigStation.TrayCylinder.SetBitValue(1, !HKDevice.PlcRead.Tray1Cylinder);
-                    GVL_BigStation.TrayCylinder = GVL_BigStation.TrayCylinder.SetBitValue(2, !HKDevice.PlcRead.Tray2Cylinder);
-                    GVL_BigStation.TrayCylinder = GVL_BigStation.TrayCylinder.SetBitValue(3, !HKDevice.PlcRead.Tray3Cylinder);
-                    GVL_BigStation.TrayCylinder = GVL_BigStation.TrayCylinder.SetBitValue(4, !HKDevice.PlcRead.Tray4Cylinder);
-                    GVL_BigStation.TrayCylinder = GVL_BigStation.TrayCylinder.SetBitValue(5, !HKDevice.PlcRead.Tray5Cylinder);
-                    if (HKDevice.PlcRead.IsAllowIssueRecipe1 || HKDevice.PlcRead.IsAllowIssueRecipe2 || HKDevice.PlcRead.IsAllowIssueRecipe3 || HKDevice.PlcRead.IsAllowIssueRecipe4) 
-                    {
-                        GVL_BigStation.Order_Request = true;
-                    }
-                }
-                if (SiemensDevice.IsConnected) 
-                {
-                    GVL_BigStation.AGVPutTray = SiemensDevice.DL_Status.AGV_Put_Done;
-                    GVL_BigStation.AGVGetTray = SiemensDevice.DL_Status.AGV_Get_Done;
-                    SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBW30", GVL_BigStation.TraySensor);
-                    SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBW32", GVL_BigStation.TrayCylinder);
-                    SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBW34", (ushort)15);
-                }
-                Thread.Sleep(10);
-            }),"海科plc和西门子数据交互",true);
-            LocalRecipeQueue1.Clear();
-            LocalRecipeQueue2.Clear();
-            LocalRecipeQueue3.Clear();
-            LocalRecipeQueue4.Clear();
-            SiemensRecipeQueue1.Clear();
-            SiemensRecipeQueue2.Clear();
-            SiemensRecipeQueue3.Clear();
-            SiemensRecipeQueue4.Clear();
-            ThreadManage.GetInstance().StartLong(new Action(() =>
-            {
-                testRawMaterialNameData();//自定义料仓名称
-                if (GVL_BigStation.IsUseLocalRecipe)
-                {
-                    LocalRecipeRecevice();
-                    LocalRecipeDosing();
-                }
-                else
-                {
-                    ReceviceData();
-                    RecipeInfoToHKPLC();
-                }
-                Thread.Sleep(10);
-            }), "配方数据执行流程", true);
+            //testRawMaterialNameData();//自定义料仓名称
+            DeviceConnectInit();//设备连接初始化
+            ThreadInit();//线程初始化
+            VarResetInit();//变量初始化
         }
         private void LocalRecipeRecevice()
         {
@@ -365,6 +233,11 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe1 && GVL_BigStation.Recipe1DosingStatus == 1)
                     {
+                        if (LocalRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶复位
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶信号复位");
+                        }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", false);
                         StockBinParReset();
                         GVL_BigStation.Recipe1DosingStatus = 2;
@@ -375,8 +248,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (LocalRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             GVL_BigStation.BarrelWasherSign = false;
-                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶复位
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶信号复位");
                         }
                         GVL_BigStation.Recipe1DosingStatus = 3; 
                         switch (trayCode)
@@ -528,6 +399,11 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe2 && GVL_BigStation.Recipe2DosingStatus == 1)
                     {
+                        if (LocalRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶复位
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶信号复位");
+                        }
                         GVL_BigStation.Recipe2DosingStatus = 2;
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", false);
                         StockBinParReset();
@@ -538,8 +414,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (LocalRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             GVL_BigStation.BarrelWasherSign = false;
-                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶复位
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶信号复位");
                         }
                         switch (trayCode)
                         {
@@ -691,6 +565,11 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe3 && GVL_BigStation.Recipe3DosingStatus == 1)
                     {
+                        if (LocalRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶复位
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶信号复位");
+                        }
                         GVL_BigStation.Recipe3DosingStatus = 2;
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", false);
                         StockBinParReset();
@@ -701,8 +580,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (LocalRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             GVL_BigStation.BarrelWasherSign = false;
-                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶复位
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶信号复位");
                         }
                         switch (trayCode)
                         {
@@ -855,6 +732,11 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe4 && GVL_BigStation.Recipe4DosingStatus == 1)
                     {
+                        if (LocalRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶复位
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶信号复位");
+                        }
                         GVL_BigStation.Recipe4DosingStatus = 2;
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", false);
                         StockBinParReset();
@@ -865,8 +747,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (LocalRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             GVL_BigStation.BarrelWasherSign = false;
-                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶复位
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶信号复位");
                         }
                         switch (trayCode)
                         {
@@ -974,31 +854,33 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         {
                             if (SiemensDevice.DL_Status is DL_Status_DB status)
                             {
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 3)
-                                {
-                                    SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
-                                    SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
-                                    MessageNotify.GetInstance.ShowRunLog($"配方1，发送配方编号和请求配料标志给西门子");
-                                    GVL_BigStation.SiemensSendRecipeStatus = 4;
-                                }
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 4)
-                                {
-                                    if (SiemensDevice.DL_Status.Dosing_Start_ACK)
-                                    {
-                                        SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
-                                        SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方1，西门子确认开始配料");
-                                        GVL_BigStation.SiemensSendRecipeStatus = 5;
-                                    }
-                                }
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 5)
+                                switch (GVL_BigStation.SiemensSendRecipeStatus) 
                                 {
-                                    if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
-                                    {
-                                        SiemensRecipeQueue1.Enqueue(data.RecipeCode);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方1，配方：{data.RecipeCode}，加入队列");
-                                        GVL_BigStation.SiemensSendRecipeStatus = 0;
-                                    }
+                                    case 3:
+                                        SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
+                                        SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
+                                        MessageNotify.GetInstance.ShowRunLog($"配方1，发送配方编号和请求配料标志给西门子");
+                                        GVL_BigStation.SiemensSendRecipeStatus = 4;
+                                        break;
+                                    case 4:
+                                        if (SiemensDevice.DL_Status.Dosing_Start_ACK)
+                                        {
+                                            SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
+                                            SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方1，西门子确认开始配料");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 5;
+                                        }
+                                        break;
+                                    case 5:
+                                        if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
+                                        {
+                                            SiemensRecipeQueue1.Enqueue(data.RecipeCode);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方1，配方：{data.RecipeCode}，加入队列");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 0;
+                                        }
+                                        break;
+                                    default:
+                                        break;
                                 }
                             }
                         }
@@ -1123,156 +1005,228 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                 GVL_BigStation.Recipe4DosingStatus = 0;
             }
 
+           
+        }
+        public void Order_Cancel() 
+        {
             if (GVL_BigStation.Order_Cancel) //订单取消
             {
                 if (!string.IsNullOrEmpty(GVL_BigStation.Order_CancelRecipeCode))
                 {
+                    string code = GVL_BigStation.Order_CancelRecipeCode;
                     int index = Array.FindIndex(Json<RemoteRecipe>.Data.Recipes.ToArray(), p => p.RecipeCode == GVL_BigStation.Order_CancelRecipeCode);
+                    short TrayCode = 0;
                     if (index >= 0)
                     {
-                        string code = GVL_BigStation.Order_CancelRecipeCode;
-                        short TrayCode = (short)Json<RemoteRecipe>.Data.Recipes.ElementAt(index).TrayCode;
-                        if (SiemensRecipeQueue1.Contains(code) || SiemensRecipeQueue2.Contains(code) || SiemensRecipeQueue3.Contains(code) || SiemensRecipeQueue4.Contains(code))
-                        {
-                            if (SiemensRecipeQueue1.Contains(code))
+                        TrayCode = (short)Json<RemoteRecipe>.Data.Recipes.ElementAt(index).TrayCode;
+                    }
+                    switch (GVL_BigStation.Order_CancelStep)
+                    {
+                        case 0:
+                            if (index == -1)
                             {
-                                App.Current.Dispatcher.Invoke(() =>
-                                {
-                                    Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);
-                                });
-                                if (GVL_BigStation.Recipe1DosingStatus != 0)
+                                GVL_BigStation.Order_CancelStep = 10;
+                            }
+                            else
+                            {
+                                if (SiemensRecipeQueue1.Contains(code) || SiemensRecipeQueue2.Contains(code) || SiemensRecipeQueue3.Contains(code) || SiemensRecipeQueue4.Contains(code))
                                 {
-                                    HKDevice.HK_PLC_S7.Write("DB99.DBX230.0", true);
-                                    HKDevice.HK_PLC_S7.Write("DB99.DBW232", (short)TrayCode);
-                                    MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
+                                    GVL_BigStation.Order_CancelStep = 30;
                                 }
                                 else
                                 {
-                                    MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
+                                    GVL_BigStation.Order_CancelStep = 20;
                                 }
+                            }
+                            break;
+                        case 10:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
+                            GVL_BigStation.Order_CancelStep = 11;
+                            break;
+                        case 11:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                                GVL_BigStation.Order_CancelStep = 12;
+                            }
+                            break;
+                        case 12:
+                            MessageNotify.GetInstance.ShowRunLog($"西门子取消订单,但未找到订单:{GVL_BigStation.Order_CancelRecipeCode}");
+                            GVL_BigStation.Order_Cancel = false;
+                            GVL_BigStation.Order_CancelRecipeCode = "";
+                            GVL_BigStation.Order_CancelStep = 0;
+                            break;
+
+                        case 20:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
+                            GVL_BigStation.Order_CancelStep = 21;
+                            break;
+                        case 21:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                                GVL_BigStation.Order_CancelStep = 22;
+                            }
+                            break;
+                        case 22:
+                            GVL_BigStation.SiemensSendRecipeStatus = 0;
+                            App.Current.Dispatcher.Invoke(() =>
+                            {
+                                Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);
+                            });
+                            MessageNotify.GetInstance.ShowRunLog($"正在执行请求订单流程，配方还未到PLC，订单号：{GVL_BigStation.Order_CancelRecipeCode}");
+                            GVL_BigStation.Order_Cancel = false;
+                            GVL_BigStation.Order_CancelRecipeCode = "";
+                            GVL_BigStation.Order_CancelStep = 0;
+                            break;
+                        case 30:
+                            if (SiemensRecipeQueue1.Contains(code))
+                            {
+                                GVL_BigStation.Order_CancelStep = 31;
+                            }
+                            else if (SiemensRecipeQueue2.Contains(code))
+                            {
+                                GVL_BigStation.Order_CancelStep = 41;
+                            }
+                            else if (SiemensRecipeQueue3.Contains(code))
+                            {
+                                GVL_BigStation.Order_CancelStep = 51;
+                            }
+                            else if (SiemensRecipeQueue4.Contains(code))
+                            {
+                                GVL_BigStation.Order_CancelStep = 61;
+                            }
+                            break;
+                        case 31:
+                            if (GVL_BigStation.Recipe1DosingStatus != 0)
+                            {
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX230.0", true);
+                                HKDevice.HK_PLC_S7.Write("DB99.DBW232", (short)TrayCode);
                                 GVL_BigStation.Recipe1DosingStatus = 0;
-                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
-                                while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false ) 
-                                {
-                                    SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
-                                    SiemensRecipeQueue1.TryDequeue(out code);
-                                    MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
-                                }
+                                GVL_BigStation.Order_CancelStep = 32;
+                                MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
+                            }
+                            else
+                            {
+                                GVL_BigStation.Order_CancelStep = 32;
+                                MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
                             }
-                            if (SiemensRecipeQueue2.Contains(code))
+                            break;
+                        case 32:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
+                            GVL_BigStation.Order_CancelStep = 33;
+                            break;
+                        case 33:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
                             {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
                                 App.Current.Dispatcher.Invoke(() =>
                                 {
                                     Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);
                                 });
-                                if (GVL_BigStation.Recipe2DosingStatus != 0)
-                                {
-                                    HKDevice.HK_PLC_S7.Write("DB99.DBX230.0", true);
-                                    HKDevice.HK_PLC_S7.Write("DB99.DBW232", (short)TrayCode);
-                                    MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
-                                }
-                                else
-                                {
-                                    MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
-                                }
+                                SiemensRecipeQueue1.TryDequeue(out code);
+                                GVL_BigStation.Order_CancelStep = 0;
+                                MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
+                            }
+                            break;
+                        case 41:
+                            if (GVL_BigStation.Recipe2DosingStatus != 0)
+                            {
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX230.0", true);
+                                HKDevice.HK_PLC_S7.Write("DB99.DBW232", (short)TrayCode);
                                 GVL_BigStation.Recipe2DosingStatus = 0;
-                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
-                                while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
-                                {
-                                    SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
-                                    SiemensRecipeQueue2.TryDequeue(out code);
-                                    MessageNotify.GetInstance.ShowRunLog($"队列2，西门子取消订单完成，订单号：{code}");
-                                }
+                                GVL_BigStation.Order_CancelStep = 42;
+                                MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
                             }
-                            if (SiemensRecipeQueue3.Contains(code))
+                            else
                             {
-                                GVL_BigStation.Recipe3DosingStatus = 0;
-                                App.Current.Dispatcher.Invoke(() =>
-                                {
-                                    Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);
-                                });
-                                if (GVL_BigStation.Recipe3DosingStatus != 0)
-                                {
-                                    HKDevice.HK_PLC_S7.Write("DB99.DBX230.0", true);
-                                    HKDevice.HK_PLC_S7.Write("DB99.DBW232", (short)TrayCode);
-                                    MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
-                                }
-                                else
-                                {
-                                    MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
-                                }
-                                GVL_BigStation.Recipe3DosingStatus = 0; 
-                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
-                                while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
-                                {
-                                    SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
-                                    SiemensRecipeQueue3.TryDequeue(out code);
-                                    MessageNotify.GetInstance.ShowRunLog($"队列3，西门子取消订单完成，订单号：{code}");
-                                }
+                                GVL_BigStation.Order_CancelStep = 42;
+                                MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
                             }
-                            if (SiemensRecipeQueue4.Contains(code))
+                            break;
+                        case 42:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
+                            GVL_BigStation.Order_CancelStep = 43;
+                            break;
+                        case 43:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
                             {
-                                GVL_BigStation.Recipe4DosingStatus = 0;
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
                                 App.Current.Dispatcher.Invoke(() =>
                                 {
                                     Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);
                                 });
-                                if (GVL_BigStation.Recipe4DosingStatus != 0)
-                                {
-                                    HKDevice.HK_PLC_S7.Write("DB99.DBX230.0", true);
-                                    HKDevice.HK_PLC_S7.Write("DB99.DBW232", (short)TrayCode);
-                                    MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
-                                }
-                                else
-                                {
-                                    MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
-                                }
-                                GVL_BigStation.Recipe4DosingStatus = 0;
-                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
-                                while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
-                                {
-                                    SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
-                                    SiemensRecipeQueue4.TryDequeue(out code);
-                                    MessageNotify.GetInstance.ShowRunLog($"队列4，西门子取消订单完成，订单号：{code}");
-                                }
+                                SiemensRecipeQueue2.TryDequeue(out code);
+                                GVL_BigStation.Order_CancelStep = 0;
+                                MessageNotify.GetInstance.ShowRunLog($"队列2，西门子取消订单完成，订单号：{code}");
                             }
-                            GVL_BigStation.Order_Cancel = false;
-                            GVL_BigStation.Order_CancelRecipeCode = "";
-                        }
-                        else
-                        {
-                            if (GVL_BigStation.SiemensSendRecipeStatus != 0 || GVL_BigStation.SiemensSendRecipeStatus != 1)
+                            break;
+                        case 51:
+                            if (GVL_BigStation.Recipe3DosingStatus != 0)
+                            {
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX230.0", true);
+                                HKDevice.HK_PLC_S7.Write("DB99.DBW232", (short)TrayCode);
+                                GVL_BigStation.Recipe3DosingStatus = 0;
+                                GVL_BigStation.Order_CancelStep = 52;
+                                MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
+                            }
+                            else
                             {
-                                GVL_BigStation.SiemensSendRecipeStatus = 0;
+                                GVL_BigStation.Order_CancelStep = 52;
+                                MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
+                            }
+                            break;
+                        case 52:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
+                            GVL_BigStation.Order_CancelStep = 53;
+                            break;
+                        case 53:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
                                 App.Current.Dispatcher.Invoke(() =>
                                 {
                                     Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);
                                 });
-                                MessageNotify.GetInstance.ShowRunLog($"正在执行请求订单流程，配方还未到PLC，订单号：{GVL_BigStation.Order_CancelRecipeCode}");
+                                SiemensRecipeQueue3.TryDequeue(out code);
+                                GVL_BigStation.Order_CancelStep = 0;
+                                MessageNotify.GetInstance.ShowRunLog($"队列3，西门子取消订单完成，订单号：{code}");
+                            }
+                            break;
+                        case 61:
+                            if (GVL_BigStation.Recipe4DosingStatus != 0)
+                            {
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX230.0", true);
+                                HKDevice.HK_PLC_S7.Write("DB99.DBW232", (short)TrayCode);
+                                GVL_BigStation.Recipe4DosingStatus = 0;
+                                GVL_BigStation.Order_CancelStep = 62;
+                                MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
                             }
                             else
                             {
-                                MessageNotify.GetInstance.ShowRunLog($"订单取消异常，订单号：{GVL_BigStation.Order_CancelRecipeCode}");
+                                GVL_BigStation.Order_CancelStep = 62;
+                                MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
                             }
-                            GVL_BigStation.Order_Cancel = false;
-                            GVL_BigStation.Order_CancelRecipeCode = "";
+                            break;
+                        case 62:
                             SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
-                            while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                            GVL_BigStation.Order_CancelStep = 63;
+                            break;
+                        case 63:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
                             {
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                                App.Current.Dispatcher.Invoke(() =>
+                                {
+                                    Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);
+                                });
+                                SiemensRecipeQueue4.TryDequeue(out code);
+                                GVL_BigStation.Order_CancelStep = 0;
+                                MessageNotify.GetInstance.ShowRunLog($"队列4，西门子取消订单完成，订单号：{code}");
                             }
-                        }
-                    }
-                    else
-                    {
-                        GVL_BigStation.Order_Cancel = false;
-                        GVL_BigStation.Order_CancelRecipeCode = "";
-                        SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
-                        while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
-                        {
-                            SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
-                        }
-                        MessageNotify.GetInstance.ShowRunLog($"西门子取消订单,但未找到订单:{GVL_BigStation.Order_CancelRecipeCode}");
+                            break;
+                        default:
+                            break;
                     }
                 }
             }
@@ -1337,6 +1291,11 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe1 && GVL_BigStation.Recipe1DosingStatus == 1)
                     {
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                        }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", false);
                         StockBinParReset();
                         MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
@@ -1347,8 +1306,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             GVL_BigStation.BarrelWasherSign = false;
-                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
                         }
                         GVL_BigStation.Recipe1DosingFinish = true;
                         GVL_BigStation.Recipe1DosingStatus = 3;
@@ -1509,6 +1466,11 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe2 && GVL_BigStation.Recipe2DosingStatus == 1)
                     {
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                        }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", false);
                         StockBinParReset();
                         GVL_BigStation.Recipe2DosingStatus = 2;
@@ -1519,8 +1481,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             GVL_BigStation.BarrelWasherSign = false;
-                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
                         }
                         GVL_BigStation.Recipe2DosingFinish = true;
                         GVL_BigStation.Recipe2DosingStatus = 3;
@@ -1680,6 +1640,11 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe3 && GVL_BigStation.Recipe3DosingStatus == 1)
                     {
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                        }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", false);
                         StockBinParReset();
                         GVL_BigStation.Recipe3DosingStatus = 2;
@@ -1690,8 +1655,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             GVL_BigStation.BarrelWasherSign = false;
-                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
                         }
                         GVL_BigStation.Recipe3DosingFinish = true;
                         GVL_BigStation.Recipe3DosingStatus = 3;
@@ -1851,6 +1814,11 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe4 && GVL_BigStation.Recipe4DosingStatus == 1)
                     {
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                        }
                         GVL_BigStation.Recipe4DosingStatus = 2;
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", false);
                         StockBinParReset();
@@ -1861,10 +1829,8 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             GVL_BigStation.BarrelWasherSign = false;
-                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
                         }
-                        GVL_BigStation.Recipe1DosingFinish = true;
+                        GVL_BigStation.Recipe4DosingFinish = true;
                         GVL_BigStation.Recipe4DosingStatus = 3;
                         MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
                         foreach (var item in SiemensRecipes.ElementAt(index).RawMaterial)
@@ -1973,7 +1939,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// </summary>
         private void StockBinParReset()
         {
-            HKDevice.HK_PLC_S7.Write("DB99.DBW2.0", 0);//
+            HKDevice.HK_PLC_S7.Write("DB99.DBW2.0", 0);
             HKDevice.HK_PLC_S7.Write("DB99.DBW4.0", 0);
             for (int i = 0; i < 56; i++)
             {
@@ -1983,25 +1949,322 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         }
         private void testRawMaterialNameData()
         {
-           /* RawMaterialsInfo.Clear();
-            RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0007", RawMaterialLocation = 1 });//备料大蒜
-            RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0015", RawMaterialLocation = 2 });//花椒酱
-            RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0005", RawMaterialLocation = 3 });//榨菜丁
-            RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0018", RawMaterialLocation = 4 });//炸豌豆
-            RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0019", RawMaterialLocation = 5 });//高水分糍粑海椒
-            RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0033", RawMaterialLocation = 6 });//辣豆瓣
-            RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0030", RawMaterialLocation = 11 });//备用生姜
-            RawMaterialsInfo.Add(new RawMaterial() { RawMaterialName = "0012", RawMaterialLocation = 12 });//豆豉细粒*/
-            foreach (var material in RawMaterialsInfo)
+            //RawMaterialsInfo = Json<RawMaterialData>.Data.RawMaterial;
+            //foreach (var material in RawMaterialsInfo)
+            //{
+            //    if (!string.IsNullOrEmpty(material.RawMaterialName))
+            //    {
+            //        if (!RawMaterialsNamePos.ContainsKey(material.RawMaterialName))
+            //        {
+            //            RawMaterialsNamePos.Add(material.RawMaterialName, (short)material.RawMaterialLocation);
+            //        }
+            //    }
+            //}
+            if (RawMaterialsNamePos.Count == 14)
+            {
+                for (int i = 0; i < typeof(StockBinName).GetProperties().Length; i++) 
+                {
+                    PropertyInfo pro = GVL_BigStation.stockBinName.GetType().GetProperty(typeof(StockBinName).GetProperties()[i].Name);
+                    RawMaterialsNamePos[i+1] = pro.GetValue(GVL_BigStation.stockBinName, null).ToString();
+                }
+               /* RawMaterialsNamePos[1] = GVL_BigStation.stockBinName.RawMaterialName1;
+                RawMaterialsNamePos[2] = GVL_BigStation.stockBinName.RawMaterialName2;
+                RawMaterialsNamePos[3] = GVL_BigStation.stockBinName.RawMaterialName3;
+                RawMaterialsNamePos[4] = GVL_BigStation.stockBinName.RawMaterialName4;
+                RawMaterialsNamePos[5] = GVL_BigStation.stockBinName.RawMaterialName5;
+                RawMaterialsNamePos[6] = GVL_BigStation.stockBinName.RawMaterialName6;
+                RawMaterialsNamePos[7] = GVL_BigStation.stockBinName.RawMaterialName7;
+                RawMaterialsNamePos[8] = GVL_BigStation.stockBinName.RawMaterialName8;
+                RawMaterialsNamePos[9] = GVL_BigStation.stockBinName.RawMaterialName9;
+                RawMaterialsNamePos[10] = GVL_BigStation.stockBinName.RawMaterialName10;
+                RawMaterialsNamePos[11] = GVL_BigStation.stockBinName.RawMaterialName11;
+                RawMaterialsNamePos[12] = GVL_BigStation.stockBinName.RawMaterialName12;
+                RawMaterialsNamePos[13] = GVL_BigStation.stockBinName.RawMaterialName13;
+                RawMaterialsNamePos[14] = GVL_BigStation.stockBinName.RawMaterialName14;*/
+            }
+            else 
+            {
+                RawMaterialsNamePos.TryAdd(1, GVL_BigStation.stockBinName.RawMaterialName1);
+                RawMaterialsNamePos.TryAdd(2, GVL_BigStation.stockBinName.RawMaterialName2);
+                RawMaterialsNamePos.TryAdd(3, GVL_BigStation.stockBinName.RawMaterialName3);
+                RawMaterialsNamePos.TryAdd(4, GVL_BigStation.stockBinName.RawMaterialName4);
+                RawMaterialsNamePos.TryAdd(5, GVL_BigStation.stockBinName.RawMaterialName5);
+                RawMaterialsNamePos.TryAdd(6, GVL_BigStation.stockBinName.RawMaterialName6);
+                RawMaterialsNamePos.TryAdd(7, GVL_BigStation.stockBinName.RawMaterialName7);
+                RawMaterialsNamePos.TryAdd(8, GVL_BigStation.stockBinName.RawMaterialName8);
+                RawMaterialsNamePos.TryAdd(9, GVL_BigStation.stockBinName.RawMaterialName9);
+                RawMaterialsNamePos.TryAdd(10, GVL_BigStation.stockBinName.RawMaterialName10);
+                RawMaterialsNamePos.TryAdd(11, GVL_BigStation.stockBinName.RawMaterialName11);
+                RawMaterialsNamePos.TryAdd(12, GVL_BigStation.stockBinName.RawMaterialName12);
+                RawMaterialsNamePos.TryAdd(13, GVL_BigStation.stockBinName.RawMaterialName13);
+                RawMaterialsNamePos.TryAdd(14, GVL_BigStation.stockBinName.RawMaterialName14);
+                foreach (var item in RawMaterialsNamePos)
+                {
+                    HardWareRawMaterialInfo.Add(new RawMaterial() { RawMaterialCount = HardWareRawMaterialInfo.Count + 1, RawMaterialLocation = item.Key, RawMaterialName = item.Value, RawMaterialChineseName = "" });
+                }
+            }
+            foreach (var item in RawMaterialsNamePos)
             {
-                if (!string.IsNullOrEmpty(material.RawMaterialName))
+                int num = Array.FindIndex(Json<BomMaterial>.Data.RawMaterials.ToArray(), p => p.RawMaterialName == item.Value);
+                int index = Array.FindIndex(HardWareRawMaterialInfo.ToArray(), p => p.RawMaterialLocation == item.Key);
+                if (index == -1)
                 {
-                    if (!RawMaterialsNamePos.ContainsKey(material.RawMaterialName))
+                    HardWareRawMaterialInfo.Clear();
+                }
+                else if (num >= 0 && index >= 0)
+                {
+                    string name = Json<BomMaterial>.Data.RawMaterials.ElementAt(num).RawMaterialChineseName;
+                    HardWareRawMaterialInfo.ElementAt(index).RawMaterialLocation = item.Key;
+                    HardWareRawMaterialInfo.ElementAt(index).RawMaterialName = item.Value;
+                    HardWareRawMaterialInfo.ElementAt(index).RawMaterialChineseName = name;
+                }
+                else if (num == -1) 
+                {
+                    HardWareRawMaterialInfo.ElementAt(index).RawMaterialLocation = item.Key;
+                    HardWareRawMaterialInfo.ElementAt(index).RawMaterialName = "";
+                    HardWareRawMaterialInfo.ElementAt(index).RawMaterialChineseName = "";
+                }
+            }
+        }
+        /// <summary>
+        /// MES的物料名称和物料编码对应
+        /// </summary>
+        public void RawMaterialNameWithCode()
+        {
+            GVL_BigStation.RawMaterialsNameCode.Add("0001", "色拉油");
+            GVL_BigStation.RawMaterialsNameCode.Add("0002", "一级菜油");
+            GVL_BigStation.RawMaterialsNameCode.Add("0003", "菜籽油");
+            GVL_BigStation.RawMaterialsNameCode.Add("0004", "青花椒油");
+            GVL_BigStation.RawMaterialsNameCode.Add("0005", "卤牛肉丁");
+            GVL_BigStation.RawMaterialsNameCode.Add("0006", "冻鸡肉丁");
+            GVL_BigStation.RawMaterialsNameCode.Add("0007", "香菇丁");
+            GVL_BigStation.RawMaterialsNameCode.Add("0008", "高水分糍粑海椒");
+            GVL_BigStation.RawMaterialsNameCode.Add("0009", "低水分糍粑海椒");
+            GVL_BigStation.RawMaterialsNameCode.Add("0010", "辣豆瓣");
+            GVL_BigStation.RawMaterialsNameCode.Add("0011", "整豆豉");
+            GVL_BigStation.RawMaterialsNameCode.Add("0012", "豆豉细粒");
+            GVL_BigStation.RawMaterialsNameCode.Add("0013", "卤黄豆");
+            GVL_BigStation.RawMaterialsNameCode.Add("0014", "野山椒粒");
+            GVL_BigStation.RawMaterialsNameCode.Add("0015", "竹笋丁");
+            GVL_BigStation.RawMaterialsNameCode.Add("0016", "香辣酱辣椒酱");
+            GVL_BigStation.RawMaterialsNameCode.Add("0017", "芽菜粒");
+            GVL_BigStation.RawMaterialsNameCode.Add("0018", "榨菜丁");
+            GVL_BigStation.RawMaterialsNameCode.Add("0019", "盐菜");
+            GVL_BigStation.RawMaterialsNameCode.Add("0020", "洋葱丁");
+            GVL_BigStation.RawMaterialsNameCode.Add("0021", "番茄酱");
+            GVL_BigStation.RawMaterialsNameCode.Add("0022", "甜豆瓣");
+            GVL_BigStation.RawMaterialsNameCode.Add("0023", "甜面酱");
+            GVL_BigStation.RawMaterialsNameCode.Add("0024", "芝麻酱");
+            GVL_BigStation.RawMaterialsNameCode.Add("0025", "炸花生");
+            GVL_BigStation.RawMaterialsNameCode.Add("0026", "盐渍青椒丁");
+            GVL_BigStation.RawMaterialsNameCode.Add("0027", "备料剁红椒");
+            GVL_BigStation.RawMaterialsNameCode.Add("0028", "萝卜丁");
+            GVL_BigStation.RawMaterialsNameCode.Add("0029", "油芝麻");
+            GVL_BigStation.RawMaterialsNameCode.Add("0030", "生姜");
+            GVL_BigStation.RawMaterialsNameCode.Add("0031", "大蒜");
+            GVL_BigStation.RawMaterialsNameCode.Add("0032", "榨菜酱");
+            GVL_BigStation.RawMaterialsNameCode.Add("0033", "炸碗豆");
+            GVL_BigStation.RawMaterialsNameCode.Add("0034", "大头菜丁");
+            GVL_BigStation.RawMaterialsNameCode.Add("0035", "酱油");
+            GVL_BigStation.RawMaterialsNameCode.Add("0036", "I+G");
+            GVL_BigStation.RawMaterialsNameCode.Add("0037", "味精");
+            GVL_BigStation.RawMaterialsNameCode.Add("0038", "白糖");
+            GVL_BigStation.RawMaterialsNameCode.Add("0039", "食盐");
+            GVL_BigStation.RawMaterialsNameCode.Add("0040", "花椒酱");
+            GVL_BigStation.RawMaterialsNameCode.Add("0041", "调味膏2");
+            GVL_BigStation.RawMaterialsNameCode.Add("0042", "调味膏5");
+            GVL_BigStation.RawMaterialsNameCode.Add("0043", "十三香调味膏");
+            GVL_BigStation.RawMaterialsNameCode.Add("0044", "酱香膏");
+            GVL_BigStation.RawMaterialsNameCode.Add("0045", "芽菜香料粉");
+            GVL_BigStation.RawMaterialsNameCode.Add("0046", "香料Ａ");
+            GVL_BigStation.RawMaterialsNameCode.Add("0047", "香料Ｄ");
+            GVL_BigStation.RawMaterialsNameCode.Add("0048", "猪肉精膏");
+            GVL_BigStation.RawMaterialsNameCode.Add("0049", "调味膏3");
+            GVL_BigStation.RawMaterialsNameCode.Add("0050", "柠檬酸粉");
+            GVL_BigStation.RawMaterialsNameCode.Add("0051", "辣椒红");
+            GVL_BigStation.RawMaterialsNameCode.Add("0052", "辣椒油树脂");
+            GVL_BigStation.RawMaterialsNameCode.Add("0053", "水态混和酸");
+            GVL_BigStation.RawMaterialsNameCode.Add("0054", "加水稀释后防腐剂");
+            GVL_BigStation.RawMaterialsNameCode.Add("0055", "异维Ｃ钠粉");
+            GVL_BigStation.RawMaterialsNameCode.Add("0056", "琼脂粉");
+            GVL_BigStation.RawMaterialsNameCode.Add("0057", "香葱油");
+            GVL_BigStation.RawMaterialsNameCode.Add("0058", "水态甜味剂");
+            GVL_BigStation.RawMaterialsNameCode.Add("0059", "孜然粉");
+            GVL_BigStation.RawMaterialsNameCode.Add("0060", "孜然油");
+        }
+        /// <summary>
+        /// 设备连接 西门子和海科PLC
+        /// </summary>
+        public void DeviceConnectInit() 
+        {
+            GVL_BigStation.IsAllowHKPlcConnect = ConfigurationManager.AppSettings["HKPlc_Connect"].ToLower() == "true" ? true : false;
+            GVL_BigStation.IsAllowSiemensConnect = ConfigurationManager.AppSettings["Siemens_Connect"].ToLower() == "true" ? true : false;
+            try
+            {
+                if (GVL_BigStation.IsAllowHKPlcConnect)
+                {
+                    HKDevice.HK_PLC_S7.Connect(S7.Net.CpuType.S71500, HK_PLC_IP);
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageNotify.GetInstance.ShowRunLog("海科plc连接失败，等待重新连接");
+            }
+            finally
+            {
+                HKDevice.Init();
+                MessageNotify.GetInstance.ShowRunLog("海科plc初始化");
+                if (HKDevice.IsConnected && GVL_BigStation.IsAllowHKPlcConnect)
+                {
+                    MessageNotify.GetInstance.ShowRunLog("海科plc连接成功");
+                }
+            }
+            try
+            {
+                if (GVL_BigStation.IsAllowSiemensConnect)
+                {
+                    SiemensDevice.Siemens_PLC_S7.Connect(S7.Net.CpuType.S71500, Siemens_PLC_IP);
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageNotify.GetInstance.ShowRunLog("西门子plc连接失败，等待重新连接");
+            }
+            finally
+            {
+                SiemensDevice.Init();
+                MessageNotify.GetInstance.ShowRunLog("西门子plc初始化");
+                if (SiemensDevice.IsConnected && GVL_BigStation.IsAllowSiemensConnect)
+                {
+                    MessageNotify.GetInstance.ShowRunLog("西门子plc连接成功");
+                }
+            }
+        }
+
+        public void ThreadInit() 
+        {
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                if (!HKDevice.IsConnected && GVL_BigStation.IsAllowHKPlcConnect)
+                {
+                    HKDevice.HK_PLC_S7.Connect(S7.Net.CpuType.S71500, HK_PLC_IP);
+                    MessageNotify.GetInstance.ShowRunLog("海科plc重新连接成功");
+                }
+                if (!SiemensDevice.IsConnected && GVL_BigStation.IsAllowSiemensConnect)
+                {
+                    SiemensDevice.Siemens_PLC_S7.Connect(S7.Net.CpuType.S71500, Siemens_PLC_IP);
+                    MessageNotify.GetInstance.ShowRunLog("西门子plc重新连接");
+                }
+                Thread.Sleep(10);
+            }), "西门子和海科PLC重新连接", true);
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                GVL_BigStation.HeartBeatToPlc = !GVL_BigStation.HeartBeatToPlc;
+                HKDevice.HK_PLC_S7.Write("DB99.DBX0.0", GVL_BigStation.HeartBeatToPlc);
+                GVL_BigStation.HeartBeatFromPlc = HKDevice.PlcRead.HeartBeat;//读取plc心跳
+                if (HKDevice.IsConnected)
+                {
+                    if (GVL_BigStation.AGVPutTray.GetBitValue(1))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX0.7", true);
+                    }
+                    else
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX0.7", false);
+                    }
+                    if (GVL_BigStation.AGVPutTray.GetBitValue(2))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.0", true);
+                    }
+                    else
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.0", false);
+                    }
+                    if (GVL_BigStation.AGVPutTray.GetBitValue(3))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.1", true);
+                    }
+                    else
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.1", false);
+                    }
+                    if (GVL_BigStation.AGVPutTray.GetBitValue(4))
                     {
-                        RawMaterialsNamePos.Add(material.RawMaterialName, (short)material.RawMaterialLocation);
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.2", true);
+                    }
+                    else
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.2", false);
+                    }
+                    if (GVL_BigStation.AGVPutTray.GetBitValue(5))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.3", true);
+                    }
+                    else
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.3", false);
+                    }
+                    GVL_BigStation.TraySensor = GVL_BigStation.TraySensor.SetBitValue(1, HKDevice.PlcRead.Tray1Sensor);
+                    GVL_BigStation.TraySensor = GVL_BigStation.TraySensor.SetBitValue(2, HKDevice.PlcRead.Tray2Sensor);
+                    GVL_BigStation.TraySensor = GVL_BigStation.TraySensor.SetBitValue(3, HKDevice.PlcRead.Tray3Sensor);
+                    GVL_BigStation.TraySensor = GVL_BigStation.TraySensor.SetBitValue(4, HKDevice.PlcRead.Tray4Sensor);
+                    GVL_BigStation.TraySensor = GVL_BigStation.TraySensor.SetBitValue(5, HKDevice.PlcRead.Tray5Sensor);
+                    GVL_BigStation.TrayCylinder = GVL_BigStation.TrayCylinder.SetBitValue(1, !HKDevice.PlcRead.Tray1Cylinder);
+                    GVL_BigStation.TrayCylinder = GVL_BigStation.TrayCylinder.SetBitValue(2, !HKDevice.PlcRead.Tray2Cylinder);
+                    GVL_BigStation.TrayCylinder = GVL_BigStation.TrayCylinder.SetBitValue(3, !HKDevice.PlcRead.Tray3Cylinder);
+                    GVL_BigStation.TrayCylinder = GVL_BigStation.TrayCylinder.SetBitValue(4, !HKDevice.PlcRead.Tray4Cylinder);
+                    GVL_BigStation.TrayCylinder = GVL_BigStation.TrayCylinder.SetBitValue(5, !HKDevice.PlcRead.Tray5Cylinder);
+                    if (HKDevice.PlcRead.IsAllowIssueRecipe1 || HKDevice.PlcRead.IsAllowIssueRecipe2 || HKDevice.PlcRead.IsAllowIssueRecipe3 || HKDevice.PlcRead.IsAllowIssueRecipe4)
+                    {
+                        GVL_BigStation.Order_Request = true;
                     }
                 }
-            }
+                if (SiemensDevice.IsConnected)
+                {
+                    GVL_BigStation.AGVPutTray = SiemensDevice.DL_Status.AGV_Put_Done;
+                    GVL_BigStation.AGVGetTray = SiemensDevice.DL_Status.AGV_Get_Done;
+                    SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBW30", GVL_BigStation.TraySensor);
+                    SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBW32", GVL_BigStation.TrayCylinder);
+                    SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBW34", (ushort)GVL_BigStation.TrayEnable);
+                }
+                Thread.Sleep(10);
+            }), "海科plc和西门子数据交互", true);
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                testRawMaterialNameData();//自定义料仓名称
+                if (GVL_BigStation.Order_Cancel)
+                {
+                    Order_Cancel();
+                }
+                else
+                {
+                    if (GVL_BigStation.IsUseLocalRecipe)
+                    {
+                        LocalRecipeRecevice();
+                        LocalRecipeDosing();
+                    }
+                    else
+                    {
+                        ReceviceData();
+                        RecipeInfoToHKPLC();
+                    }
+                }
+                Thread.Sleep(10);
+            }), "配方数据执行流程", true);
+        }
+        /// <summary>
+        /// 初始化变量复位
+        /// </summary>
+        public void VarResetInit() 
+        {
+            LocalRecipeQueue1.Clear();
+            LocalRecipeQueue2.Clear();
+            LocalRecipeQueue3.Clear();
+            LocalRecipeQueue4.Clear();
+            SiemensRecipeQueue1.Clear();
+            SiemensRecipeQueue2.Clear();
+            SiemensRecipeQueue3.Clear();
+            SiemensRecipeQueue4.Clear();
         }
     }
 }
diff --git a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RawMaterial.cs b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RawMaterial.cs
index e25effb7..125b6ae7 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RawMaterial.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RawMaterial.cs
@@ -10,10 +10,16 @@ namespace BPASmartClient.JXJFoodBigStation.Model
     public class RawMaterial :ObservableObject
     {
         private int _mIp;
-        public int DeviceIp { get { return _mIp; } set { _mIp = value; }}
+        public int DeviceIp { get { return _mIp; } set { _mIp = value; OnPropertyChanged(); } }
 
-        public short RawMaterialCount { get { return _mRawMaterialCount; } set { _mRawMaterialCount = value; OnPropertyChanged(); } }
-        private short _mRawMaterialCount;
+        public int RawMaterialCount { get { return _mRawMaterialCount; } set { _mRawMaterialCount = value; OnPropertyChanged(); } }
+        private int _mRawMaterialCount;
+
+        /// <summary>
+        /// 原料中文名
+        /// </summary>
+        public string RawMaterialChineseName { get { return _mRawMaterialChineseName; } set { _mRawMaterialChineseName = value; OnPropertyChanged(); } }
+        private string _mRawMaterialChineseName;
 
         /// <summary>
         /// 原料名称
@@ -36,7 +42,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// <summary>
         /// 实际的下料中重量
         /// </summary>
-        public float Laying_Off_Weight { get { return _mLaying_Off_Weight; } set { _mLaying_Off_Weight = value; } }
+        public float Laying_Off_Weight { get { return _mLaying_Off_Weight; } set { _mLaying_Off_Weight = value; OnPropertyChanged(); } }
         private float _mLaying_Off_Weight;
 
         /// <summary>
diff --git a/BPASmartClient.JXJFoodBigStation/Model/Siemens/SiemensDeviceStatus.cs b/BPASmartClient.JXJFoodBigStation/Model/Siemens/SiemensDeviceStatus.cs
index ff22a4a4..1456067a 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/Siemens/SiemensDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/Siemens/SiemensDeviceStatus.cs
@@ -62,73 +62,22 @@ namespace BPASmartClient.JXJFoodBigStation.Model.Siemens
                     }
                     if (res2 != null && res2 is DL_Finish_DB finish)
                     {
-                        if (GVL_BigStation.Recipe1DosingFinish == true)
+                        if (finish.Ask_For_Finish_PLC &&(GVL_BigStation.Recipe1DosingFinish || GVL_BigStation.Recipe2DosingFinish || GVL_BigStation.Recipe3DosingFinish || GVL_BigStation.Recipe4DosingFinish))
                         {
-                            if (RTrig.GetInstance("Ask_For_Finish_PLC").Start(finish.Ask_For_Finish_PLC))
+                            finish.Order_No = "";
+                            finish.Product_Code = "";
+                            finish.job_No = 0;
+                            for (int i = 0; i < 20; i++)
                             {
-                                finish.Order_No = "";
-                                finish.Product_Code = "";
-                                finish.job_No = 0;
-                                for (int i = 0; i < 20; i++)
-                                {
-                                    finish.Material[i] = new UDT1();
-                                }
-                                finish.Ask_For_Finish = false;
-                                finish.ProcessTime = 0;
-                                this.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(finish, 2361);
-                                GVL_BigStation.Recipe1DosingFinish = false;
-                            }
-                        }
-                        else if (GVL_BigStation.Recipe2DosingFinish == true)
-                        {
-                            if (RTrig.GetInstance("Ask_For_Finish_PLC").Start(finish.Ask_For_Finish_PLC))
-                            {
-                                finish.Order_No = "";
-                                finish.Product_Code = "";
-                                finish.job_No = 0;
-                                for (int i = 0; i < 20; i++)
-                                {
-                                    finish.Material[i] = new UDT1();
-                                }
-                                finish.Ask_For_Finish = false;
-                                finish.ProcessTime = 0;
-                                this.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(finish, 2361);
-                                GVL_BigStation.Recipe2DosingFinish = false;
-                            }
-                        }
-                        else if (GVL_BigStation.Recipe3DosingFinish == true)
-                        {
-                            if (RTrig.GetInstance("Ask_For_Finish_PLC").Start(finish.Ask_For_Finish_PLC))
-                            {
-                                finish.Order_No = "";
-                                finish.Product_Code = "";
-                                finish.job_No = 0;
-                                for (int i = 0; i < 20; i++)
-                                {
-                                    finish.Material[i] = new UDT1();
-                                }
-                                finish.Ask_For_Finish = false;
-                                finish.ProcessTime = 0;
-                                this.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(finish, 2361);
-                                GVL_BigStation.Recipe3DosingFinish = false;
-                            }
-                        }
-                        else if (GVL_BigStation.Recipe4DosingFinish == true)
-                        {
-                            if (RTrig.GetInstance("Ask_For_Finish_PLC").Start(finish.Ask_For_Finish_PLC))
-                            {
-                                finish.Order_No = "";
-                                finish.Product_Code = "";
-                                finish.job_No = 0;
-                                for (int i = 0; i < 20; i++)
-                                {
-                                    finish.Material[i] = new UDT1();
-                                }
-                                finish.Ask_For_Finish = false;
-                                finish.ProcessTime = 0;
-                                this.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(finish, 2361);
-                                GVL_BigStation.Recipe4DosingFinish = false;
+                                finish.Material[i] = new UDT1();
                             }
+                            finish.Ask_For_Finish = false;
+                            finish.ProcessTime = 0;
+                            this.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(finish, 2361);
+                            if (GVL_BigStation.Recipe1DosingFinish) GVL_BigStation.Recipe1DosingFinish = false;
+                            if (GVL_BigStation.Recipe2DosingFinish) GVL_BigStation.Recipe2DosingFinish = false;
+                            if (GVL_BigStation.Recipe3DosingFinish) GVL_BigStation.Recipe3DosingFinish = false;
+                            if (GVL_BigStation.Recipe4DosingFinish) GVL_BigStation.Recipe4DosingFinish = false;
                         }
                     }
                     Thread.Sleep(10);
diff --git a/BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml b/BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml
new file mode 100644
index 00000000..cebe958f
--- /dev/null
+++ b/BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml
@@ -0,0 +1,122 @@
+<UserControl x:Class="BPASmartClient.JXJFoodBigStation.View.BomOfMaterialView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920">
+    <UserControl.DataContext>
+        <vm:BomOfMaterialViewModel />
+    </UserControl.DataContext>
+    
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50" />
+            <RowDefinition Height="40" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <!--#region 表格标题栏设置-->
+        <Grid>
+            <StackPanel HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
+                <pry:IcoButton
+                    Margin="5"
+                    Command="{Binding AddMaterial}"
+                    Content="新增数据"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource IcoButtonStyle}" />
+                <pry:IcoButton
+                    Margin="5"
+                    Command="{Binding SaveMaterials}"
+                    Content="保存参数"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource IcoButtonStyle}" />
+            </StackPanel>
+            
+        </Grid>
+        <Grid
+            Grid.Row="1"
+            Margin="0,10,0,0"
+            Background="#ff0C255F">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid Grid.Column="0">
+                <TextBlock  Text="序号" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"/>
+                <Border BorderThickness="1,1,1,1" Cursor="SizeWE"   />
+            </Grid>
+            <TextBlock  Grid.Column="1" FontSize="24" Text="原料编号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <TextBlock  Grid.Column="2" FontSize="24" Text="原料名称" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <TextBlock  Grid.Column="3" FontSize="24" Text="操作" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+        </Grid>
+        <Grid Grid.Row="2">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Visible"  >
+                <ItemsControl ItemsSource="{Binding RawMaterialInfo}" Foreground="Aqua">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid Name="gr" >
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Grid Grid.Column="0" Margin="5">
+                                    <TextBlock
+                                        FontSize="16"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding  RawMaterialCount}" />
+                                </Grid>
+                                <Grid Grid.Column="1" Margin="5">
+                                    <TextBox
+                                        FontSize="16"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center" 
+                                        Text="{Binding  RawMaterialName}" />
+                                </Grid>
+                                <Grid Grid.Column="2">
+                                    <TextBox
+                                        Width="200"
+                                        FontSize="16"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center" 
+                                        Text="{Binding  RawMaterialChineseName}" />
+                                </Grid>
+                                <Grid Grid.Column="3">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                        <pry:IcoButton
+                                            Margin="3,4,4,0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Background="#11F53F62"
+                                            BorderThickness="0"
+                                            Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                            CommandParameter="{Binding RawMaterialCount}"
+                                            Content="删除"
+                                            EnterBackground="#22F53F62"
+                                            Foreground="#FFF53F62"
+                                            IcoText="&#xe68e;"
+                                            Style="{StaticResource IcoButtonStyle}" />
+                                    </StackPanel>
+                                </Grid>
+                            </Grid>
+                            
+                            <DataTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                </Trigger>
+                            </DataTemplate.Triggers>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml.cs b/BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml.cs
new file mode 100644
index 00000000..6c013785
--- /dev/null
+++ b/BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.JXJFoodBigStation.View
+{
+    /// <summary>
+    /// HKPlcCommMonitor.xaml 的交互逻辑
+    /// </summary>
+    public partial class BomOfMaterialView : UserControl
+    {
+        public BomOfMaterialView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
index 98100d7f..084de0e0 100644
--- a/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
@@ -78,19 +78,90 @@
                     Height="40"
                     Margin="5,0,5,0"
                     Command="{Binding ClearAllRecipe}"
-                    Content="清除所有配方"
+                    Content="清除西门子所有配方"
                     FontSize="20"
                     Panel.ZIndex="0"
                     Style="{StaticResource ImageButtonStyle}"></Button>
             </StackPanel>
-            
-           
         </Grid>
         <Grid Grid.Row="1">
-            <WrapPanel>
-                <TextBlock Text="心跳：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                <TextBlock Text="{Binding Heartbeat}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
-            </WrapPanel>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition></ColumnDefinition>
+                <ColumnDefinition></ColumnDefinition>
+            </Grid.ColumnDefinitions>
+            <StackPanel>
+                <WrapPanel>
+                    <TextBlock Text="plc心跳：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding Heartbeat}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="订单号：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBox Width="300" Margin="5" Text="{Binding CancelRecipeCode}" FontSize="24" VerticalAlignment="Center"></TextBox>
+                    <Button Style="{StaticResource ImageButtonStyle}" Width="120" Height="40" FontSize="20" Content="取消订单" Margin="5" Command="{Binding CancelRecipeCommand}"></Button>
+                </WrapPanel>
+            </StackPanel>
+            <StackPanel Grid.Column="1">
+                <WrapPanel>
+                    <TextBlock Text="料仓名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBinName}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="料仓1名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBin1Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="料仓2名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBin2Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="料仓3名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBin3Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="料仓4名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBin4Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="料仓5名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBin5Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="料仓6名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBin6Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="料仓7名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBin7Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="料仓8名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBin8Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="料仓9名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBin9Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="料仓10名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBin10Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="料仓11名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBin11Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="料仓12名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBin12Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="料仓13名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBin13Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Text="料仓14名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding StockBin14Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+            </StackPanel>
         </Grid>
     </Grid>
 </UserControl>
diff --git a/BPASmartClient.JXJFoodBigStation/View/SiemensRecipeSendDownView.xaml b/BPASmartClient.JXJFoodBigStation/View/SiemensRecipeSendDownView.xaml
index 0e61653d..b90c7de9 100644
--- a/BPASmartClient.JXJFoodBigStation/View/SiemensRecipeSendDownView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/SiemensRecipeSendDownView.xaml
@@ -529,7 +529,7 @@
                             VerticalAlignment="Top"
                             Background="Transparent"
                             HorizontalScrollBarVisibility="Hidden"
-                            VerticalScrollBarVisibility="Hidden">
+                            VerticalScrollBarVisibility="Visible">
                                 <ItemsControl ItemsSource="{Binding RawMaterial}">
                                     <ItemsControl.ItemsPanel>
                                         <ItemsPanelTemplate>
diff --git a/BPASmartClient.JXJFoodBigStation/View/StockBinRawMaterialView.xaml b/BPASmartClient.JXJFoodBigStation/View/StockBinRawMaterialView.xaml
index dd78dd20..a0ea54b5 100644
--- a/BPASmartClient.JXJFoodBigStation/View/StockBinRawMaterialView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/StockBinRawMaterialView.xaml
@@ -13,12 +13,12 @@
     
     <Grid Margin="10">
         <Grid.RowDefinitions>
+            <!--<RowDefinition Height="60" />-->
             <RowDefinition Height="60" />
-            <RowDefinition Height="40" />
             <RowDefinition />
         </Grid.RowDefinitions>
         <!--#region 表格标题栏设置-->
-        <Grid>
+        <!--<Grid>
             <StackPanel HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
                 <pry:IcoButton
                     Margin="10"
@@ -36,12 +36,11 @@
                     Style="{StaticResource IcoButtonStyle}" />
             </StackPanel>
             
-        </Grid>
+        </Grid>-->
         <Grid
-            Grid.Row="1"
+            Grid.Row="0"
             Margin="0,10,0,0"
             Background="#ff0C255F">
-
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1*"/>
                 <ColumnDefinition Width="1*"/>
@@ -50,19 +49,18 @@
             </Grid.ColumnDefinitions>
             <Grid Grid.Column="0">
                 <TextBlock  Text="序号" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"/>
-                <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
+                <Border BorderThickness="1,1,1,1" Cursor="SizeWE"   />
             </Grid>
             <TextBlock  Grid.Column="1" FontSize="24" Text="料仓位置" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
-            
             <TextBlock  Grid.Column="2" FontSize="24" Text="原料编号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
-            <TextBlock  Grid.Column="3" FontSize="24" Text="编辑" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <TextBlock  Grid.Column="3" FontSize="24" Text="原料名称" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
         </Grid>
-        <Grid Grid.Row="2">
+        <Grid Grid.Row="1">
             <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"  >
                 <ItemsControl ItemsSource="{Binding RawMaterialInfo}" Foreground="Aqua">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <Grid Name="gr" >
+                            <Grid Name="gr" Margin="5">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition />
                                     <ColumnDefinition />
@@ -81,8 +79,7 @@
                                     
                                 </Grid>
                                 <Grid Grid.Column="1" Margin="5">
-                                    <TextBox
-                                        Width="50"
+                                    <TextBlock
                                         FontSize="16"
                                         TextAlignment="Center"
                                         HorizontalAlignment="Center"
@@ -94,8 +91,7 @@
 
                                 </Grid>
                                 <Grid Grid.Column="2" Margin="5">
-                                    <TextBox
-                                        Width="50"
+                                    <TextBlock
                                         FontSize="16"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center" 
@@ -105,7 +101,15 @@
                                         Cursor="SizeWE"  />
                                 </Grid>
                                 <Grid Grid.Column="3">
-                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                    <TextBlock
+                                        FontSize="16"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center" 
+                                        Text="{Binding  RawMaterialChineseName}" />
+                                    <Border
+                                        BorderThickness="1,0,1,0"
+                                        Cursor="SizeWE"  />
+                                    <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                         <pry:IcoButton
                                             Margin="3,4,4,0"
                                             HorizontalAlignment="Center"
@@ -119,7 +123,7 @@
                                             Foreground="#FFF53F62"
                                             IcoText="&#xe68e;"
                                             Style="{StaticResource IcoButtonStyle}" />
-                                    </StackPanel>
+                                    </StackPanel>-->
                                     
                                 </Grid>
                             </Grid>
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/BomOfMaterialViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/BomOfMaterialViewModel.cs
new file mode 100644
index 00000000..81339514
--- /dev/null
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/BomOfMaterialViewModel.cs
@@ -0,0 +1,75 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.Helper;
+using BPASmartClient.JXJFoodBigStation.Model;
+using BPASmartClient.JXJFoodBigStation.Model.HK_PLC;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodBigStation.ViewModel
+{
+    public class BomOfMaterialViewModel : ObservableObject
+    {
+        public BomOfMaterialViewModel()
+        {
+            RawMaterialInfo = Json<BomMaterial>.Data.RawMaterials;
+            /*if (RawMaterialInfo.Count ==0) 
+            {
+                Json<BomMaterial>.Data.RawMaterials.Clear();
+                ProcessControl.GetInstance.RawMaterialNameWithCode();//原料的名称和编码对应 ：西门子mes定义的物料编码
+                foreach (var item in GVL_BigStation.RawMaterialsNameCode)
+                {
+                    Json<BomMaterial>.Data.RawMaterials.Add(new RawMaterial() { RawMaterialCount = Json<BomMaterial>.Data.RawMaterials.Count + 1, RawMaterialName = item.Key, RawMaterialChineseName = item.Value });
+                }
+                RawMaterialInfo = Json<BomMaterial>.Data.RawMaterials;
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"读取程序的Bom清单");
+            }*/
+            AddMaterial = new RelayCommand(() => 
+            {
+                RawMaterialInfo.Add(new RawMaterial() 
+                {
+                    RawMaterialCount = Json<BomMaterial>.Data.RawMaterials.Count +1 ,
+                });
+            });
+            SaveMaterials = new RelayCommand(() =>
+            {
+                if (MessageNotify.GetInstance.ShowDialog("请确认是否保存！") == true)
+                {
+                    Json<BomMaterial>.Save();
+                    MessageNotify.GetInstance.ShowUserLog($"Mes物料清单保存成功");
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"原料与料仓对应关系保存成功");
+                }
+            });
+            RemoveCommand = new RelayCommand<int>((Count) =>
+            {
+                if (Count is int cnt)
+                {
+                    var res = RawMaterialInfo.FirstOrDefault(p => p.RawMaterialCount == cnt);
+                    if (res != null)
+                    {
+                        if (MessageNotify.GetInstance.ShowDialog("请确认是否删除！") == true)
+                        {
+                            RawMaterialInfo.Remove(res);
+                            NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"删除成功");
+                        }
+                    }
+                }
+            });
+        }
+        public ObservableCollection<RawMaterial> RawMaterialInfo { get; set; } = new ObservableCollection<RawMaterial>();
+        public RelayCommand AddMaterial { get; set; }
+        public RelayCommand SaveMaterials { get; set; }
+        public RelayCommand<int> RemoveCommand { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
index 89b8a58f..44d109e2 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
@@ -10,6 +10,7 @@ using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -49,10 +50,36 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                 Json<RemoteRecipe>.Data.Recipes.Clear();
                 GVL_BigStation.SiemensSendRecipeStatus = 0;
             });
+            CancelRecipeCommand = new RelayCommand(() => 
+            {
+                if (Json<RemoteRecipe>.Data.Recipes != null) 
+                {
+                    int index = Array.FindIndex(Json<RemoteRecipe>.Data.Recipes.ToArray(), p => p.RecipeCode == CancelRecipeCode);
+                    if (index >= 0) 
+                    {
+                        GVL_BigStation.Order_Cancel = true;
+                        GVL_BigStation.Order_CancelRecipeCode = CancelRecipeCode;
+                    }
+                }
+            });
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
                 Heartbeat = GVL_BigStation.HeartBeatFromPlc;
                 Thread.Sleep(100);
+                StockBin1Name = GVL_BigStation.stockBinName.RawMaterialName1;
+                StockBin2Name = GVL_BigStation.stockBinName.RawMaterialName2;
+                StockBin3Name = GVL_BigStation.stockBinName.RawMaterialName3;
+                StockBin4Name = GVL_BigStation.stockBinName.RawMaterialName4;
+                StockBin5Name = GVL_BigStation.stockBinName.RawMaterialName5;
+                StockBin6Name = GVL_BigStation.stockBinName.RawMaterialName6;
+                StockBin7Name = GVL_BigStation.stockBinName.RawMaterialName7;
+                StockBin8Name = GVL_BigStation.stockBinName.RawMaterialName8;
+                StockBin9Name = GVL_BigStation.stockBinName.RawMaterialName9;
+                StockBin10Name = GVL_BigStation.stockBinName.RawMaterialName10;
+                StockBin11Name = GVL_BigStation.stockBinName.RawMaterialName11;
+                StockBin12Name = GVL_BigStation.stockBinName.RawMaterialName12;
+                StockBin13Name = GVL_BigStation.stockBinName.RawMaterialName13;
+                StockBin14Name = GVL_BigStation.stockBinName.RawMaterialName14;
             }), "设备状态读取",true);
         }
         public RelayCommand Tray1InPlace { get; set; }
@@ -62,7 +89,45 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
         public RelayCommand Tray5InPlace { get; set; }
         public RelayCommand ClearTrayInPlace { get; set; }
         public RelayCommand ClearAllRecipe { get; set; }
-        public bool Heartbeat { get { return _mHeartbeat; } set { _mHeartbeat = value; OnPropertyChanged(); } }
-        private bool _mHeartbeat;
+        public static bool Heartbeat { get { return _mHeartbeat; } set { _mHeartbeat = value; OnStaticPropertyChanged(); } }
+        private static bool _mHeartbeat;
+
+        public string CancelRecipeCode { get { return _CancelRecipeCode; } set { _CancelRecipeCode = value; OnPropertyChanged(); } }
+        public string _CancelRecipeCode { get; set; }
+        public static string StockBin1Name { get { return _StockBin1Name; } set { _StockBin1Name = value; OnStaticPropertyChanged(); } }
+        public static string _StockBin1Name { get; set; }
+        public static string StockBin2Name { get { return _StockBin2Name; } set { _StockBin2Name = value; OnStaticPropertyChanged(); } }
+        public static string _StockBin2Name { get; set; }
+        public static string StockBin3Name { get { return _StockBin3Name; } set { _StockBin3Name = value; OnStaticPropertyChanged(); } }
+        public static string _StockBin3Name { get; set; }
+        public static string StockBin4Name { get { return _StockBin4Name; } set { _StockBin4Name = value; OnStaticPropertyChanged(); } }
+        public static string _StockBin4Name { get; set; }
+        public static string StockBin5Name { get { return _StockBin5Name; } set { _StockBin5Name = value; OnStaticPropertyChanged(); } }
+        public static string _StockBin5Name { get; set; }
+        public static string StockBin6Name { get { return _StockBin6Name; } set { _StockBin6Name = value; OnStaticPropertyChanged(); } }
+        public static string _StockBin6Name { get; set; }
+        public static string StockBin7Name { get { return _StockBin7Name; } set { _StockBin7Name = value; OnStaticPropertyChanged(); } }
+        public static string _StockBin7Name { get; set; }
+        public static string StockBin8Name { get { return _StockBin8Name; } set { _StockBin8Name = value; OnStaticPropertyChanged(); } }
+        public static string _StockBin8Name { get; set; }
+        public static string StockBin9Name { get { return _StockBin9Name; } set { _StockBin9Name = value; OnStaticPropertyChanged(); } }
+        public static string _StockBin9Name { get; set; }
+        public static string StockBin10Name { get { return _StockBin10Name; } set { _StockBin10Name = value; OnStaticPropertyChanged(); } }
+        public static string _StockBin10Name { get; set; }
+        public static string StockBin11Name { get { return _StockBin11Name; } set { _StockBin11Name = value; OnStaticPropertyChanged(); } }
+        public static string _StockBin11Name { get; set; }
+        public static string StockBin12Name { get { return _StockBin12Name; } set { _StockBin12Name = value; OnStaticPropertyChanged(); } }
+        public static string _StockBin12Name { get; set; }
+        public static string StockBin13Name { get { return _StockBin13Name; } set { _StockBin13Name = value; OnStaticPropertyChanged(); } }
+        public static string _StockBin13Name { get; set; }
+        public static string StockBin14Name { get { return _StockBin14Name; } set { _StockBin14Name = value; OnStaticPropertyChanged(); } }
+        public static string _StockBin14Name { get; set; }
+        public RelayCommand CancelRecipeCommand { get; set; }
+
+        public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
+        public static void OnStaticPropertyChanged([CallerMemberName] string PropName = "")
+        {
+            StaticPropertyChanged?.Invoke(null, new PropertyChangedEventArgs(PropName));
+        }
     }
 }
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
index 9c1ecc13..6e9ac351 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
@@ -34,7 +34,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                     IsWashingBarrel = rm.IsWashingBarrel;
                     foreach (var item in rm.RawMaterial)
                     {
-                        item.RawMaterialCount = (short)Array.FindIndex(ProcessControl.GetInstance.RawMaterialsInfo.ToArray(), p => p.RawMaterialName == item.RawMaterialName);
+                        item.RawMaterialCount = Array.FindIndex(ProcessControl.GetInstance.RawMaterialsInfo.ToArray(), p => p.RawMaterialName == item.RawMaterialName);
                         RawMaterialsInfo.Add(item);
                     }
                 }
@@ -69,13 +69,13 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                         {
                             if (IsWashingBarrel)
                             {
-                                Json<LocalRecipe>.Data.Recipes.Add(new RecipeData { RecipeCode = recipeCode,RecipeName = RecipeName, TrayCode = TrayCode, IsWashingBarrel = IsWashingBarrel });
+                                Json<LocalRecipe>.Data.Recipes.Add(new RecipeData { RecipeCode = recipeCode,RecipeName = RecipeName, TrayCode = TrayCode, IsWashingBarrel = IsWashingBarrel, OrderType="洗桶" });
                                 if (RawMaterialsInfo.Count > 0)
                                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Info, App.MainWindow, "提示", $"订单类型为洗桶，不保存原料信息");
                             }
                             else
                             {
-                                Json<LocalRecipe>.Data.Recipes.Add(new RecipeData { RecipeCode = recipeCode, RawMaterial = RawMaterialsInfo, RecipeName = RecipeName, TrayCode = TrayCode, IsWashingBarrel = IsWashingBarrel });
+                                Json<LocalRecipe>.Data.Recipes.Add(new RecipeData { RecipeCode = recipeCode, RawMaterial = RawMaterialsInfo, RecipeName = RecipeName, TrayCode = TrayCode, IsWashingBarrel = IsWashingBarrel, OrderType = "配料" });
                             }
                             Json<LocalRecipe>.Save();
                             NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"配方保存完成");
@@ -110,7 +110,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                 }
             });
 
-            RemoveRecipe = new RelayCommand<short>((index) => {
+            RemoveRecipe = new RelayCommand<int>((index) => {
                 var res = RawMaterialsInfo.FirstOrDefault(p => p.RawMaterialCount == index);
                 if (res != null)
                     RawMaterialsInfo.Remove(res);
@@ -137,7 +137,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
 
         public RelayCommand Comfirm { get; set; }
 
-        public RelayCommand<short> RemoveRecipe { get; set; }
+        public RelayCommand<int> RemoveRecipe { get; set; }
 
         public ObservableCollection<RawMaterial> RawMaterialsInfo { get; set; } = new ObservableCollection<RawMaterial>() ;
 
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
index 14a76d48..4f9acbb1 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
@@ -47,7 +47,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                             if (!ProcessControl.GetInstance.LocalRecipes.Contains(res))
                             {
                                 ProcessControl.GetInstance.LocalRecipes.Add(res);
-                                MessageNotify.GetInstance.ShowAlarmLog($"手动下发配方:{recipeName}完成");
+                                MessageNotify.GetInstance.ShowRunLog($"手动下发配方:{recipeName}完成");
                                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"配方下发完成");
                             }
                         }
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/StockBinRawMaterialViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/StockBinRawMaterialViewModel.cs
index f5ade366..0e6767b9 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/StockBinRawMaterialViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/StockBinRawMaterialViewModel.cs
@@ -22,33 +22,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
     {
         public StockBinRawMaterialViewModel()
         {
-            RawMaterialInfo = Json<RawMaterialData>.Data.RawMaterial;
-            RemoveCommand = new RelayCommand<Object>((loc) =>
-            {
-                if (loc is int pos)
-                {
-                    var res = RawMaterialInfo.FirstOrDefault(p => p.RawMaterialLocation == pos);
-                    if (res != null) RawMaterialInfo.Remove(res);
-                }
-            });
-            SaveRawMaterialPara = new RelayCommand(() => 
-            {
-                Json<RawMaterialData>.Save();
-                foreach (var item in Json<RawMaterialData>.Data.RawMaterial) 
-                {
-                    MessageNotify.GetInstance.ShowUserLog($"料仓位置:"+ item.RawMaterialLocation+ ",物料编码:" + item.RawMaterialName);
-                }
-                MessageNotify.GetInstance.ShowUserLog($"原料与料仓对应关系保存成功");
-                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"原料与料仓对应关系保存成功");
-            });
-            UpdateRawMaterial = new RelayCommand(() =>
-            {
-                RawMaterialInfo.Add(new RawMaterial() { RawMaterialCount = (short)(RawMaterialInfo.Count + 1)});
-            });
         }
-        public ObservableCollection<RawMaterial> RawMaterialInfo { get; set; } = new ObservableCollection<RawMaterial>();
-        public RelayCommand<Object> RemoveCommand { get; set; }
-        public RelayCommand SaveRawMaterialPara { get; set; }
-        public RelayCommand UpdateRawMaterial { get; set; }
+        public ObservableCollection<RawMaterial> RawMaterialInfo => ProcessControl.GetInstance.HardWareRawMaterialInfo;
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
index 191917d2..70aafb9e 100644
--- a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
@@ -37,6 +37,7 @@ namespace BPASmartClient.JXJFoodSmallStation
             }
             BPASmartClient.Helper.SystemHelper.GetInstance.CreateDesktopShortcut();
             base.OnStartup(e);
+            
             MenuInit();
             DataInit();
             Init();
@@ -249,7 +250,13 @@ namespace BPASmartClient.JXJFoodSmallStation
                 AssemblyName = "BPASmartClient.JXJFoodSmallStation",
                 ToggleWindowPath = "View.DeviceListView"
             });
-
+            DeviceMonitor.Add(new SubMenumodel()
+            {
+                SubMenuName = "变量监控",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.JXJFoodSmallStation",
+                ToggleWindowPath = "View.PlcVarMonitorView"
+            });
             DeviceMonitor.Add(new SubMenumodel()
             {
                 SubMenuName = "设备状态",
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcCommAttribute.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcCommAttribute.cs
new file mode 100644
index 00000000..8d72460d
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcCommAttribute.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.Model.GVL
+{
+    [AttributeUsage(AttributeTargets.Property)]
+    public sealed class PlcCommAttribute:Attribute
+    {
+        public PlcCommAttribute(string address,string des) 
+        {
+            Address = address;
+            Describe = des;
+        }
+        public string Describe { get; set; }
+        public string Address { get; set; }
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcInfos.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcInfos.cs
new file mode 100644
index 00000000..472a0ef7
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcInfos.cs
@@ -0,0 +1,27 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.Model.GVL
+{
+    public class PlcInfos: ObservableObject
+    {
+        public int Count { get { return _Count; } set { _Count = value;OnPropertyChanged(); } }
+        private int _Count { get; set; }
+
+        public string Name { get { return _Name; } set { _Name = value; OnPropertyChanged(); } }
+        private string _Name { get; set; }
+        public string Address { get { return _Address; } set { _Address = value; OnPropertyChanged(); } }
+        private string _Address { get; set; }
+        public string Type { get { return _Type; } set { _Type = value; OnPropertyChanged(); } }
+        private string _Type { get; set; }
+        public string Describe { get { return _Describe; } set { _Describe = value; OnPropertyChanged(); } }
+        private string _Describe { get; set; }
+        public string Value { get { return _Value; } set { _Value = value; OnPropertyChanged(); } }
+        private string _Value { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
index 6e50873a..3313406a 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
@@ -1,4 +1,5 @@
-using BPASmartClient.JXJFoodSmallStation.Model.Siemens;
+using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
+using BPASmartClient.JXJFoodSmallStation.Model.Siemens;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -15,12 +16,24 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         public static GVL_SmallStation GetInstance => SmallStation ?? (SmallStation = new GVL_SmallStation());
         private GVL_SmallStation() { }
 
+        public static PlcReadAddressDB3 plcReadDataDB3 { get; set; } = new PlcReadAddressDB3();
+
+        /// <summary>
+        /// 订单取消
+        /// </summary>
         public static bool Order_Cancel { get; set; }
+        /// <summary>
+        /// 取消订单的编号
+        /// </summary>
         public static string Order_CancelRecipeCode { get; set; } = "";
         /// <summary>
         /// 托盘1托盘到位 逻辑完成
         /// </summary>
-        public static bool TrayLogicFinish { get; set; } = false;
+        public static int Tray1LogicFinish { get; set; } = 0;
+        /// <summary>
+        /// 托盘2托盘到位 逻辑完成
+        /// </summary>
+        public static int Tray2LogicFinish { get; set; } = 0;
         /// <summary>
         /// 托盘1有货架
         /// </summary>
@@ -29,20 +42,39 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// 托盘2有货架
         /// </summary>
         public static bool Station2HaveTray { get; set; }
-
+        /// <summary>
+        /// 托盘2有货架
+        /// </summary>
+        public static int nStep { get; set; }
+        /// <summary>
+        /// 托盘1传感器信号
+        /// </summary>
         public static bool Station1Sensor { get; set; }
         /// <summary>
         /// 托盘2传感器信号
         /// </summary>
         public static bool Station2Sensor { get; set; }
+        /// <summary>
+        /// 托盘1气缸信号
+        /// </summary>
         public static bool Station1Cylinder { get; set; }
         /// <summary>
         /// 托盘2气缸信号
         /// </summary>
         public static bool Station2Cylinder { get; set; }
-
+        /// <summary>
+        /// AGV放托盘1完成
+        /// </summary>
         public static bool AGV_PutTray1Finish { get; set; }
+        /// <summary>
+        /// AGV取托盘1完成
+        /// </summary>
         public static bool AGV_GetTray1Finish { get; set; }
+
+
+        public static bool AGV_PutTray2Finish { get; set; }
+        public static bool AGV_GetTray2Finish { get; set; }
+
         public static bool CylinderReset { get; set; }
         /// <summary>
         /// 配料站料仓数目
@@ -59,13 +91,13 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public static bool IsAllowSiemensSendRecipe { get; set; } = false;
         /// <summary>
-        /// 西门子下发配方状态 0:等待下发配方 1：请求下发配方 2：上位机接收配方 3：配方接收完成 4：请求配料 5：西门子开始配料确认 6:配方配料完成 7：配料完成确认
+        /// 西门子下发配方状态 0:等待下发配方 1：请求下发配方 2：上位机接收配方 3：配方接收配方完成 4：上位机向西门子请求配料 5：西门子确认开始配料 6:西门子确认开始配料 信号复位
         /// </summary>
         public static int SiemensSendRecipeStatus { get; set; } = 0;
         /// <summary>
         /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方
         /// </summary>
-        public int RecipeStatusID { get; set; } = 0;
+        public int RecipeStatusIDTray1 { get; set; } = 0;
 
         /// <summary>
         /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方
@@ -146,6 +178,35 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// 系统运行状态
         /// </summary>
         public static int Time { get; set; } = 1000;
+        /// <summary>
+        /// 取消订单的步骤： 1-9：配料过程中配方1取消配方 10-19：配料过程中配方2取消配方 20-29：下发订单的过程中取消订单(订单未到达上位机)  30-39：下发订单的过程中取消订单(订单未到达PLC)
+        /// </summary>
+        public static int OrderCancelStep = 0;
+
+        /// <summary>
+        /// 机器人的状态
+        /// </summary>
+        public static ushort RobotStatus = 0;
+        /// <summary>
+        /// 机器人的状态
+        /// </summary>
+        public static byte RobotProgramNum = 0;
         #endregion
     }
+    public enum IssueRecipeCondition
+    {
+        等待小料站PLC允许下配方,
+        等待西门子下发配方,
+        等待西门子下发配方信号复位,
+        等待上位机请求配料,
+        等待西门子确认配料,
+        等待西门子确认配料信号复位,
+    }
+    public enum ProcessCondition
+    {
+        等待AGV到位,
+        等待小料站PLC接受配方完成,
+        等待配方配料完成,
+        等待AGV取托盘完成
+    }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/DataComm.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/DataComm.cs
deleted file mode 100644
index f47bd894..00000000
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/DataComm.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using BPASmartClient.Helper;
-using BPASmartClient.Modbus;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
-{
-    public class DataComm
-    {
-        public volatile static DataComm Instance;
-        public static DataComm GetInstance => Instance ?? (new DataComm());
-        public DataComm() { }
-        /// <summary>
-        /// 是否允许配料
-        /// </summary>
-        public bool IsAllowDosing { get { return _mIsAllowDosing; } set { _mIsAllowDosing = value; } }
-        private bool _mIsAllowDosing;
-
-        public bool DosingFinishToPLC { get { return _mDosingFinishToPLC; } set { _mDosingFinishToPLC = value; } }
-        private bool _mDosingFinishToPLC;
-
-        private int _mStockBinLocationToPLC;
-        public int StockBinLocationToPLC { get { return _mStockBinLocationToPLC; } set { _mStockBinLocationToPLC = value; } }
-
-        public bool StatusSignToBPA { get { return _mStatusSignToBPA; } set { _mStatusSignToBPA = value; } }
-        private bool _mStatusSignToBPA;
-
-        private int _mStockBinLocationToBPA;
-        public int StockBinLocationToBPA { get { return _mStockBinLocationToBPA; } set { _mStockBinLocationToBPA = value; } }
-
-        private int _mBarrelNumToPLC;
-        public int BarrelNumToPLC { get { return _mBarrelNumToPLC; } set { _mBarrelNumToPLC = value; } }
-       
-        /*public ConcurrentDictionary<int, StockBinLocations> DeviceLists = new ConcurrentDictionary<int, StockBinLocations>();*/
-    }
-   
-}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceRead.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceRead.cs
new file mode 100644
index 00000000..dee7a188
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceRead.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
+{
+    public class HKDeviceRead
+    {
+        public bool HeartBeat { get; set; }
+        public bool SystemMode { get; set; }
+        public bool SystemStart { get; set; }
+        public bool SystemPause { get; set; }
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
index c6809398..6ccc889a 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
@@ -27,42 +27,47 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
                     {
                         DeviceStatus = data;
                     }
+                    var res1 = this.HK_PLC_S7.ReadClass<PlcReadAddressDB3>(3);
+                    if (res1 != null && res1 is PlcReadAddressDB3 data1)
+                    {
+                        GVL_SmallStation.plcReadDataDB3 = data1;
+                    }
                 }
             }),"海科PLC设备状态",true);
         }
-        /// <summary>
-        /// 单个配料机配料完成
-        /// </summary>
-        /// <param name="value"></param>
-        public void SingleDosing(uint value)
-        {
-            if (IsConnected)
-            {
-                HK_PLC_S7.Write(HKPlcCommAddress.SingleStockBinLocationToPLC, value);
-                HK_PLC_S7.Write(HKPlcCommAddress.SingleDosingFinishToPLC, (ushort)1);
-            }
-        }
-        /// <summary>
-        /// 复位plc允许接料信号
-        /// </summary>
-        public void AllowDosingSignReset() 
-        {
-            HK_PLC_S7.Write(HKPlcCommAddress.IsAllowDosing,(ushort)0);
-        }
-        /// <summary>
-        /// 复位plc到达某料仓信号
-        /// </summary>
-        public void StockStateSignReset()
-        {
-            HK_PLC_S7.Write(HKPlcCommAddress.StockState, (ushort)0);
-        }
-        /// <summary>
-        /// 复位一个配方配料完成信号
-        /// </summary>
-        public void RecipeDosingFinishReset()
-        {
-            HK_PLC_S7.Write(HKPlcCommAddress.RecipeDosingFinish, (ushort)0);
-        }
+        ///// <summary>
+        ///// 单个配料机配料完成
+        ///// </summary>
+        ///// <param name="value"></param>
+        //public void SingleDosing(uint value)
+        //{
+        //    if (IsConnected)
+        //    {
+        //        HK_PLC_S7.Write(HKPlcCommAddress.SingleStockBinLocationToPLC, value);
+        //        HK_PLC_S7.Write(HKPlcCommAddress.SingleDosingFinishToPLC, (ushort)1);
+        //    }
+        //}
+        ///// <summary>
+        ///// 复位plc允许接料信号
+        ///// </summary>
+        //public void AllowDosingSignReset() 
+        //{
+        //    HK_PLC_S7.Write(HKPlcCommAddress.IsAllowDosing,(ushort)0);
+        //}
+        ///// <summary>
+        ///// 复位plc到达某料仓信号
+        ///// </summary>
+        //public void StockStateSignReset()
+        //{
+        //    HK_PLC_S7.Write(HKPlcCommAddress.StockState, (ushort)0);
+        //}
+        ///// <summary>
+        ///// 复位一个配方配料完成信号
+        ///// </summary>
+        //public void RecipeDosingFinishReset()
+        //{
+        //    HK_PLC_S7.Write(HKPlcCommAddress.RecipeDosingFinish, (ushort)0);
+        //}
         /// <summary>
         /// 下发配方数据
         /// </summary>
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
index ec42c683..8891ccf7 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.JXJFoodSmallStation.Model.GVL;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,8 +9,170 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
 {
     public class PlcReadAddressDB3
     {
-        public bool[] VarBool { get; set; } =new bool[17];
-        public Single[] BarrelPos { get; set; } = new Single[8];
-        public bool[] IsAllowDosing { get; set; } = new bool[8];
+        [PlcComm("DB3.DBX0.0","心跳")]
+        public bool HeartBeat { get; set; }
+        [PlcComm("DB3.DBX0.1", "备用1")]
+        public bool Standby1 { get; set; }
+        [PlcComm("DB3.DBX0.2", "备用2")]
+        public bool Standby2 { get; set; }
+        [PlcComm("DB3.DBX0.3", "备用3")]
+        public bool Standby3 { get; set; }
+        [PlcComm("DB3.DBX0.4", "备用4")]
+        public bool Standby4 { get; set; }
+        [PlcComm("DB3.DBX0.5", "备用5")]
+        public bool Standby5 { get; set; }
+        [PlcComm("DB3.DBX0.6", "备用6")]
+        public bool Standby6 { get; set; }
+        [PlcComm("DB3.DBX0.7", "工站1有托盘")]
+        public bool WorkStation1HaveTray { get; set; }
+
+        [PlcComm("DB3.DBX1.0", "工站2有托盘")]
+        public bool WorkStation2HaveTray { get; set; }
+        [PlcComm("DB3.DBX1.1", "工站1配料完成")]
+        public bool WorkStation1DosingComplete { get; set; }
+        [PlcComm("DB3.DBX1.2", "工站2配料完成")]
+        public bool WorkStation2DosingComplete { get; set; }
+        [PlcComm("DB3.DBX1.3", "工站1接收配方完成")]
+        public bool WorkStation1ReceviceRecipeComplete { get; set; }
+        [PlcComm("DB3.DBX1.4", "工站2接收配方完成")]
+        public bool WorkStation2ReceviceRecipeComplete { get; set; }
+        [PlcComm("DB3.DBX1.5", "工站1气缸报警")]
+        public bool WorkStation1CylinderAlarm { get; set; }
+        [PlcComm("DB3.DBX1.6", "工站2气缸报警")]
+        public bool WorkStation2CylinderAlarm { get; set; }
+        [PlcComm("DB3.DBX1.7", "允许配方1下发配方")]
+        public bool AllowRecipe1Issue { get; set; }
+
+        [PlcComm("DB3.DBX2.0", "允许配方2下发配方")]
+        public bool AllowRecipe2Issue { get; set; }
+        [PlcComm("DB3.DBX2.1", "工站1传感器信号")]
+        public bool WorkStation1Sensor { get; set; }
+        [PlcComm("DB3.DBX2.2", "工站2传感器信号")]
+        public bool WorkStation2Sensor { get; set; }
+        [PlcComm("DB3.DBX2.3", "工站1气缸信号，false=伸出")]
+        public bool WorkStation1Cylinder { get; set; }
+        [PlcComm("DB3.DBX2.4", "工站2气缸信号，false=伸出")]
+        public bool WorkStation2Cylinder { get; set; }
+        [PlcComm("DB3.DBX2.5", "工站1取消订单")]
+        public bool WorkStation1OrderCancel { get; set; }
+        [PlcComm("DB3.DBX2.6", "工站2取消订单")]
+        public bool WorkStation2OrderCancel { get; set; }
+        [PlcComm("DB3.DBX2.7", "备用7")]
+        public bool Standby7 { get; set; }
+        [PlcComm("DB3.DBB3", "备用")]
+        public byte Standby81 { get; set; }
+        [PlcComm("DB3.DBB4", "备用")]
+        public byte Standby82 { get; set; }
+        [PlcComm("DB3.DBB5", "备用")]
+        public byte Standby83 { get; set; }
+        [PlcComm("DB3.DBW6", "备用")]
+        public int Standby9 { get; set; }
+
+        [PlcComm("DB3.DBD10", "工站1_1号桶的位置")]
+        public int WorkStation1Barrel1Pos { get; set; }
+        [PlcComm("DB3.DBD14", "工站1_2号桶的位置")]
+        public int WorkStation1Barrel2Pos { get; set; }
+        [PlcComm("DB3.DBD18", "工站1_3号桶的位置")]
+        public int WorkStation1Barrel3Pos { get; set; }
+        [PlcComm("DB3.DBD22", "工站1_4号桶的位置")]
+        public int WorkStation1Barrel4Pos { get; set; }
+        [PlcComm("DB3.DBD26", "工站2_1号桶的位置")]
+        public int WorkStation2Barrel1Pos { get; set; }
+        [PlcComm("DB3.DBD30", "工站2_2号桶的位置")]
+        public int WorkStation2Barrel2Pos { get; set; }
+        [PlcComm("DB3.DBD34", "工站2_3号桶的位置")]
+        public int WorkStation2Barrel3Pos { get; set; }
+        [PlcComm("DB3.DBD38", "工站2_4号桶的位置")]
+        public int WorkStation2Barrel4Pos { get; set; }
+
+        [PlcComm("DB3.DBD42", "备用")]
+        public int StandBy42 { get; set; }
+        [PlcComm("DB3.DBD46", "备用")]
+        public int StandBy46 { get; set; }
+
+        [PlcComm("DB3.DBX50.0", "工站1_1号桶允许配料")]
+        public bool WorkStation1Barrel1AllowDosing { get; set; }
+        [PlcComm("DB3.DB50.1", "工站1_2号桶允许配料")]
+        public bool WorkStation1Barrel2AllowDosing { get; set; }
+        [PlcComm("DB3.DB50.2", "工站1_3号桶允许配料")]
+        public bool WorkStation1Barrel3AllowDosing { get; set; }
+        [PlcComm("DB3.DB50.3", "工站1_4号桶允许配料")]
+        public bool WorkStation1Barrel4AllowDosing { get; set; }
+        [PlcComm("DB3.DB50.4", "工站2_1号桶允许配料")]
+        public bool WorkStation2Barrel1AllowDosing { get; set; }
+        [PlcComm("DB3.DB50.5", "工站2_2号桶允许配料")]
+        public bool WorkStation2Barrel2AllowDosing { get; set; }
+        [PlcComm("DB3.DB50.6", "工站2_3号桶允许配料")]
+        public bool WorkStation2Barrel3AllowDosing { get; set; }
+        [PlcComm("DB3.DB50.7", "工站2_4号桶允许配料")]
+        public bool WorkStation2Barrel4AllowDosing { get; set; }
+
+        [PlcComm("DB3.DBD52", "备用")]
+        public int Standby15 { get; set; }
+        [PlcComm("DB3.DBD56", "备用")]
+        public int Standby16 { get; set; }
+        [PlcComm("DB3.DBD60", "备用")]
+        public int Standby17 { get; set; }
+        [PlcComm("DB3.DBD64", "备用")]
+        public int Standby18 { get; set; }
+        [PlcComm("DB3.DBD68", "备用")]
+        public int Standby19 { get; set; }
+        [PlcComm("DB3.DBD72", "备用")]
+        public int Standby20 { get; set; }
+        [PlcComm("DB3.DBD76", "备用")]
+        public int Standby21 { get; set; }
+        [PlcComm("DB3.DBD80", "备用")]
+        public int Standby22 { get; set; }
+        [PlcComm("DB3.DBD84", "备用")]
+        public int Standby23 { get; set; }
+        [PlcComm("DB3.DBD88", "备用")]
+        public int Standby24 { get; set; }
+        [PlcComm("DB3.DBD92", "备用")]
+        public int Standby25 { get; set; }
+        [PlcComm("DB3.DBD96", "备用")]
+        public int Standby26 { get; set; }
+
+        [PlcComm("DB3.DBX100.0", "机器人运行模式")]
+        public bool RobotRunMode { get; set; }
+        [PlcComm("DB3.DBX100.1", "机器人自动运行")]
+        public bool RobotAutoRun { get; set; }
+        [PlcComm("DB3.DBX100.2", "机器人停止")]
+        public bool RobotStop { get; set; }
+        [PlcComm("DB3.DBX100.3", "机器人运行")]
+        public bool RobotRun { get; set; }
+        [PlcComm("DB3.DBX100.4", "机器人运行报警")]
+        public bool RobotRunAlarm { get; set; }
+        [PlcComm("DB3.DBX100.5", "机器人在原点")]
+        public bool RobotInHomed { get; set; }
+        [PlcComm("DB3.DBX100.6", "机器人备用")]
+        public bool Standby30 { get; set; }
+        [PlcComm("DB3.DBX100.7", "机器人取空桶完成")]
+        public bool RobotGetEmptyBarrelComplete { get; set; }
+
+        [PlcComm("DB3.DBX101.0", "机器人放空桶完成")]
+        public bool RobotPutEmptyBarrelComplete { get; set; }
+        [PlcComm("DB3.DBX101.1", "机器人取满桶完成")]
+        public bool RobotGetFullBarrelComplete { get; set; }
+        [PlcComm("DB3.DBX101.2", "机器人放满桶完成")]
+        public bool RobotPutFullBarrelComplete { get; set; }
+        [PlcComm("DB3.DBX101.3", "备用")]
+        public bool Standby31 { get; set; }
+        [PlcComm("DB3.DBX101.4", "备用")]
+        public bool Standby32 { get; set; }
+        [PlcComm("DB3.DBX101.5", "备用")]
+        public bool Standby33 { get; set; }
+        [PlcComm("DB3.DBX101.6", "备用")]
+        public bool Standby34 { get; set; }
+        [PlcComm("DB3.DBX101.7", "备用")]
+        public bool Standby35 { get; set; }
+
+        [PlcComm("DB3.DBB102", "机器人运行的程序号")]
+        public byte RobotProgramNum { get; set; }
+        [PlcComm("DB3.DBB103", "备用")]
+        public byte Standby36 { get; set; }
+        [PlcComm("DB3.DBB104", "备用")]
+        public byte Standby37 { get; set; }
+        [PlcComm("DB3.DBB105", "备用")]
+        public byte Standby38 { get; set; }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index bf45b196..2c87f223 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -1,5 +1,6 @@
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.Helper;
+using BPASmartClient.JXJFoodSmallStation.Model.GVL;
 using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
 using BPASmartClient.JXJFoodSmallStation.Model.RawMaterial;
 using BPASmartClient.JXJFoodSmallStation.Model.Siemens;
@@ -11,6 +12,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Configuration;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -18,7 +20,7 @@ using System.Threading.Tasks;
 namespace BPASmartClient.JXJFoodSmallStation.Model
 {
     public class ProcessControl
-    { 
+    {
         private volatile static ProcessControl _Instance;
         public static ProcessControl GetInstance => _Instance ?? (_Instance = new ProcessControl());
         private ProcessControl() { }
@@ -50,283 +52,17 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// 接收原料数据
         /// </summary>
         public RecipeRawMaterial RawMaterial;
-        public void Init()
-        {
-            testData();
-            /*for (int i = 0; i < 16; i++)
-            {
-                if (DeviceInquire.GetInstance.GetDevice(i).DeviceName != null)
-                {
-                    if (!RawMaterialsNamePos.ContainsKey(DeviceInquire.GetInstance.GetDevice(i).DeviceName)) 
-                    {
-                        RawMaterialsNamePos.Add(DeviceInquire.GetInstance.GetDevice(i).DeviceName, (short)DeviceInquire.GetInstance.GetDevice(i).deviceStatus.DeviceNum);
-                    }
-                }
-            }*/
-            ActionManage.GetInstance.CancelRegister("SiemensRecipeRecive");
-            ActionManage.GetInstance.Register(new Action<object>((res) =>
-            {
-                ObservableCollection<RemoteRecipeRawMaterial> RawMaterials = new ObservableCollection<RemoteRecipeRawMaterial>();
-                ObservableCollection<WindSendRawMaterial> WindSendData = new ObservableCollection<WindSendRawMaterial>();
-                if (SiemensDevice.IsConnected)
-                {
-                    if (res != null && res is XL_Start_DB recipe) 
-                    {
-                        if (!string.IsNullOrEmpty(recipe.RecipeCode)) {
-                            RawMaterials.Clear();
-                            for (int i = 0; i < GVL_SmallStation.Max_DosingSotckBinNum; i++)
-                            {
-                                if (!string.IsNullOrEmpty(recipe.Material[i].Material_Name))
-                                {
-                                    if (RawMaterialsNamePos.ContainsKey(recipe.Material[i].Material_Name))
-                                    {
-                                        RawMaterials.Add(new RemoteRecipeRawMaterial()
-                                        {
-                                            RawMaterialName = recipe.Material[i].Material_Name,
-                                            RawMaterialBarrelNum = recipe.Material[i].Material_BarrelNum,
-                                            RawMaterialWeight = recipe.Material[i].Material_Weight,
-                                            RawMaterialLocation = (int)RawMaterialsNamePos[recipe.Material[i].Material_Name]
-                                        });
-                                    }
-                                    else
-                                    {
-                                        MessageNotify.GetInstance.ShowRunLog($"原料：{recipe.Material[i].Material_Name}，不在配料表");
-                                        //MessageNotify.GetInstance.AlarmLog("配方名称与本地不符合");
-                                    }
-                                }
-                                else
-                                {
-                                    break;
-                                }
-                            }
-                            for (int i = 0; i < GVL_SmallStation.Max_PowderSotckBinNum; i++)
-                            {
-                                if (!string.IsNullOrEmpty(recipe.Powder[i].Powder_Name))
-                                {
-                                    WindSendData.Add(new WindSendRawMaterial()
-                                    {
-                                        RawMaterialName = recipe.Powder[i].Powder_Name,
-                                        RawMaterialWeight = recipe.Powder[i].Powder_Weight
-                                    });
-                                }
-                                else
-                                {
-                                    break;
-                                }
-                            }
-                            App.Current.Dispatcher.Invoke(() => {
-                                Json<RemoteRecipeDataColl>.Data.Recipes.Add(new RemoteRecipeData()
-                                {
-                                    RecipeName = recipe.RecipeName,
-                                    RecipeCode = recipe.RecipeCode,
-                                    RawMaterial = RawMaterials,
-                                    TrayCode = recipe.StockCode,
-                                    WindSend = WindSendData
-                                });
-                            });
-                        }
-                    }
-                }
-            }), "SiemensRecipeRecive", true);
-            ActionManage.GetInstance.CancelRegister("SiemensRecipeFinish");
-            ActionManage.GetInstance.Register(new Action<object>((res) =>
-            {
-                if (SiemensDevice.IsConnected)
-                {
-                    if (res != null && res is RemoteRecipeData recipe)
-                    {
-                        RecipeFinishInfo.Order_No = recipe.RecipeCode;
-                        RecipeFinishInfo.Product_Code = recipe.RecipeName;
-                        RecipeFinishInfo.Job_No = (short)recipe.TrayCode;
-                        for (int i = 0; i < recipe.RawMaterial.Count; i++)
-                        {
-                            RecipeFinishInfo.Material[i] = new UDT1();
-                            RecipeFinishInfo.Material[i].Material_Name = recipe.RawMaterial.ElementAt(i).RawMaterialName;
-                            RecipeFinishInfo.Material[i].Material_BarrelNum = recipe.RawMaterial.ElementAt(i).RawMaterialBarrelNum;
-                            RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = recipe.RawMaterial.ElementAt(i).Laying_Off_Weight;
-                        }
-                        for (int i = 0; i < recipe.WindSend.Count; i++)
-                        {
-                            RecipeFinishInfo.Powder[i] = new UDT2();
-                            RecipeFinishInfo.Powder[i].Powder_Name = recipe.RawMaterial.ElementAt(i).RawMaterialName;
-                            RecipeFinishInfo.Powder[i].Powder_Weight = recipe.RawMaterial.ElementAt(i).Laying_Off_Weight;
-                        }
-                        if (GVL_SmallStation.SiemensSendRecipeStatus == 6)
-                        {
-                            GVL_SmallStation.SiemensSendRecipeStatus = 7;
-                            RecipeFinishInfo.Ask_For_Finish = true;
-                            SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
-                        }
-                    } 
-                }
-            }), "SiemensRecipeFinish", true);
-            ActionManage.GetInstance.CancelRegister("LocalSimulationRecipeIssue");
-            ActionManage.GetInstance.Register(new Action<Object>((res) =>
-            {
-                if (res != null && res is RemoteRecipeData recipe)
-                {
-                    Json<RemoteRecipeDataColl>.Data.Recipes.Add(recipe);
-                }
-            }), "LocalSimulationRecipeIssue", true);
-
-            ActionManage.GetInstance.Register(new Action(() => 
-            {
-                Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
-                GVL_SmallStation.SiemensSendRecipeStatus = 0;
 
-                MessageNotify.GetInstance.ShowRunLog("系统流程复位，等待西门子重新下发订单");
-            }), "BPASystemReset",true);
+        public string? HK_PLC_IP = ConfigurationManager.AppSettings["HKPlc_IP"];
+        public string? Siemens_PLC_IP = ConfigurationManager.AppSettings["Siemens_IP"];
+        public string? WindSend_PLC_IP = ConfigurationManager.AppSettings["WindSend_IP"];
 
-            string HK_PLC_IP = ConfigurationManager.AppSettings["HKPlc_IP"];
-            string Siemens_PLC_IP = ConfigurationManager.AppSettings["Siemens_IP"];
-            string WindSend_PLC_IP = ConfigurationManager.AppSettings["WindSend_IP"];
-            try
-            {
-                if (Json<DevicePar>.Data.deviceConnectPar.HKPlcConnect)
-                {
-                    HKDevice.HK_PLC_S7.Connect(S7.Net.CpuType.S71200, HK_PLC_IP);
-                    if (HKDevice.IsConnected) MessageNotify.GetInstance.ShowRunLog("海科plc连接成功");
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageNotify.GetInstance.ShowAlarmLog("海科plc连接失败，等待重新连接");
-            }
-            finally 
-            {
-                HKDevice.Init();
-                MessageNotify.GetInstance.ShowRunLog("海科plc初始化完成");
-            }
-            try
-            {
-                if (Json<DevicePar>.Data.deviceConnectPar.SiemensConnect)
-                {
-                    SiemensDevice.Siemens_PLC_S7.Connect(S7.Net.CpuType.S71500, Siemens_PLC_IP);
-                    if (SiemensDevice.IsConnected) MessageNotify.GetInstance.ShowRunLog("西门子plc连接成功");
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageNotify.GetInstance.ShowAlarmLog("西门子plc连接失败，等待重新连接");
-            }
-            finally 
-            {
-                SiemensDevice.Init();
-                MessageNotify.GetInstance.ShowRunLog("西门子plc初始化完成");
-            }
-            try
-            {
-                if (Json<DevicePar>.Data.deviceConnectPar.WindSendConnect)
-                {
-                    WindSendDevice.Siemens_PLC_S7.Connect(S7.Net.CpuType.S71200, WindSend_PLC_IP);
-                    if (WindSendDevice.IsConnected) MessageNotify.GetInstance.ShowRunLog("风送plc连接成功");
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageNotify.GetInstance.ShowAlarmLog("粉料plc连接失败，等待重新连接");
-            }
-            finally 
-            {
-                WindSendDevice.Init();
-                MessageNotify.GetInstance.ShowRunLog("风送粉料plc初始化完成");
-            }
-            ThreadManage.GetInstance().StartLong(new Action(() =>
-            {
-                try
-                {
-                    if (!HKDevice.IsConnected && Json<DevicePar>.Data.deviceConnectPar.HKPlcConnect)
-                    {
-                        HKDevice.HK_PLC_S7.Connect(S7.Net.CpuType.S71200, HK_PLC_IP);
-                        if (HKDevice.IsConnected) MessageNotify.GetInstance.ShowRunLog("海科PLC重新连接成功");
-                    }
-                }
-                catch (Exception ex) 
-                {
-                }
-                try
-                {
-                    if (!SiemensDevice.IsConnected && Json<DevicePar>.Data.deviceConnectPar.SiemensConnect)
-                    {
-                        SiemensDevice.Siemens_PLC_S7.Connect(S7.Net.CpuType.S71500, Siemens_PLC_IP);
-                        if (SiemensDevice.IsConnected) MessageNotify.GetInstance.ShowRunLog("西门子PLC重新连接成功");
-                    }
-                }
-                catch (Exception ex)
-                {
-                }
-                try
-                {
-                    if (!WindSendDevice.IsConnected && Json<DevicePar>.Data.deviceConnectPar.WindSendConnect)
-                    {
-                        WindSendDevice.Siemens_PLC_S7.Connect(S7.Net.CpuType.S71200, WindSend_PLC_IP);
-                        if (WindSendDevice.IsConnected) MessageNotify.GetInstance.ShowRunLog("风送plc重新连接成功");
-                    }
-                }
-                catch (Exception ex)
-                {
-                }
-                Thread.Sleep(50);
-            }), "设备连接", true);
-            RecipeQueueTray1.Clear();
-            //手动控制系统模式
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", true); }), "SystemStart", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", false); }), "SystemStop", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.2", true); }), "SystemPause", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.2", false); }), "SystemReset", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.1", false); }), "SystemAutoMode", true); 
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.1", true); }), "SystemDebugMode", true);
-            //流程控制
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.3", true); }), "ManualSystemReset", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.4", true); }), "CLearRecipeInfo", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX0.7", true); }), "AGVPutTrayFinish", true);
-            //手动控制电机轴
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", true); }), "StartAxisLoadCommand", true); 
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", false); }), "StopAxisLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", true); }), "StartAxisMidCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", false); }), "StopAxisMidCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", true); }), "StartAxisUnLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", false); }), "StopAxisUnLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", true); }), "StartAxis1Command", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", false); }), "StopAxis1Command", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", true); }), "StartAxis2Command", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", false); }), "StopAxis2Command", true);
-            //电机速度
-            ActionManage.GetInstance.Register(new Action<object>((o) => 
-            {
-                if (o != null && o is short value)
-                {
-                    HKDevice.HK_PLC_S7.Write("DB47.DBD8", value);
-                }
-            }), "AxisLoadSpeedSet", true);
-            ActionManage.GetInstance.Register(new Action<object>((o) => 
-            {
-                if (o != null && o is short value)
-                {
-                    HKDevice.HK_PLC_S7.Write("DB47.DBD10", value);
-                }
-            }), "AxisMidSpeedSet", true);
-            ActionManage.GetInstance.Register(new Action<object>((o) => 
-            {
-                if (o != null && o is short value)
-                {
-                    HKDevice.HK_PLC_S7.Write("DB47.DBD12", value);
-                }
-            }), "AxisUnLoadSpeedSet", true);
-            ActionManage.GetInstance.Register(new Action<object>((o) => 
-            {
-                if (o != null && o is float value)
-                {
-                    HKDevice.HK_PLC_S7.Write("DB47.DBD0", value);
-                }
-            }), "Axis1SpeedSet", true);
-            ActionManage.GetInstance.Register(new Action<object>((o) => 
-            {
-                if (o != null && o is float value)
-                {
-                    HKDevice.HK_PLC_S7.Write("DB47.DBD4", value);
-                }
-            }), "Axis2SpeedSet", true);
+        public void Init()
+        {
+            plcVarMonitor();
+            StockBinNameWithPos();
+            RegisterInit();
+            DeviceConnect();
             //Json<RemoteRecipeDataColl>.Data.Recipes = TestData.GetInstance.Recipes;//添加测试数据
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
@@ -335,26 +71,34 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     GVL_SmallStation.GetInstance.HeartBeatToPlc = !GVL_SmallStation.GetInstance.HeartBeatToPlc;
                     HKDevice.HK_PLC_S7.Write("DB4.DBX0.0", GVL_SmallStation.GetInstance.HeartBeatToPlc);
                     GVL_SmallStation.GetInstance.HeartBeatFromPlc = HKDevice.HK_PLC_S7.Read<bool>("DB45.DBX0.0");
-                    //获取系统状态
-                    GVL_SmallStation.SystemStatus = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.0");//系统启停
-                    GVL_SmallStation.SystemMode = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.1");//系统模式
-                    GVL_SmallStation.SystemRunStatus = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.2");//系统暂停
                 }
                 Thread.Sleep(200);
-            }), "通信心跳", true);
+            }), "海科plc通信心跳", true);
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                DeviceStatusDispose();
-                ReceviceData();
-                RecipeInfoToHKPLC();
+                if (GVL_SmallStation.Order_Cancel)
+                {
+                    CancelOrder();//订单取消
+                }
+                else
+                {
+                    ReceviceData();//配方请求
+                    RecipeInfoToHKPLC();//配方配料
+                }
                 Thread.Sleep(10);
-            }), "西门子配发下发流程处理", true);
+            }), "小料站流程控制", true);
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                Real_Time_Data();
+                Thread.Sleep(10);
+            }), "西门子PLC和小料站PLC的实时数据", true);
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
                 if (HKDevice.IsConnected)
                 {
                     ManualOpen();
                     ManualClose();
+                    HKPlcRead();
                 }
                 Thread.Sleep(10);
             }), "手动操作", true);
@@ -370,7 +114,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 GVL_SmallStation.GetInstance.Cylinder_JackInfo[i + 8] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX0." + i);
             }
         }
-        private void ManualOpen() 
+        private void ManualOpen()
         {
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
@@ -379,7 +123,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     if (o.ToString().Contains("升降气缸"))
                     {
                         int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
-                        if (index >= 1 && index <= 15) 
+                        if (index >= 1 && index <= 15)
                         {
                             string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
                             if (index == 8) address = "DB5.DBX0.7";
@@ -434,7 +178,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     else if (o.ToString().Contains("托盘气缸1_1"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.2", false);//默认伸出
-                    } 
+                    }
                     else if (o.ToString().Contains("托盘气缸1_2"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.3", false);
@@ -530,13 +274,30 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }), "ManualClose", true);//根据下发的配方ID将 托盘的位置信息添加到配方中
         }
+        public ObservableCollection<PlcInfos> CommData = new ObservableCollection<PlcInfos>();
+        private void HKPlcRead()
+        {
+            foreach (PropertyInfo item in typeof(PlcReadAddressDB3).GetProperties())
+            {
+                int index = Array.FindIndex(CommData.ToArray(), p => p.Name == item.Name);
+                if (index >= 0)
+                {
+                    CommData.ElementAt(index).Value = GVL_SmallStation.plcReadDataDB3.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.plcReadDataDB3, null).ToString();
+                }
+            }
+        }
         /// <summary>
-        /// 
+        /// 小料站和西门子PLC之间的实时数据
         /// </summary>
-        private void DeviceStatusDispose()
+        private void Real_Time_Data()
         {
             if (HKDevice.IsConnected)
             {
+                //获取系统状态
+                GVL_SmallStation.SystemStatus = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.0");//系统启停
+                GVL_SmallStation.SystemMode = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.1");//系统模式
+                GVL_SmallStation.SystemRunStatus = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.2");//系统暂停
+
                 GVL_SmallStation.Station1HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX0.7");//工站1 有货架
                 GVL_SmallStation.Station2HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.0");//工站2 有货架
                 if (GVL_SmallStation.WindSendDosingComple)
@@ -545,7 +306,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     GVL_SmallStation.WindSendDosingComple = false;
                     MessageNotify.GetInstance.ShowRunLog("风送配料完成信号，发给产线plc信号");
                 }
-                if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1")) 
+                if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1"))
                 {
                     HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.7", false);
                 }
@@ -553,56 +314,15 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     GVL_SmallStation.IsAllowSiemensSendRecipe = true;
                 }
-
                 GVL_SmallStation.Station1Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.1");
                 GVL_SmallStation.Station2Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.2");
                 GVL_SmallStation.Station1Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.3");
                 GVL_SmallStation.Station2Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.4");
-                if (!GVL_SmallStation.TrayLogicFinish)
-                {
-                    if (GVL_SmallStation.AGV_PutTray1Finish)
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB4.DBX0.7", true);
-                        GVL_SmallStation.AGV_PutTray1Finish = false;
-                        MessageNotify.GetInstance.ShowRunLog("AGV到位 发送到位信号给plc");
-                    }
-                    if (GVL_SmallStation.Station1HaveTray)
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB4.DBX0.7", false);
-                        GVL_SmallStation.TrayLogicFinish = true;
-                        MessageNotify.GetInstance.ShowRunLog("托盘1有货架");
-                    }
-                    else
-                    {
-                        if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.5") == true)
-                        {
-                            if (GVL_SmallStation.CylinderReset)
-                            {
-                                HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.5", true);
-                            }
-                            MessageNotify.GetInstance.ShowRunLog("气缸收紧错位");
-                        }
-                        else
-                        {
-                            HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.5", false);
-                        }
-                    }
-                }
-                else
-                {
-                    if (GVL_SmallStation.AGV_GetTray1Finish)
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB4.DBX1.1", true);
-                        if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.7") == true)
-                        {
-                            HKDevice.HK_PLC_S7.Write("DB4.DBX1.1", false);
-                            GVL_SmallStation.TrayLogicFinish = false;
-                            GVL_SmallStation.AGV_GetTray1Finish = false;
-                        }
-                    }
-                }
+                GVL_SmallStation.RobotStatus = HKDevice.HK_PLC_S7.Read<ushort>("DB3.DBW100");
+                GVL_SmallStation.RobotProgramNum = HKDevice.HK_PLC_S7.Read<byte>("DB3.DBB102");
+
             }
-            if (SiemensDevice.IsConnected) 
+            if (SiemensDevice.IsConnected)
             {
                 ushort TrayCylinder = 0;
                 ushort TraySensor = 0;
@@ -625,20 +345,214 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 this.SiemensDevice.Siemens_PLC_S7.Write<bool>("DB2231.DBX28.4", GVL_SmallStation.WindSendAllowAGVPutGet);
                 this.SiemensDevice.Siemens_PLC_S7.Write<ushort>("DB2231.DBW190", TraySensor);//添加工位传感器的信号
                 this.SiemensDevice.Siemens_PLC_S7.Write<ushort>("DB2231.DBW192", TrayCylinder);//添加工位气缸的信号
-
-                if (RTrig.GetInstance("AGV_PutTray1Finish1111").Start(SiemensDevice.XL_Status.AgvFinishPut == 1))
+                ushort AGV_Put = (ushort)SiemensDevice.XL_Status.AgvFinishPut;
+                if (AGV_Put.Get16bitValue(1))
                 {
                     GVL_SmallStation.AGV_PutTray1Finish = true;
                 }
-                if (RTrig.GetInstance("AGV_GetTray1Finish111").Start(SiemensDevice.XL_Status.AgvFinishGet == 1))
+                else
+                {
+                    GVL_SmallStation.AGV_PutTray1Finish = false;
+                }
+
+
+                ushort AGV_Get = (ushort)SiemensDevice.XL_Status.AgvFinishGet;
+
+                if (AGV_Get.Get16bitValue(1))
                 {
                     GVL_SmallStation.AGV_GetTray1Finish = true;
                 }
+                else
+                {
+                    GVL_SmallStation.AGV_GetTray1Finish = false;
+                }
+            }
+        }
+
+        public void CancelOrder()
+        {
+            if (GVL_SmallStation.Order_Cancel) //订单取消
+            {
+                if (!string.IsNullOrEmpty(GVL_SmallStation.Order_CancelRecipeCode))
+                {
+                    string code = GVL_SmallStation.Order_CancelRecipeCode;
+                    int index = Array.FindIndex(Json<RemoteRecipeDataColl>.Data.Recipes.ToArray(), p => p.RecipeCode == code);
+
+                    switch (GVL_SmallStation.OrderCancelStep)
+                    {
+                        case 0://前提条件判断
+                            if (index == -1)
+                            {
+                                GVL_SmallStation.OrderCancelStep = 30;
+                                MessageNotify.GetInstance.ShowRunLog($"配方中并未找到订单{code}");
+                            }
+                            else
+                            {
+                                if (RecipeQueueTray1.Contains(GVL_SmallStation.Order_CancelRecipeCode))
+                                {
+                                    GVL_SmallStation.OrderCancelStep = 1;
+                                }
+                                else if (RecipeQueueTray2.Contains(GVL_SmallStation.Order_CancelRecipeCode))
+                                {
+                                    GVL_SmallStation.OrderCancelStep = 10;
+                                }
+                                else
+                                {
+                                    GVL_SmallStation.OrderCancelStep = 20;
+                                }
+                            }
+                            break;
+
+                        //Case 1-9为
+                        case 1:
+                            if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 != 0)
+                            {
+                                GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX2.1", true);
+                                MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，正在取消订单：{code}");
+                                GVL_SmallStation.OrderCancelStep = 2;
+                            }
+                            else
+                            {
+                                MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
+                                GVL_SmallStation.OrderCancelStep = 3;
+                            }
+                            break;
+                        case 2:
+                            if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.5"))
+                            {
+                                if (GVL_SmallStation.Station1Cylinder == false) 
+                                {
+                                    GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
+                                    GVL_SmallStation.OrderCancelStep = 3;
+                                    MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
+                                }
+                            }
+                            break;
+                        case 3:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
+                            GVL_SmallStation.OrderCancelStep = 4;
+                            break;
+                        case 4:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
+                                GVL_SmallStation.OrderCancelStep = 9;
+                                MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
+                            }
+                            break;
+                        case 9:
+                            App.Current.Dispatcher.Invoke(() =>
+                            {
+                                Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
+                            });
+                            RecipeQueueTray1.TryDequeue(out code);
+                            GVL_SmallStation.Tray1LogicFinish = 0;
+                            GVL_SmallStation.Order_Cancel = false;
+                            GVL_SmallStation.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.OrderCancelStep = 0;
+                            break;
+
+
+                        case 10:
+                            if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 != 0)
+                            {
+                                GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX2.2", true);
+                                MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，正在取消订单：{code}");
+                                GVL_SmallStation.OrderCancelStep = 11;
+                            }
+                            else
+                            {
+                                MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
+                                GVL_SmallStation.OrderCancelStep = 12;
+                            }
+                            break;
+                        case 11:
+                            if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.6"))
+                            {
+                                if (GVL_SmallStation.Station2Cylinder == false)
+                                {
+                                    GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
+                                    GVL_SmallStation.OrderCancelStep = 12;
+                                    MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
+                                }
+                            }
+                            break;
+
+                        case 12:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
+                            GVL_SmallStation.OrderCancelStep = 13;
+                            break;
+                        case 13:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
+                                GVL_SmallStation.OrderCancelStep = 14;
+                                MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
+                            }
+                            break;
+                        case 19:
+                            App.Current.Dispatcher.Invoke(() =>
+                            {
+                                Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
+                            });
+                            RecipeQueueTray2.TryDequeue(out code);
+                            GVL_SmallStation.Order_Cancel = false;
+                            GVL_SmallStation.Tray2LogicFinish = 0;
+                            GVL_SmallStation.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.OrderCancelStep = 0;
+                            break;
+
+                        //20-29为订单还未下发至PLC
+                        case 20:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
+                            GVL_SmallStation.OrderCancelStep = 21;
+                            break;
+                        case 21:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
+                                GVL_SmallStation.OrderCancelStep = 29;
+                                MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
+                            }
+                            break;
+                        case 29:
+                            App.Current.Dispatcher.Invoke(() =>
+                            {
+                                Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
+                            });
+                            GVL_SmallStation.Order_Cancel = false;
+                            GVL_SmallStation.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.SiemensSendRecipeStatus = 0;
+                            GVL_SmallStation.OrderCancelStep = 0;
+                            break;
+
+                        //30-39为订单还未下发至上位机
+                        case 30:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
+                            GVL_SmallStation.OrderCancelStep = 31;
+                            break;
+                        case 31:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
+                                GVL_SmallStation.OrderCancelStep = 39;
+                                MessageNotify.GetInstance.ShowRunLog($"西门子取消订单完成，订单号：{code}");
+                            }
+                            break;
+                        case 39:
+                            GVL_SmallStation.Order_Cancel = false;
+                            GVL_SmallStation.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.OrderCancelStep = 0;
+                            break;
+                    }
+                }
             }
         }
-            /// <summary>
-            /// 将配方添加到配方队列中
-            /// </summary>
+        /// <summary>
+        /// 将配方添加到配方队列中
+        /// </summary>
         private void ReceviceData()
         {
             if (!GVL_SmallStation.GetInstance.IsUseLocalRecipe)
@@ -654,32 +568,37 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             {
                                 if (SiemensDevice.XL_Status is XL_Status_DB status)
                                 {
-                                    if (GVL_SmallStation.SiemensSendRecipeStatus == 3)
-                                    {
-                                        GVL_SmallStation.SiemensSendRecipeStatus = 4;
-                                        SiemensDevice.Siemens_PLC_S7.WriteString(2231, data.RecipeCode, 10);
-                                        SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", true);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，请求配料");
-                                    }
-                                    if (GVL_SmallStation.SiemensSendRecipeStatus == 4)
+                                    switch (GVL_SmallStation.SiemensSendRecipeStatus)
                                     {
-                                        if (SiemensDevice.XL_Status.Dosing_Confirm)
-                                        {
-                                            GVL_SmallStation.SiemensSendRecipeStatus = 5;
-                                            SiemensDevice.Siemens_PLC_S7.WriteString(2231, "", 10);//复位字符串
-                                            SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", false);
-                                            MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，配料信号复位");
-                                        }
-                                    }
-                                    if (GVL_SmallStation.SiemensSendRecipeStatus == 5)
-                                    {
-                                        MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料");
-                                        if (SiemensDevice.XL_Status.Dosing_Confirm == false)
-                                        {
+                                        case 3:
+                                            SiemensDevice.Siemens_PLC_S7.WriteString(2231, data.RecipeCode, 10);
+                                            SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", true);
+                                            GVL_SmallStation.SiemensSendRecipeStatus = 4;
+                                            MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，请求配料");
+                                            break;
+                                        case 4:
+                                            if (SiemensDevice.XL_Status.Dosing_Confirm)
+                                            {
+                                                SiemensDevice.Siemens_PLC_S7.WriteString(2231, "", 10);//复位字符串
+                                                SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", false);
+                                                GVL_SmallStation.SiemensSendRecipeStatus = 5;
+                                                MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料");
+                                            }
+                                            break;
+                                        case 5:
+                                            if (SiemensDevice.XL_Status.Dosing_Confirm == false)
+                                            {
+                                                GVL_SmallStation.SiemensSendRecipeStatus = 6;
+                                                MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料信号复位完成");
+                                            }
+                                            break;
+                                        case 6:
                                             RecipeQueueTray1.Enqueue(data.RecipeCode);
-                                            GVL_SmallStation.SiemensSendRecipeStatus = 6;
+                                            GVL_SmallStation.SiemensSendRecipeStatus = 0;
                                             MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，加入队列");
-                                        }
+                                            break;
+                                        default:
+                                            break;
                                     }
                                 }
                             }
@@ -690,28 +609,37 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             {
                                 if (SiemensDevice.XL_Status is XL_Status_DB status)
                                 {
-                                    if (GVL_SmallStation.SiemensSendRecipeStatus == 3)
-                                    {
-                                        GVL_SmallStation.SiemensSendRecipeStatus = 4;
-                                        SiemensDevice.Siemens_PLC_S7.WriteString(2231, data.RecipeCode, 10);
-                                        SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", true);
-                                    }
-                                    if (GVL_SmallStation.SiemensSendRecipeStatus == 4)
-                                    {
-                                        if (SiemensDevice.XL_Status.Dosing_Confirm)
-                                        {
-                                            GVL_SmallStation.SiemensSendRecipeStatus = 5;
-                                            SiemensDevice.Siemens_PLC_S7.WriteString(2231, "", 10);
-                                            SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", false);
-                                        }
-                                    }
-                                    if (GVL_SmallStation.SiemensSendRecipeStatus == 5)
+                                    switch (GVL_SmallStation.SiemensSendRecipeStatus)
                                     {
-                                        if (SiemensDevice.XL_Status.Dosing_Confirm == false)
-                                        {
-                                            GVL_SmallStation.SiemensSendRecipeStatus = 0;
+                                        case 3:
+                                            SiemensDevice.Siemens_PLC_S7.WriteString(2231, data.RecipeCode, 10);
+                                            SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", true);
+                                            GVL_SmallStation.SiemensSendRecipeStatus = 4;
+                                            MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，请求配料");
+                                            break;
+                                        case 4:
+                                            if (SiemensDevice.XL_Status.Dosing_Confirm)
+                                            {
+                                                SiemensDevice.Siemens_PLC_S7.WriteString(2231, "", 10);//复位字符串
+                                                SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", false);
+                                                GVL_SmallStation.SiemensSendRecipeStatus = 5;
+                                                MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料");
+                                            }
+                                            break;
+                                        case 5:
+                                            if (SiemensDevice.XL_Status.Dosing_Confirm == false)
+                                            {
+                                                GVL_SmallStation.SiemensSendRecipeStatus = 6;
+                                                MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料信号复位完成");
+                                            }
+                                            break;
+                                        case 6:
                                             RecipeQueueTray2.Enqueue(data.RecipeCode);
-                                        }
+                                            GVL_SmallStation.SiemensSendRecipeStatus = 0;
+                                            MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，加入队列");
+                                            break;
+                                        default:
+                                            break;
                                     }
                                 }
                             }
@@ -722,11 +650,13 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     RecipeQueueTray1.Clear();
                     RecipeQueueTray2.Clear();
-                    GVL_SmallStation.GetInstance.RecipeStatusID = 0;
+                    /*GVL_SmallStation.Tray1LogicFinish = 0;
+                    GVL_SmallStation.Tray2LogicFinish = 0;*/
+                    GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
                     GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
                 }
             }
-            else 
+            else
             {
                 RemoteRecipes = Json<RemoteRecipeDataColl>.Data.Recipes;
                 if (RemoteRecipes.Count > 0)
@@ -744,9 +674,8 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         {
                             if (!(RecipeQueueTray2.Contains(data.RecipeCode)))
                             {
-
                                 RecipeQueueTray2.Enqueue(data.RecipeCode);
-                            }                            
+                            }
                         }
                     }
                 }
@@ -754,6 +683,8 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     RecipeQueueTray1.Clear();
                     RecipeQueueTray2.Clear();
+                    /*GVL_SmallStation.Tray1LogicFinish = 0;
+                    GVL_SmallStation.Tray2LogicFinish = 0;*/
 
                     GVL_SmallStation.GetInstance.DosingTray1 = false;
                     GVL_SmallStation.GetInstance.DosingTray1Loc = 0;
@@ -761,135 +692,125 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     GVL_SmallStation.GetInstance.DosingTray2 = false;
                     GVL_SmallStation.GetInstance.DosingTray2Loc = 0;
 
-                    GVL_SmallStation.GetInstance.RecipeStatusID = 0;
+                    GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
                     GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
                 }
             }
-            if (GVL_SmallStation.Order_Cancel) //订单取消
+        }
+        /// <summary>
+        /// 执行配方队列中的第一个配方
+        /// </summary>
+        private void RecipeInfoToHKPLC()
+        {
+            switch (GVL_SmallStation.Tray1LogicFinish)
             {
-                if (!string.IsNullOrEmpty(GVL_SmallStation.Order_CancelRecipeCode))
-                {
-                    string code = GVL_SmallStation.Order_CancelRecipeCode;
-                    int index = Array.FindIndex(Json<RemoteRecipeDataColl>.Data.Recipes.ToArray(), p => p.RecipeCode == code);
-                    if (index >= 0)
+                case 0:
+                    if (GVL_SmallStation.AGV_PutTray1Finish && RecipeQueueTray1.Count > 0)
                     {
-                        short TrayCode = (short)Json<RemoteRecipeDataColl>.Data.Recipes.ElementAt(index).TrayCode;
-                        if (RecipeQueueTray1.Contains(code) || RecipeQueueTray1.Contains(code))
+                        HKDevice.HK_PLC_S7.Write("DB4.DBX0.7", true);
+                        GVL_SmallStation.AGV_PutTray1Finish = false;
+                        GVL_SmallStation.Tray1LogicFinish = 1;
+                        MessageNotify.GetInstance.ShowRunLog("AGV到位 发送到位信号给plc");
+                    }
+                    break;
+                case 1:
+                    if (GVL_SmallStation.Station1HaveTray)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB4.DBX0.7", false);
+                        GVL_SmallStation.Tray1LogicFinish = 2;
+                        MessageNotify.GetInstance.ShowRunLog("托盘1有货架");
+                    }
+                    else
+                    {
+                        if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.5") == true)
                         {
-                            if (RecipeQueueTray1.Contains(code))
-                            {
-                                App.Current.Dispatcher.Invoke(() =>
-                                {
-                                    Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
-                                });
-                                if (GVL_SmallStation.GetInstance.RecipeStatusID != 0)
-                                {
-                                    HKDevice.HK_PLC_S7.Write("DB4.DBX2.1", true);
-                                    DateTime dateTime = DateTime.Now;
-                                    MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，正在取消订单：{code}");
-                                    while (!(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.5") || DateTime.Now.Subtract(dateTime).TotalSeconds >= 10))
-                                    {
-                                        if (DateTime.Now.Subtract(dateTime).TotalSeconds > 1)
-                                        {
-                                            MessageNotify.GetInstance.ShowRunLog($"等待PLC取消订单完成：{code}");
-                                        }
-                                    }
-                                    MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
-                                }
-                                else
-                                {
-                                    MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
-                                }
-                                GVL_SmallStation.GetInstance.RecipeStatusID = 0;
-                                SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
-                                while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX440.1") == false)
-                                {
-                                    SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
-                                    RecipeQueueTray1.TryDequeue(out code);
-                                    MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
-                                }
-                            }
-                            else if (RecipeQueueTray2.Contains(code))
+                            if (GVL_SmallStation.CylinderReset)
                             {
-                                App.Current.Dispatcher.Invoke(() =>
-                                {
-                                    Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
-                                });
-                                if (GVL_SmallStation.GetInstance.RecipeStatusID != 0)
-                                {
-                                    HKDevice.HK_PLC_S7.Write("DB4.DBX2.2", true);
-                                    DateTime dateTime = DateTime.Now; 
-                                    MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，正在取消订单：{code}");
-                                    while (!(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.6") || DateTime.Now.Subtract(dateTime).TotalSeconds >= 10))
-                                    {
-                                        if (DateTime.Now.Subtract(dateTime).TotalSeconds > 1)
-                                        {
-                                            MessageNotify.GetInstance.ShowRunLog($"等待PLC取消订单完成：{code}");
-                                        }
-                                    }
-                                    MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，已经取消订单：{code}");
-                                }
-                                else
-                                {
-                                    MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
-                                }
-                                GVL_SmallStation.GetInstance.RecipeStatusID = 0;
-                                SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
-                                while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX440.1") == false)
-                                {
-                                    SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
-                                    RecipeQueueTray2.TryDequeue(out code);
-                                    MessageNotify.GetInstance.ShowRunLog($"队列2，西门子取消订单完成，订单号：{code}");
-                                }
+                                HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.5", true);
                             }
-                            GVL_SmallStation.Order_Cancel = false;
-                            GVL_SmallStation.Order_CancelRecipeCode = "";
+                            MessageNotify.GetInstance.ShowRunLog("气缸收紧错位");
                         }
                         else
                         {
-                            if (GVL_SmallStation.SiemensSendRecipeStatus != 0 || GVL_SmallStation.SiemensSendRecipeStatus != 1)
-                            {
-                                GVL_SmallStation.SiemensSendRecipeStatus = 0;
-                                App.Current.Dispatcher.Invoke(() =>
-                                {
-                                    Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
-                                });
-                                MessageNotify.GetInstance.ShowRunLog($"正在执行请求订单流程，配方还未到PLC，订单号：{code}");
-                            }
-                            else
-                            {
-                                MessageNotify.GetInstance.ShowRunLog($"订单取消异常，订单号：{code}");
-                            }
-
-                            GVL_SmallStation.Order_Cancel = false;
-                            GVL_SmallStation.Order_CancelRecipeCode = "";
-                            SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true); 
-                            while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
-                            {
-                                SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
-                            }
+                            GVL_SmallStation.Tray1LogicFinish = 1;
+                            HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.5", false);
                         }
                     }
+                    break;
+                case 2:
+                    if (GVL_SmallStation.AGV_GetTray1Finish && GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 0)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB4.DBX1.1", true);
+                        GVL_SmallStation.Tray1LogicFinish = 3;
+                        MessageNotify.GetInstance.ShowRunLog("AGV取托盘完成");
+                    }
+                    break;
+                case 3:
+                    if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.7") == true)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB4.DBX1.1", false);
+                        GVL_SmallStation.Tray1LogicFinish = 0;
+                        GVL_SmallStation.AGV_GetTray1Finish = false;
+                        MessageNotify.GetInstance.ShowRunLog("plc允许下配方，复位取托盘完成信号");
+                    }
+                    break;
+                default:
+                    break;
+            }
+            switch (GVL_SmallStation.Tray2LogicFinish)
+            {
+                case 0:
+                    if (GVL_SmallStation.AGV_PutTray2Finish)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB4.DBX1.0", true);
+                        GVL_SmallStation.AGV_PutTray2Finish = false;
+                        GVL_SmallStation.Tray2LogicFinish = 1;
+                        MessageNotify.GetInstance.ShowRunLog("AGV到位 发送到位信号给plc");
+                    }
+                    break;
+                case 1:
+                    if (GVL_SmallStation.Station2HaveTray)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB4.DBX1.0", false);
+                        GVL_SmallStation.Tray2LogicFinish = 2;
+                        MessageNotify.GetInstance.ShowRunLog("托盘1有货架");
+                    }
                     else
                     {
-                        GVL_SmallStation.Order_Cancel = false;
-                        GVL_SmallStation.Order_CancelRecipeCode = "";
-                        SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
-                        while (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
+                        if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.6") == true)
                         {
-                            SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
+                            if (GVL_SmallStation.CylinderReset)
+                            {
+                                HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.6", true);
+                            }
+                            MessageNotify.GetInstance.ShowRunLog("气缸收紧错位");
+                        }
+                        else
+                        {
+                            GVL_SmallStation.Tray2LogicFinish = 1;
+                            HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.6", false);
                         }
-                        MessageNotify.GetInstance.ShowRunLog($"西门子取消订单,但未找到订单:{code}");
                     }
-                }
+                    break;
+                case 2:
+                    if (GVL_SmallStation.AGV_GetTray2Finish && GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 0)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB4.DBX1.2", true);
+                        GVL_SmallStation.Tray2LogicFinish = 3;
+                    }
+                    break;
+                case 3:
+                    if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.7") == true)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB4.DBX1.2", false);
+                        GVL_SmallStation.Tray2LogicFinish = 0;
+                        GVL_SmallStation.AGV_GetTray2Finish = false;
+                    }
+                    break;
+                default:
+                    break;
             }
-        }
-        /// <summary>
-        /// 执行配方队列中的第一个配方
-        /// </summary>
-        private void RecipeInfoToHKPLC()
-        {
-            if (RecipeQueueTray1.Count > 0 && GVL_SmallStation.TrayLogicFinish)
+            if (RecipeQueueTray1.Count > 0 && GVL_SmallStation.Tray1LogicFinish == 2)
             {
                 int index = Array.FindIndex(RemoteRecipes.ToArray(), p => p.RecipeCode == RecipeQueueTray1.ElementAt(0));
                 if (index >= 0 && index < RemoteRecipes.Count)
@@ -900,31 +821,31 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     string windSend = RemoteRecipes.ElementAt(index).ToString();
                     if (trayCode == 1)
                     {
-                        if (GVL_SmallStation.GetInstance.RecipeStatusID == 0) 
+                        if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 0)
                         {
-                            if (GVL_SmallStation.GetInstance.IsUseWindSend) 
+                            if (GVL_SmallStation.GetInstance.IsUseWindSend)
                             {
                                 WindSendData.TargetRecipeCode = code;
                                 WindSendData.IsAllowDosing = true;
-                                foreach (var item in RemoteRecipes.ElementAt(index).WindSend) 
+                                foreach (var item in RemoteRecipes.ElementAt(index).WindSend)
                                 {
-                                    if (item.RawMaterialName == "0037")
+                                    if (item.RawMaterialName == "0037" || item.RawMaterialName == "粉料1")
                                     {
                                         WindSendData.RawMaterial1_SetWeight = item.RawMaterialWeight;
                                     }
-                                    if (item.RawMaterialName == "0038")
+                                    if (item.RawMaterialName == "0038" || item.RawMaterialName == "粉料2")
                                     {
                                         WindSendData.RawMaterial2_SetWeight = item.RawMaterialWeight;
                                     }
-                                    if (item.RawMaterialName == "")
+                                    if (item.RawMaterialName == "0039" || item.RawMaterialName == "粉料3")
                                     {
                                         WindSendData.RawMaterial3_SetWeight = item.RawMaterialWeight;
                                     }
-                                    if (item.RawMaterialName == "")
+                                    if (item.RawMaterialName == "0045" || item.RawMaterialName == "粉料4")
                                     {
                                         WindSendData.RawMaterial4_SetWeight = item.RawMaterialWeight;
                                     }
-                                    if (item.RawMaterialName == "0036")
+                                    if (item.RawMaterialName == "0046" || item.RawMaterialName == "粉料5")
                                     {
                                         WindSendData.RawMaterial5_SetWeight = item.RawMaterialWeight;
                                     }
@@ -936,18 +857,18 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 HKDevice.StockBinPar((uint)item.RawMaterialBarrelNum, (ushort)item.RawMaterialLocation);
                             }
                             HKDevice.HK_PLC_S7.Write("DB4.DBX1.3", true);
-                            GVL_SmallStation.GetInstance.RecipeStatusID = 1;
+                            GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 1;
                             MessageNotify.GetInstance.ShowRunLog($"托盘1,配方：{recipeName}，下发完成");
                             GVL_SmallStation.GetInstance.time1 = DateTime.Now;
                         }
-                       
-                        if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.3") && GVL_SmallStation.GetInstance.RecipeStatusID == 1) 
+
+                        if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.3") && GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 1)
                         {
                             HKDevice.HK_PLC_S7.Write("DB4.DBX1.3", false);
-                            GVL_SmallStation.GetInstance.RecipeStatusID = 2;
+                            GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 2;
                             MessageNotify.GetInstance.ShowRunLog($"托盘1,{ recipeName}plc端 配方接收完成");
                         }
-                        if (GVL_SmallStation.GetInstance.RecipeStatusID == 2)
+                        if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 2)
                         {
                             if (GVL_SmallStation.GetInstance.DosingTray1 == false && GVL_SmallStation.GetInstance.DosingTray1Loc == 0)
                             {
@@ -973,7 +894,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 {
                                     var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD14");
                                     MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{res}料仓，允许配料");
-                                    if (res > 0 && res is float loc)    
+                                    if (res > 0 && res is float loc)
                                     {
                                         int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
                                         float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
@@ -1034,7 +955,21 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
                                     RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
                                     bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
-                                    MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，下料完成重量：{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}"); 
+                                    MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，下料完成重量：{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}");
+                                    float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000);
+                                    int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
+                                    if (iIndex >= 0)
+                                    {
+                                        if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
+                                        {
+                                            HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
+                                            App.Current.Dispatcher.Invoke(() =>
+                                            {
+                                                MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
+                                                HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
+                                            });
+                                        }
+                                    }
                                     if (info)
                                     {
                                         MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送成功");
@@ -1088,14 +1023,10 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     {
                                         RecipeFinishInfo.Powder[i].Powder_Weight = RemoteRecipes.ElementAt(index).WindSend.ElementAt(i).DosingCompleWeight;
                                     }
-                                    if (GVL_SmallStation.SiemensSendRecipeStatus == 6)
-                                    {
-                                        double a = DateTime.Now.Subtract(GVL_SmallStation.GetInstance.time1).TotalSeconds;
-                                        GVL_SmallStation.SiemensSendRecipeStatus = 7;
-                                        RecipeFinishInfo.Ask_For_Finish = true;
-                                        RecipeFinishInfo.DosingTime = Convert.ToInt16(a);
-                                        SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
-                                    }
+                                    double a = DateTime.Now.Subtract(GVL_SmallStation.GetInstance.time1).TotalSeconds;
+                                    RecipeFinishInfo.Ask_For_Finish = true;
+                                    RecipeFinishInfo.DosingTime = Convert.ToInt16(a);
+                                    SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
                                 }
                                 App.Current.Dispatcher.Invoke(() =>
                                 {
@@ -1103,13 +1034,13 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 });
                                 RecipeQueueTray1.TryDequeue(out code);
                                 HKDevice.HK_PLC_S7.Write("DB3.DBX1.1", false);
-                                GVL_SmallStation.GetInstance.RecipeStatusID = 0;
+                                GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
                             }
                         }
-                    } 
+                    }
                 }
             }
-            if (RecipeQueueTray2.Count > 0 && GVL_SmallStation.Station2HaveTray)
+            if (RecipeQueueTray2.Count > 0 && GVL_SmallStation.Tray2LogicFinish == 2)
             {
                 int index = Array.FindIndex(RemoteRecipes.ToArray(), p => p.RecipeCode == RecipeQueueTray2.ElementAt(0));
                 if (index >= 0 && index < RemoteRecipes.Count)
@@ -1221,6 +1152,17 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
                                     RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
                                     bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
+                                    float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight);
+                                    int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
+                                    if (iIndex >= 0)
+                                    {
+                                        if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
+                                        {
+                                            HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
+                                            MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
+                                            HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
+                                        }
+                                    }
                                     if (info)
                                     {
                                         MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送成功");
@@ -1274,7 +1216,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }
         }
-        private void StockBinInit() 
+        private void StockBinInit()
         {
             for (int i = 1; i < 16; i++)
             {
@@ -1284,7 +1226,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }
         }
-        private void DosingDevice(int Index,int DeviceID) 
+        private void DosingDevice(int Index, int DeviceID)
         {
             if (RTrig.GetInstance("Tray2StatusDevice" + DeviceID).Start(DeviceInquire.GetInstance.GetDevice(DeviceID).deviceStatus.RunStatus == 3))
             {
@@ -1302,18 +1244,11 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }
         }
-        public void testData()
+        /// <summary>
+        /// 料仓的位置和原料名称的对应
+        /// </summary>
+        public void StockBinNameWithPos()
         {
-            //RawMaterialsNamePos.Add("0051", 3);
-            //RawMaterialsNamePos.Add("0052", 4);
-            //RawMaterialsNamePos.Add("0054", 5);
-            //RawMaterialsNamePos.Add("0057", 6);
-            //RawMaterialsNamePos.Add("0050", 8);
-            //RawMaterialsNamePos.Add("0048", 13);
-
-            //RawMaterialsNamePos.Add("0036", 13);//I+G
-            //RawMaterialsNamePos.Add("0037", 13);//味精
-            //RawMaterialsNamePos.Add("0038", 13);//白糖
             RawMaterialsNamePos.Clear();
             foreach (var material in RawMaterialsInfo)
             {
@@ -1325,18 +1260,308 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     }
                 }
             }
-
         }
-
-        public short SetBitValue(short data, byte offset, bool val)
+        public void plcVarMonitor() 
         {
-            if (offset > 16 || offset < 1)
+            foreach (PropertyInfo item in typeof(PlcReadAddressDB3).GetProperties())
             {
-                return data;
+                CommData.Add(new PlcInfos()
+                {
+                    Count = CommData.Count + 1,
+                    Name = item.Name,
+                    Address = GVL_SmallStation.plcReadDataDB3.GetType().GetProperty(item.Name).GetCustomAttribute<PlcCommAttribute>().Address,
+                    Type = item.PropertyType.ToString(),
+                    Describe = GVL_SmallStation.plcReadDataDB3.GetType().GetProperty(item.Name).GetCustomAttribute<PlcCommAttribute>().Describe,
+                    Value = GVL_SmallStation.plcReadDataDB3.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.plcReadDataDB3, null).ToString()
+                });
             }
+        }
+        public void RegisterInit() 
+        {
+            //西门子配方处理
+            ActionManage.GetInstance.Register(new Action<object>((res) =>
+            {
+                ObservableCollection<RemoteRecipeRawMaterial> RawMaterials = new ObservableCollection<RemoteRecipeRawMaterial>();
+                ObservableCollection<WindSendRawMaterial> WindSendData = new ObservableCollection<WindSendRawMaterial>();
+                if (SiemensDevice.IsConnected)
+                {
+                    if (res != null && res is XL_Start_DB recipe)
+                    {
+                        if (!string.IsNullOrEmpty(recipe.RecipeCode))
+                        {
+                            RawMaterials.Clear();
+                            for (int i = 0; i < GVL_SmallStation.Max_DosingSotckBinNum; i++)
+                            {
+                                if (!string.IsNullOrEmpty(recipe.Material[i].Material_Name))
+                                {
+                                    if (RawMaterialsNamePos.ContainsKey(recipe.Material[i].Material_Name))
+                                    {
+                                        RawMaterials.Add(new RemoteRecipeRawMaterial()
+                                        {
+                                            RawMaterialName = recipe.Material[i].Material_Name,
+                                            RawMaterialBarrelNum = recipe.Material[i].Material_BarrelNum,
+                                            RawMaterialWeight = recipe.Material[i].Material_Weight,
+                                            RawMaterialLocation = (int)RawMaterialsNamePos[recipe.Material[i].Material_Name]
+                                        });
+                                    }
+                                    else
+                                    {
+                                        MessageNotify.GetInstance.ShowRunLog($"原料：{recipe.Material[i].Material_Name}，不在配料表");
+                                        //MessageNotify.GetInstance.AlarmLog("配方名称与本地不符合");
+                                    }
+                                }
+                                else
+                                {
+                                    break;
+                                }
+                            }
+                            for (int i = 0; i < GVL_SmallStation.Max_PowderSotckBinNum; i++)
+                            {
+                                if (!string.IsNullOrEmpty(recipe.Powder[i].Powder_Name))
+                                {
+                                    WindSendData.Add(new WindSendRawMaterial()
+                                    {
+                                        RawMaterialName = recipe.Powder[i].Powder_Name,
+                                        RawMaterialWeight = recipe.Powder[i].Powder_Weight
+                                    });
+                                }
+                                else
+                                {
+                                    break;
+                                }
+                            }
+                            App.Current.Dispatcher.Invoke(() => {
+                                Json<RemoteRecipeDataColl>.Data.Recipes.Add(new RemoteRecipeData()
+                                {
+                                    RecipeName = recipe.RecipeName,
+                                    RecipeCode = recipe.RecipeCode,
+                                    RawMaterial = RawMaterials,
+                                    TrayCode = recipe.StockCode,
+                                    WindSend = WindSendData
+                                });
+                            });
+                        }
+                    }
+                }
+            }), "SiemensRecipeRecive", true);
+            ActionManage.GetInstance.Register(new Action<object>((res) =>
+            {
+            //    if (SiemensDevice.IsConnected)
+            //    {
+            //        if (res != null && res is RemoteRecipeData recipe)
+            //        {
+            //            RecipeFinishInfo.Order_No = recipe.RecipeCode;
+            //            RecipeFinishInfo.Product_Code = recipe.RecipeName;
+            //            RecipeFinishInfo.Job_No = (short)recipe.TrayCode;
+            //            for (int i = 0; i < recipe.RawMaterial.Count; i++)
+            //            {
+            //                RecipeFinishInfo.Material[i] = new UDT1();
+            //                RecipeFinishInfo.Material[i].Material_Name = recipe.RawMaterial.ElementAt(i).RawMaterialName;
+            //                RecipeFinishInfo.Material[i].Material_BarrelNum = recipe.RawMaterial.ElementAt(i).RawMaterialBarrelNum;
+            //                RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = recipe.RawMaterial.ElementAt(i).Laying_Off_Weight;
+            //            }
+            //            for (int i = 0; i < recipe.WindSend.Count; i++)
+            //            {
+            //                RecipeFinishInfo.Powder[i] = new UDT2();
+            //                RecipeFinishInfo.Powder[i].Powder_Name = recipe.RawMaterial.ElementAt(i).RawMaterialName;
+            //                RecipeFinishInfo.Powder[i].Powder_Weight = recipe.RawMaterial.ElementAt(i).Laying_Off_Weight;
+            //            }
+            //            if (GVL_SmallStation.SiemensSendRecipeStatus == 6)
+            //            {
+            //                GVL_SmallStation.SiemensSendRecipeStatus = 7;
+            //                RecipeFinishInfo.Ask_For_Finish = true;
+            //                SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
+            //            }
+            //        }
+            //    }
+            }), "SiemensRecipeFinish", true);
+            ActionManage.GetInstance.Register(new Action<Object>((res) =>
+            {
+                if (res != null && res is RemoteRecipeData recipe)
+                {
+                    Json<RemoteRecipeDataColl>.Data.Recipes.Add(recipe);
+                }
+            }), "LocalSimulationRecipeIssue", true);
+            ActionManage.GetInstance.Register(new Action(() =>
+            {
+                Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
+                GVL_SmallStation.SiemensSendRecipeStatus = 0;
+
+                MessageNotify.GetInstance.ShowRunLog("系统流程复位，等待西门子重新下发订单");
+            }), "BPASystemReset", true);
+            //手动控制系统模式
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", true); }), "SystemStart", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", false); }), "SystemStop", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.2", true); }), "SystemPause", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.2", false); }), "SystemReset", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.1", false); }), "SystemAutoMode", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.1", true); }), "SystemDebugMode", true);
+            //流程控制
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.3", true); }), "ManualSystemReset", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.4", true); }), "CLearRecipeInfo", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX0.7", true); }), "AGVPutTrayFinish", true);
+            //手动控制电机轴
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", true); }), "StartAxisLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", false); }), "StopAxisLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", true); }), "StartAxisMidCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", false); }), "StopAxisMidCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", true); }), "StartAxisUnLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", false); }), "StopAxisUnLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", true); }), "StartAxis1Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", false); }), "StopAxis1Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", true); }), "StartAxis2Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", false); }), "StopAxis2Command", true);
+            //电机速度
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is short value)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB47.DBD8", value);
+                }
+            }), "AxisLoadSpeedSet", true);
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is short value)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB47.DBD10", value);
+                }
+            }), "AxisMidSpeedSet", true);
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is short value)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB47.DBD12", value);
+                }
+            }), "AxisUnLoadSpeedSet", true);
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is float value)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB47.DBD0", value);
+                }
+            }), "Axis1SpeedSet", true);
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is float value)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB47.DBD4", value);
+                }
+            }), "Axis2SpeedSet", true);
 
-            short num = (short)(1 << offset - 1);
-            return (short)(val ? (data | num) : (data & ~num));
+
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is string address)
+                {
+                    HKDevice.HK_PLC_S7.Write(address, true);
+                }
+            }), "RobotSendTrueCommand", true);
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is string address)
+                {
+                    HKDevice.HK_PLC_S7.Write(address, false);
+                }
+            }), "RobotSendFalseCommand", true);
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is short Value)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB4.DBB102", (byte)Value);
+                }
+            }), "RobotSetProgramNum", true);
+            
+        }
+        public void DeviceConnect() 
+        {
+            try
+            {
+                if (Json<DevicePar>.Data.deviceConnectPar.HKPlcConnect)
+                {
+                    HKDevice.HK_PLC_S7.Connect(S7.Net.CpuType.S71200, HK_PLC_IP);
+                    if (HKDevice.IsConnected) MessageNotify.GetInstance.ShowRunLog("海科plc连接成功");
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageNotify.GetInstance.ShowAlarmLog("海科plc连接失败，等待重新连接");
+            }
+            finally
+            {
+                HKDevice.Init();
+                MessageNotify.GetInstance.ShowRunLog("海科plc初始化完成");
+            }
+            try
+            {
+                if (Json<DevicePar>.Data.deviceConnectPar.SiemensConnect)
+                {
+                    SiemensDevice.Siemens_PLC_S7.Connect(S7.Net.CpuType.S71500, Siemens_PLC_IP);
+                    if (SiemensDevice.IsConnected) MessageNotify.GetInstance.ShowRunLog("西门子plc连接成功");
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageNotify.GetInstance.ShowAlarmLog("西门子plc连接失败，等待重新连接");
+            }
+            finally
+            {
+                SiemensDevice.Init();
+                MessageNotify.GetInstance.ShowRunLog("西门子plc初始化完成");
+            }
+            try
+            {
+                if (Json<DevicePar>.Data.deviceConnectPar.WindSendConnect)
+                {
+                    WindSendDevice.Siemens_PLC_S7.Connect(S7.Net.CpuType.S71200, WindSend_PLC_IP);
+                    if (WindSendDevice.IsConnected) MessageNotify.GetInstance.ShowRunLog("风送plc连接成功");
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageNotify.GetInstance.ShowAlarmLog("粉料plc连接失败，等待重新连接");
+            }
+            finally
+            {
+                WindSendDevice.Init();
+                MessageNotify.GetInstance.ShowRunLog("风送粉料plc初始化完成");
+            }
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                try
+                {
+                    if (!HKDevice.IsConnected && Json<DevicePar>.Data.deviceConnectPar.HKPlcConnect)
+                    {
+                        HKDevice.HK_PLC_S7.Connect(S7.Net.CpuType.S71200, HK_PLC_IP);
+                        if (HKDevice.IsConnected) MessageNotify.GetInstance.ShowRunLog("海科PLC重新连接成功");
+                    }
+                }
+                catch (Exception ex)
+                {
+                }
+                try
+                {
+                    if (!SiemensDevice.IsConnected && Json<DevicePar>.Data.deviceConnectPar.SiemensConnect)
+                    {
+                        SiemensDevice.Siemens_PLC_S7.Connect(S7.Net.CpuType.S71500, Siemens_PLC_IP);
+                        if (SiemensDevice.IsConnected) MessageNotify.GetInstance.ShowRunLog("西门子PLC重新连接成功");
+                    }
+                }
+                catch (Exception ex)
+                {
+                }
+                try
+                {
+                    if (!WindSendDevice.IsConnected && Json<DevicePar>.Data.deviceConnectPar.WindSendConnect)
+                    {
+                        WindSendDevice.Siemens_PLC_S7.Connect(S7.Net.CpuType.S71200, WindSend_PLC_IP);
+                        if (WindSendDevice.IsConnected) MessageNotify.GetInstance.ShowRunLog("风送plc重新连接成功");
+                    }
+                }
+                catch (Exception ex)
+                {
+                }
+                Thread.Sleep(50);
+            }), "设备连接", true);
         }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
index c945af8a..382c3ef4 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
@@ -177,7 +177,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
 
         private void _myPing_PingCompleted(object sender, PingCompletedEventArgs e)
         {
-            if (e.Reply.Status == IPStatus.Success)
+            if (e.Reply != null && e.Reply.Status == IPStatus.Success)
             {
                 string ip = e.Reply.Address.ToString();
                 if (!DeviceLists.ContainsKey(ip))
@@ -280,7 +280,11 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
                 else IPQueues.Enqueue(e.Reply.Address.ToString());
             }
-            else IPQueues.Enqueue(e.Reply.Address.ToString());
+            else
+            {
+                if (e.Reply != null)
+                    IPQueues.Enqueue(e.Reply.Address.ToString());
+            }
         }
     }
 
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceParModel.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceParModel.cs
index 0c5c3d1c..c49c30e1 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceParModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceParModel.cs
@@ -64,6 +64,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         public int StirringSpeed { get { return _mStirringSpeed; } set { _mStirringSpeed = value; OnPropertyChanged(); } }
         private int _mStirringSpeed;
 
+        public float ErrorRange { get { return _mErrorRange; } set { _mErrorRange = value; OnPropertyChanged(); } }
+        private float _mErrorRange;
+
         /// <summary>
         /// 是否重复
         /// </summary>
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeData.cs b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeData.cs
index 8d8a160e..ed82b7d0 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeData.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeData.cs
@@ -38,5 +38,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public ObservableCollection<WindSendRawMaterial> WindSend { get; set; } = new ObservableCollection<WindSendRawMaterial>();
 
+
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeDataColl.cs b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeDataColl.cs
index b412208c..e400db22 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeDataColl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeDataColl.cs
@@ -10,5 +10,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.Siemens
     public class RemoteRecipeDataColl
     {
         public ObservableCollection<RemoteRecipeData> Recipes { get; set; } = new ObservableCollection<RemoteRecipeData>();
+        public int RecipesStatus { get; set; }
+
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs
index 70b95a09..825041db 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs
@@ -29,35 +29,52 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.Siemens
                     //var DataColl = this.Siemens_PLC_S7.ReadClass<XL_DataColl_DB>(2291);
                     if (Start != null && Start is XL_Start_DB st)
                     {
-                        if (GVL_SmallStation.IsAllowSiemensSendRecipe && GVL_SmallStation.SiemensSendRecipeStatus == 0)
+                        switch (GVL_SmallStation.SiemensSendRecipeStatus) 
                         {
-                            GVL_SmallStation.SiemensSendRecipeStatus = 1;
-                            this.Siemens_PLC_S7.Write("DB2201.DBX450.0", true);
+                            case 0:
+                                if (GVL_SmallStation.IsAllowSiemensSendRecipe)
+                                {
+                                    this.Siemens_PLC_S7.Write("DB2201.DBX450.0", true);
+                                    GVL_SmallStation.SiemensSendRecipeStatus = 1;
+                                }
+                                break;
+                            case 1:
+                                if (Start.Order_Request_ACK)
+                                {
+                                    if (!string.IsNullOrEmpty(st.RecipeCode))
+                                    {
+                                        GVL_SmallStation.SiemensSendRecipeStatus = 2;
+                                        ActionManage.GetInstance.Send("SiemensRecipeRecive", st);
+                                        this.Siemens_PLC_S7.Write("DB2201.DBX450.0", false);
+                                    }
+                                }
+                                break;
+                            case 2:
+                                if (Start.Order_Request_ACK == false)
+                                {
+                                    GVL_SmallStation.IsAllowSiemensSendRecipe = false;
+                                    GVL_SmallStation.SiemensSendRecipeStatus = 3;
+                                }
+                                break;
                         }
-                        if (Start.Order_Request_ACK && GVL_SmallStation.SiemensSendRecipeStatus == 1)
+                        if (RTrig.GetInstance("Order_Cancel").Start(st.Order_Cancel)) //订单取消
                         {
-                            if (!string.IsNullOrEmpty(st.RecipeCode))
+                            if (GVL_SmallStation.Order_Cancel == false)
                             {
-                                GVL_SmallStation.SiemensSendRecipeStatus = 2;
-                                ActionManage.GetInstance.Send("SiemensRecipeRecive", st);
-                                this.Siemens_PLC_S7.Write("DB2201.DBX450.0", false);
+                                GVL_SmallStation.Order_Cancel = true;
+                                GVL_SmallStation.Order_CancelRecipeCode = st.RecipeCode;
+                                GVL_SmallStation.OrderCancelStep = 0;
+                                MessageNotify.GetInstance.ShowRunLog($"西门子下发取消工单指令:{st.RecipeName}");
+                            }
+                            else 
+                            {
+                                MessageNotify.GetInstance.ShowRunLog($"订单正在取消,请等待订单{ GVL_SmallStation.Order_CancelRecipeCode}取消完成，再取消订单:{st.RecipeName}");
                             }
-                        }
-                        if (Start.Order_Request_ACK == false && GVL_SmallStation.SiemensSendRecipeStatus == 2)
-                        {
-                            GVL_SmallStation.IsAllowSiemensSendRecipe = false;
-                            GVL_SmallStation.SiemensSendRecipeStatus = 3;
-                        }
-                        if (RTrig.GetInstance("Order_Cancel").Start(st.Order_Cancel)) //订单取消
-                        {
-                            GVL_SmallStation.Order_Cancel = true;
-                            GVL_SmallStation.Order_CancelRecipeCode = st.RecipeCode;
-                            MessageNotify.GetInstance.ShowRunLog($"西门子下发取消工单指令:{st.RecipeName}");
                         }
                     }
                     if (Finish != null && Finish is XL_Finish_DB FinishData)
                     {
-                        if (FinishData.Ask_For_Finish_PLC && GVL_SmallStation.SiemensSendRecipeStatus == 7)
+                        if (FinishData.Ask_For_Finish_PLC)
                         {
                             FinishData.Order_No = "";
                             FinishData.Product_Code = "";
@@ -70,7 +87,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.Siemens
                             {
                                 FinishData.Powder[i] = new UDT2();
                             }
-                            GVL_SmallStation.SiemensSendRecipeStatus = 0;
                             FinishData.Ask_For_Finish = false;
                             FinishData.DosingTime = 0;
                             this.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(FinishData, 2261);
diff --git a/BPASmartClient.JXJFoodSmallStation/View/DeviceMaterialParView.xaml b/BPASmartClient.JXJFoodSmallStation/View/DeviceMaterialParView.xaml
index f6216d5b..66182267 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/DeviceMaterialParView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/DeviceMaterialParView.xaml
@@ -166,6 +166,7 @@
                 <ColumnDefinition />
                 <ColumnDefinition />
                 <ColumnDefinition />
+                <ColumnDefinition />
             </Grid.ColumnDefinitions>
 
 
@@ -227,15 +228,21 @@
                 Text="搅拌速度" />
 
             <Grid Grid.Column="9">
+                <TextBlock Style="{StaticResource TitleTextblockStyle}" Text="精度误差阈值(±g)" />
+                <Border
+                    BorderBrush="{StaticResource bordColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>
+            <Grid Grid.Column="10">
                 <TextBlock Style="{StaticResource TitleTextblockStyle}" Text="功能操作" />
                 <Border
                     BorderBrush="{StaticResource bordColor}"
                     BorderThickness="1,0,1,0"
                     Cursor="SizeWE" />
             </Grid>
-
             <Border
-                Grid.ColumnSpan="10"
+                Grid.ColumnSpan="11"
                 BorderBrush="{StaticResource bordColor}"
                 BorderThickness="1,0,1,0" />
 
@@ -259,6 +266,7 @@
                                     <ColumnDefinition />
                                     <ColumnDefinition />
                                     <ColumnDefinition />
+                                    <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
 
                                 <TextBox
@@ -334,22 +342,27 @@
                                     Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
                                     Style="{StaticResource InputTextboxStyle}"
                                     Text="{Binding StirringSpeed}" />
-
+                                
                                 <Grid Grid.Column="9">
-                                    <Button
-                                        Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                        CommandParameter="{Binding MaterialName}"
-                                        Content="删除"
-                                        FontSize="16"
-                                        Style="{StaticResource ControlButtonStyle}" />
+                                    <TextBox 
+                                        Foreground="Red"
+                                        Style="{StaticResource InputTextboxStyle}"
+                                        Text="{Binding ErrorRange}" />
                                     <Border
                                         BorderBrush="{StaticResource bordColor}"
                                         BorderThickness="1,0,1,0"
                                         Cursor="SizeWE" />
                                 </Grid>
 
+                                <Button Grid.Column="10"
+                                        Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding MaterialName}"
+                                        Content="删除"
+                                        FontSize="16"
+                                        Style="{StaticResource ControlButtonStyle}" />
+                                   
                                 <Border
-                                    Grid.ColumnSpan="10"
+                                    Grid.ColumnSpan="11"
                                     BorderBrush="{StaticResource bordColor}"
                                     BorderThickness="1,0,1,1" />
 
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
index 7c145c99..2c2a6d12 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
@@ -132,8 +132,10 @@
                     <TextBlock Text="{Binding Heartbeat}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
                 </WrapPanel>
                 <WrapPanel Grid.Row="1">
-                    <TextBlock Text="当前系统状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="当前下发配方状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
                     <TextBlock Text="{Binding OrderStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="当前配料状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding OrderDosingStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
                 </WrapPanel>
                 <WrapPanel Grid.Row="2">
                     <TextBlock Text="柔性味魔方配料完成，延迟复位时间：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml b/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
new file mode 100644
index 00000000..f5cb142b
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
@@ -0,0 +1,99 @@
+<UserControl x:Class="BPASmartClient.JXJFoodSmallStation.View.PlcVarMonitorView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920">
+    <UserControl.DataContext>
+        <vm:PlcVarMonitorViewModel />
+    </UserControl.DataContext>
+    <Border BorderThickness="0" BorderBrush="{StaticResource bordColor}">
+        <Grid Margin="0,10">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="60"></RowDefinition>
+                <RowDefinition></RowDefinition>
+            </Grid.RowDefinitions>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="3*"></ColumnDefinition>
+                    <ColumnDefinition Width="8*"></ColumnDefinition>
+                    <ColumnDefinition Width="4*"></ColumnDefinition>
+                    <ColumnDefinition Width="4*"></ColumnDefinition>
+                    <ColumnDefinition Width="10*"></ColumnDefinition>
+                    <ColumnDefinition Width="3*"></ColumnDefinition>
+                    <ColumnDefinition Width="17"></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid>
+                    <TextBlock Text="序号" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+                <Grid Grid.Column="1">
+                    <TextBlock Text="名称" FontSize="32"  HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+                <Grid Grid.Column="2">
+                    <TextBlock Text="地址" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+                <Grid Grid.Column="3">
+                    <TextBlock Text="类型" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+                <Grid Grid.Column="4">
+                    <TextBlock Text="描述" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+                <Grid Grid.Column="5">
+                    <TextBlock Text="当前值" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+            </Grid>
+            <Grid Grid.Row="1">
+                <ScrollViewer>
+                    <ItemsControl ItemsSource="{Binding plcInfos}" Foreground="Aqua">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="3*"></ColumnDefinition>
+                                        <ColumnDefinition Width="8*"></ColumnDefinition>
+                                        <ColumnDefinition Width="4*"></ColumnDefinition>
+                                        <ColumnDefinition Width="4*"></ColumnDefinition>
+                                        <ColumnDefinition Width="10*"></ColumnDefinition>
+                                        <ColumnDefinition Width="3*"></ColumnDefinition>
+                                    </Grid.ColumnDefinitions>
+                                    <Grid>
+                                        <TextBlock Text="{Binding Count}" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                    <Grid Grid.Column="1">
+                                        <TextBlock Text="{Binding Name}" FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                    <Grid Grid.Column="2">
+                                        <TextBlock Text="{Binding Address}" FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                    <Grid Grid.Column="3">
+                                        <TextBlock Text="{Binding Type}" FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                    <Grid Grid.Column="4">
+                                        <TextBlock Text="{Binding Describe}" FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                    <Grid Grid.Column="5">
+                                        <TextBlock Text="{Binding Value}" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                </Grid>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </ScrollViewer>
+            </Grid>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml.cs
new file mode 100644
index 00000000..261b4733
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.JXJFoodSmallStation.View
+{
+    /// <summary>
+    /// PlcVarMonitor.xaml 的交互逻辑
+    /// </summary>
+    public partial class PlcVarMonitorView : UserControl
+    {
+        public PlcVarMonitorView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
index acba7e18..2916d04d 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
@@ -50,110 +50,56 @@
 
     <Grid Margin="10">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="7*"/>
-            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="4*"/>
         </Grid.ColumnDefinitions>
         <!--#region 表格标题栏设置-->
-        <!--<Grid>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center">
-                <Button
-                    Width="200"
-                    Height="40"
-                    Margin="5,0,5,0"
-                    Command="{Binding Test1Command}"
-                    Content="AGV送托盘完成"
-                    FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
-                <Button
-                    Width="200"
-                    Height="40"
-                    Margin="5,0,5,0"
-                    Command="{Binding Test2Command}"
-                    Content="粉料仓配料完成"
-                    FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
-                <Button
-                    Width="200"
-                    Height="40"
-                    Margin="5,0,5,0"
-                    Command="{Binding Test3Command}"
-                    Content="AGV取托盘完成"
-                    FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
-                <Button
-                    Width="200"
-                    Height="40"
-                    Margin="5,0,5,0"
-                    Command="{Binding Test4Command}"
-                    Content="气缸收紧错位复位"
-                    FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
-                <Button
-                    Width="200"
-                    Height="40"
-                    Margin="5,0,5,0"
-                    Command="{Binding Test5Command}"
-                    Content="粉料仓提升到位"
-                    FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
-                <Button
-                    Width="200"
-                    Height="40"
-                    Margin="5,0,5,0"
-                    Command="{Binding Test6Command}"
-                    Content="AGV放货架流程完成"
-                    FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
-                <Button
-                    Width="200"
-                    Height="40"
-                    Margin="50,0,50,0"
-                    Command="{Binding BPAResetCommand}"
-                    Content="上位机初始化"
-                    FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
-            </StackPanel>
-            
-           
-        </Grid>
-        <Grid Grid.Row="1">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center">
-                <Button
-                    Width="200"
-                    Height="40"
-                    Margin="5,0,5,0"
-                    Command="{Binding SystemReset}"
-                    Content="系统复位"
-                    FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
-                <Button
-                    Width="200"
-                    Height="40"
-                    Margin="5,0,5,0"
-                    Command="{Binding CLearRecipeInfo}"
-                    Content="配方清零"
-                    FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+        <Grid>
+            <StackPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="机器人自动运行模式："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsAutoMode}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人正在自动运行："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsAutoRun}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人停止状态："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsStop}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人运行正常："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsRun}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人运行故障："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsAlarm}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人在Home点："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsHomed}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="抓空桶完成："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotGetEmptyBarrelComplete}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="放空桶完成："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotPutEmptyBarrelComplete}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="抓满桶完成："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotGetFullBarrelComplete}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="放满桶完成："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotPutFullBarrelComplete}"></TextBlock>
+                </WrapPanel>
             </StackPanel>
-
-
         </Grid>
-        <Grid Grid.Row="2">
-            <WrapPanel>
-                <TextBlock Text="心跳：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                <TextBlock Text="{Binding Heartbeat}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
-            </WrapPanel>
-        </Grid>-->
-        <Grid>
+        <Grid Grid.Column="1">
             <Grid.RowDefinitions>
                 <RowDefinition Height="1*"></RowDefinition>
                 <RowDefinition Height="7*"></RowDefinition>
@@ -180,21 +126,15 @@
                     Background="OrangeRed"></Button>
                 <Button
                     Grid.Column="2"
+                    Grid.ColumnSpan="2"
                     Margin="20,15"
-                    Command="{Binding AlarmReset}"
-                    Content="故障复位"
-                    FontSize="40"
-                    Background="LightYellow"></Button>
-                <Button
-                    Grid.Column="3"
-                    Margin="20,15"
-                    Command="{Binding SystemReset}"
-                    Content="设备复位"
+                    Command="{Binding EStopReset}"
+                    Content="急停复位"
                     FontSize="40"
                     Background="DodgerBlue"></Button>
             </Grid>
         </Grid>
-        <Grid Grid.Column="1">
+        <Grid Grid.Column="2">
             <Grid.RowDefinitions>
                 <RowDefinition></RowDefinition>
                 <RowDefinition></RowDefinition>
@@ -226,16 +166,17 @@
                     Panel.ZIndex="0"
                     Style="{StaticResource ImageButtonStyle}"></Button>
                 <Grid Grid.Row="1" Grid.ColumnSpan="2">
-                    <WrapPanel Orientation="Vertical">
+                    <StackPanel Orientation="Vertical">
                         <WrapPanel Orientation="Horizontal">
                             <TextBlock  Text="机器人正在运行程序号：" Foreground="#FF2AB2E7" FontSize="25" Margin="10" HorizontalAlignment="Left"></TextBlock>
                             <TextBlock  Text="{Binding IsRunProgramNum}" Foreground="#FF2AB2E7" FontSize="25" Margin="10" HorizontalAlignment="Left" TextAlignment="Center"></TextBlock>
                         </WrapPanel>
                         <WrapPanel Orientation="Horizontal" VerticalAlignment="Center">
                             <TextBlock   Text="机器人需要运行程序号：" Foreground="#FF2AB2E7" FontSize="25" Margin="10" HorizontalAlignment="Left"></TextBlock>
-                            <TextBox  Text="{Binding SetProgramNum}" Foreground="#FF2AB2E7" FontSize="25" Margin="10" HorizontalAlignment="Left" TextAlignment="Center"></TextBox>
+                            <TextBox  Text="{Binding SetProgramNum}" Width="50" Foreground="#FF2AB2E7" FontSize="25" Margin="10" HorizontalAlignment="Left" TextAlignment="Center"></TextBox>
+                            <Button  FontSize="20" Height="40" Command="{Binding SetProgramNumCommand}" Content="设置" Style="{StaticResource ImageButtonStyle}"></Button>
                         </WrapPanel>
-                    </WrapPanel>
+                    </StackPanel>
                 </Grid>
                 <Button
                     Grid.Row="2"
@@ -322,7 +263,7 @@
                     </DataTemplate>
                 </ListView.ItemTemplate>
             </ListView>-->
-            <Grid Grid.Row="1">
+            <Grid Grid.Row="1" Visibility="Hidden">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition></ColumnDefinition>
                     <ColumnDefinition></ColumnDefinition>
@@ -330,17 +271,33 @@
                 <Grid.RowDefinitions>
                     <RowDefinition></RowDefinition>
                     <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
                 </Grid.RowDefinitions>
-                <Grid Grid.ColumnSpan="2">
-                    <TextBlock Text="托盘气缸控制" Foreground="#FF2AB2E7" FontSize="25" Margin="20,15" HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
+                <Grid Grid.Row="0">
+                    <Button
+                        Margin="20,5"
+                        Command="{Binding RobotGetEmptyBarrel}"
+                        Content="允许机器人抓空桶"
+                        Style="{StaticResource ImageButtonStyle}"></Button>
+                </Grid>
+                <Grid Grid.Column="1">
+                    <Button
+                        Margin="20,5"
+                        Command="{Binding RobotPutEmptyBarrel}"
+                        Content="允许机器人放空桶"
+                        Style="{StaticResource ImageButtonStyle}"></Button>
                 </Grid>
                 <Grid Grid.Row="1">
                     <Button
                         Margin="20,5"
-                        Command="{Binding Tray1Cylinder}"
-                        Content="1#托盘气缸"
-                        FontSize="32"
+                        Command="{Binding RobotGetFullBarrel}"
+                        Content="允许机器人抓满桶"
+                        Style="{StaticResource ImageButtonStyle}"></Button>
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="1">
+                    <Button
+                        Margin="20,5"
+                        Command="{Binding RobotPutFullBarrel}"
+                        Content="允许机器人放满桶"
                         Style="{StaticResource ImageButtonStyle}"></Button>
                 </Grid>
             </Grid>
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
index 9322b444..f367620c 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
@@ -76,33 +76,44 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 switch (GVL_SmallStation.SiemensSendRecipeStatus) 
                 {
                     case 0:
-                        OrderStatus = "初始状态";
+                        OrderStatus = IssueRecipeCondition.等待小料站PLC允许下配方.ToString();
                         break;
                     case 1:
-                        OrderStatus = "向西门子请求配方";
+                        OrderStatus = IssueRecipeCondition.等待西门子下发配方.ToString();
                         break;
                     case 2:
-                        OrderStatus = "上位机接收到配方";
+                        OrderStatus = IssueRecipeCondition.等待西门子下发配方信号复位.ToString();
                         break;
                     case 3:
-                        OrderStatus = "西门子确认上位机接收到配方";
+                        OrderStatus = IssueRecipeCondition.等待上位机请求配料.ToString();
                         break;
                     case 4:
-                        OrderStatus = "上位机向西门子请求配料";
+                        OrderStatus = IssueRecipeCondition.等待西门子确认配料.ToString();
                         break;
                     case 5:
-                        OrderStatus = "西门子确认配料";
+                        OrderStatus = IssueRecipeCondition.等待西门子确认配料信号复位.ToString();
                         break;
                     case 6:
-                        OrderStatus = "上位机将配方进行配料";
-                        break;
-                    case 7:
-                        OrderStatus = "配料完成";
+                        OrderStatus = "上位机将配方添加到队列中";
                         break;
                     default:
                         OrderStatus = "无意义";
                         break;
                 }
+                switch (GVL_SmallStation.GetInstance.RecipeStatusIDTray1)
+                {
+                    case 0:
+                        OrderDosingStatus = ProcessCondition.等待AGV到位.ToString();
+                        break;
+                    case 1:
+                        OrderDosingStatus = ProcessCondition.等待小料站PLC接受配方完成.ToString();
+                        break;
+                    case 2:
+                        OrderDosingStatus = ProcessCondition.等待配方配料完成.ToString();
+                        break;
+                    default:
+                        break;
+                }
                 Thread.Sleep(100);
             }), "流程手动设备状态读取",true);
             TimeSet = new RelayCommand(() =>
@@ -126,7 +137,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         private int _mtime;
         public static string OrderStatus { get { return _mOrderStatus; } set { _mOrderStatus = value; OnStaticPropertyChanged(); } }
         private static string _mOrderStatus = "无意义";
-        
+        public static string OrderDosingStatus { get { return _mOrderDosingStatus; } set { _mOrderDosingStatus = value; OnStaticPropertyChanged(); } }
+        private static string _mOrderDosingStatus = "无意义";
         public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
         public static void OnStaticPropertyChanged([CallerMemberName] string PropName = "")
         {
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/PlcVarMonitorViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/PlcVarMonitorViewModel.cs
new file mode 100644
index 00000000..1317ea02
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/PlcVarMonitorViewModel.cs
@@ -0,0 +1,23 @@
+using BPASmartClient.JXJFoodSmallStation.Model;
+using BPASmartClient.JXJFoodSmallStation.Model.GVL;
+using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.ViewModel
+{
+    public class PlcVarMonitorViewModel : ObservableObject
+    {
+        public PlcVarMonitorViewModel() 
+        {
+            
+        }
+        public ObservableCollection<PlcInfos> plcInfos => ProcessControl.GetInstance.CommData;
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs
index 00e74683..7910aae8 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs
@@ -23,19 +23,100 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
     {
         public RobotViewModel()
         {
+            ThreadManage.GetInstance().StartLong(() => 
+            {
+                IsRunProgramNum = GVL_SmallStation.RobotProgramNum;
+                RobotIsAutoMode = GVL_SmallStation.RobotStatus.GetBitValue(1);
+                RobotIsAutoRun = GVL_SmallStation.RobotStatus.GetBitValue(2);
+                RobotIsStop = GVL_SmallStation.RobotStatus.GetBitValue(3);
+                RobotIsRun = GVL_SmallStation.RobotStatus.GetBitValue(4);
+                RobotIsAlarm = GVL_SmallStation.RobotStatus.GetBitValue(5);
+                RobotIsHomed = GVL_SmallStation.RobotStatus.GetBitValue(6);
+                RobotGetEmptyBarrelComplete = GVL_SmallStation.RobotStatus.GetBitValue(8);
+                RobotPutEmptyBarrelComplete = GVL_SmallStation.RobotStatus.GetBitValue(9);
+                RobotGetFullBarrelComplete = GVL_SmallStation.RobotStatus.GetBitValue(10);
+                RobotPutFullBarrelComplete = GVL_SmallStation.RobotStatus.GetBitValue(11);
+
+            },"机器人状态",true);
+            SystemStart = new RelayCommand(() => {
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.0");
+            });
+            SystemStop = new RelayCommand(() => {
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.1");
+            });
+            EStopReset = new RelayCommand(() => {
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.2");
+            });
+
+            TestRobotRun = new RelayCommand(() => {
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.4");
+            });
+            AutoMode = new RelayCommand(() => {
+                ActionManage.GetInstance.Send("RobotSendFalseCommand", "DB4.DBX100.3");
+            });
+            TestMode = new RelayCommand(() => {
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.3");
+            });
+
+            RobotGetEmptyBarrel = new RelayCommand(() => {
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.7");
+            });
+            RobotPutEmptyBarrel = new RelayCommand(() => {
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.0");
+            });
+            RobotGetFullBarrel = new RelayCommand(() => {
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.1");
+            });
+            RobotPutFullBarrel = new RelayCommand(() => {
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.2");
+            });
+            SetProgramNumCommand = new RelayCommand(() =>{
+                ActionManage.GetInstance.Send("RobotSetProgramNum", SetProgramNum);
+            });
         }
 
         public RelayCommand SystemStart { get; set; }
         public RelayCommand SystemStop { get; set; }
-        public RelayCommand SystemReset { get; set; }
-        public RelayCommand AlarmReset { get; set; }
+        public RelayCommand EStopReset { get; set; }
+
         public RelayCommand TestRobotRun { get; set; }
-        public RelayCommand Tray1Cylinder { get; set; }
+        public RelayCommand AutoMode { get; set; }
+        public RelayCommand TestMode { get; set; }
+
+        public RelayCommand RobotGetEmptyBarrel { get; set; }
+        public RelayCommand RobotPutEmptyBarrel { get; set; }
+        public RelayCommand RobotGetFullBarrel { get; set; }
+        public RelayCommand RobotPutFullBarrel { get; set; }
+        public RelayCommand SetProgramNumCommand { get; set; }
 
         public short IsRunProgramNum { get { return _runProgramNum; } set { _runProgramNum = value;OnPropertyChanged(); } }
         private short _runProgramNum;
         public short SetProgramNum { get { return _SetProgramNum; } set { _SetProgramNum = value; OnPropertyChanged(); } }
         private short _SetProgramNum;
+
+        public bool RobotIsAutoMode { get { return _RobotIsAutoMode; } set { _RobotIsAutoMode = value; OnPropertyChanged(); } }
+        private bool _RobotIsAutoMode;
+        public bool RobotIsAutoRun { get { return _RobotIsAutoRun; } set { _RobotIsAutoRun = value; OnPropertyChanged(); } }
+        private bool _RobotIsAutoRun;
+        public bool RobotIsStop { get { return _RobotIsStop; } set { _RobotIsStop = value; OnPropertyChanged(); } }
+        private bool _RobotIsStop;
+        public bool RobotIsRun { get { return _RobotIsRun; } set { _RobotIsRun = value; OnPropertyChanged(); } }
+        private bool _RobotIsRun;
+        public bool RobotIsAlarm { get { return _RobotIsAlarm; } set { _RobotIsAlarm = value; OnPropertyChanged(); } }
+        private bool _RobotIsAlarm;
+        public bool RobotIsHomed { get { return _RobotIsHomed; } set { _RobotIsHomed = value; OnPropertyChanged(); } }
+        private bool _RobotIsHomed;
+        public bool RobotGetEmptyBarrelComplete { get { return _RobotGetEmptyBarrelComplete; } set { _RobotGetEmptyBarrelComplete = value; OnPropertyChanged(); } }
+        private bool _RobotGetEmptyBarrelComplete;
+        public bool RobotPutEmptyBarrelComplete { get { return _RobotPutEmptyBarrelComplete; } set { _RobotPutEmptyBarrelComplete = value; OnPropertyChanged(); } }
+        private bool _RobotPutEmptyBarrelComplete;
+        public bool RobotGetFullBarrelComplete { get { return _RobotGetFullBarrelComplete; } set { _RobotGetFullBarrelComplete = value; OnPropertyChanged(); } }
+        private bool _RobotGetFullBarrelComplete;
+
+        public bool RobotPutFullBarrelComplete { get { return _RobotPutFullBarrelComplete; } set { _RobotPutFullBarrelComplete = value; OnPropertyChanged(); } }
+        private bool _RobotPutFullBarrelComplete;
+
+
         public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
         public static void OnStaticPropertyChanged([CallerMemberName] string PropName = "")
         {
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs
index c7ecea4d..67ede639 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs
@@ -34,7 +34,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             SaveRawMaterialPara = new RelayCommand(() => 
             {
                 Json<DevicePar>.Save();
-                ProcessControl.GetInstance.testData();
+                ProcessControl.GetInstance.StockBinNameWithPos();
                 foreach (var item in Json<DevicePar>.Data.rawMaterialStockBin) 
                 {
                     MessageNotify.GetInstance.ShowUserLog($"料仓位置:"+ item.RawMaterialLocation+ ",物料编码:" + item.RawMaterialName);
diff --git a/BPASmartClient.JakaRobot/JaKaHelper.cs b/BPASmartClient.JakaRobot/JaKaHelper.cs
index 1402fff6..85c0ce2f 100644
--- a/BPASmartClient.JakaRobot/JaKaHelper.cs
+++ b/BPASmartClient.JakaRobot/JaKaHelper.cs
@@ -86,7 +86,6 @@ namespace BPASmartClient.JakaRobot
                     {
                         jakaAPI.create_handler(ip.ToCharArray(), ref rshd);
                         login = true;
-
                     }
                     catch (Exception ex)
                     {
@@ -98,7 +97,7 @@ namespace BPASmartClient.JakaRobot
                         }
                         Thread.Sleep(3000);
                     }
-                } 
+                }
                 if (login && IsDeviceFirstInit==false)
                 {
                     try
diff --git a/BPASmartClient.S7Net/EntityClassResolution.cs b/BPASmartClient.S7Net/EntityClassResolution.cs
index 90d60ade..924af76a 100644
--- a/BPASmartClient.S7Net/EntityClassResolution.cs
+++ b/BPASmartClient.S7Net/EntityClassResolution.cs
@@ -27,7 +27,7 @@ namespace BPASmartClient.S7Net
                     numBytes += 0.125;
                     break;
                 case "Byte":
-                    IncrementToEven(ref numBytes);
+                    //IncrementToEven(ref numBytes);
                     numBytes += 1.0;
                     break;
                 case "Int16":
diff --git a/DosingSystem/ViewModel/RecipeControlViewModel.cs b/DosingSystem/ViewModel/RecipeControlViewModel.cs
index 41efb490..f5667637 100644
--- a/DosingSystem/ViewModel/RecipeControlViewModel.cs
+++ b/DosingSystem/ViewModel/RecipeControlViewModel.cs
@@ -574,7 +574,7 @@ namespace BPASmartClient.DosingSystem.ViewModel
                                         else
                                         {
                                             int a1 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == cnt);
-                                            Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName ==              DeviceInquire.GetInstance.devices.ElementAt(a1).DeviceName && p.Loc == barrel);
+                                            Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a1).DeviceName && p.Loc == barrel);
                                         }
                                         if (Location1 >= 0)
                                         {
diff --git a/SmartClient.sln b/SmartClient.sln
index fe0ca1ff..d42e1fe1 100644
--- a/SmartClient.sln
+++ b/SmartClient.sln
@@ -204,13 +204,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "设备监控", "设备监
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MaxWokControl", "BPASmartClient.MaxWokControl\BPASmartClient.MaxWokControl.csproj", "{888382C0-6750-4E81-BED3-0F38775DCCCB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.MorkSUpgradedVer", "BPASmartClient.MorkSUpgradedVer\BPASmartClient.MorkSUpgradedVer.csproj", "{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkSUpgradedVer", "BPASmartClient.MorkSUpgradedVer\BPASmartClient.MorkSUpgradedVer.csproj", "{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkS3", "BPASmartClient.MorkS3\BPASmartClient.MorkS3.csproj", "{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.RobotGripper", "BPASmartClient.RobotGripper\BPASmartClient.RobotGripper.csproj", "{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.MilkTeaCube", "BPASmartClient.MilkTeaCube\BPASmartClient.MilkTeaCube.csproj", "{915F0718-B7AC-428D-ACD5-7DAACC28539F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MilkTeaCube", "BPASmartClient.MilkTeaCube\BPASmartClient.MilkTeaCube.csproj", "{915F0718-B7AC-428D-ACD5-7DAACC28539F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/WpfControlLibrary1/AssemblyInfo.cs b/WpfControlLibrary1/AssemblyInfo.cs
new file mode 100644
index 00000000..8b5504ec
--- /dev/null
+++ b/WpfControlLibrary1/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/WpfControlLibrary1/UserControl1.xaml b/WpfControlLibrary1/UserControl1.xaml
new file mode 100644
index 00000000..dead4a4b
--- /dev/null
+++ b/WpfControlLibrary1/UserControl1.xaml
@@ -0,0 +1,12 @@
+<UserControl x:Class="WpfControlLibrary1.UserControl1"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WpfControlLibrary1"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
diff --git a/WpfControlLibrary1/UserControl1.xaml.cs b/WpfControlLibrary1/UserControl1.xaml.cs
new file mode 100644
index 00000000..fc7b24ea
--- /dev/null
+++ b/WpfControlLibrary1/UserControl1.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace WpfControlLibrary1
+{
+    /// <summary>
+    /// Interaction logic for UserControl1.xaml
+    /// </summary>
+    public partial class UserControl1 : UserControl
+    {
+        public UserControl1()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/WpfControlLibrary1/WpfControlLibrary1.csproj b/WpfControlLibrary1/WpfControlLibrary1.csproj
new file mode 100644
index 00000000..c6ee76c2
--- /dev/null
+++ b/WpfControlLibrary1/WpfControlLibrary1.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+</Project>

From 733c7f2001f071acec4d9d94ac0580ae756c637d Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Tue, 7 Mar 2023 19:40:48 +0800
Subject: [PATCH 11/96] =?UTF-8?q?morkS=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkS/Control_Morks.cs         |  4 ++--
 BPASmartClient.MorkS/View/ParSet.xaml         | 24 ++++++++++++++++++-
 .../ViewModel/ParSetViewModel.cs              | 13 ++++++++--
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index 31dd41f2..a6b39f75 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -654,10 +654,10 @@ namespace BPASmartClient.MorkS
             }
 
             //加汤
-            if (Delay.GetInstance("加汤延时判断").Start(mORKS.TakeMealDetect && mORKS.CookCompleteFlatBit, 1))
+            /*if (Delay.GetInstance("加汤延时判断").Start(mORKS.TakeMealDetect && mORKS.CookCompleteFlatBit, 1))
             {
                 AddSoup();
-            }
+            }*/
 
             //取餐完成逻辑处理
             if (Delay.GetInstance("CompleteChange1").Start(!mORKS.TakeMealDetect, 1) && mORKS.CookCompleteFlatBit == true)
diff --git a/BPASmartClient.MorkS/View/ParSet.xaml b/BPASmartClient.MorkS/View/ParSet.xaml
index 76207e4e..9f5734e7 100644
--- a/BPASmartClient.MorkS/View/ParSet.xaml
+++ b/BPASmartClient.MorkS/View/ParSet.xaml
@@ -149,8 +149,30 @@
                     Margin="10 0 0 0"
                     Style="{StaticResource TextBlockStyle}"
                     Text="(秒)" />
+                <TextBlock
+                    FontSize="21"
+                     Margin="40 0 0 0"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="清洗加汤管道时间:" />
+                <TextBox
+                    Width="100"
+                    Margin="10,0,0,0"
+                    VerticalAlignment="Center"
+                    Background="Transparent"
+                    BorderBrush="#FF23CACA"
+                    CaretBrush="Aqua"
+                    FontFamily="楷体"
+                    FontSize="21"
+                    Foreground="#ff34f7f7"
+                    Text="{Binding DelayTime}" />
+                <TextBlock
+                    FontSize="21"
+                    Margin="10 0 0 0"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="(秒)" />
+                <Button Content="启动"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5" Foreground="Aqua" 
+                    Style="{StaticResource ButtonStyle}" Command="{Binding CommandStart}" />
             </StackPanel>
-
         </Grid>
 
     </Grid>
diff --git a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
index b99f3a7f..d4a7edbd 100644
--- a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
+++ b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
@@ -19,10 +19,16 @@ namespace BPASmartClient.MorkS.ViewModel
             SaveInfoCommand = new RelayCommand(SaveSettingData);
 
             ActionManage.GetInstance.Register(SaveSettingData, "初始化设定煮面时间");
-
+            CommandStart = new RelayCommand(async ()=>
+            {
+                ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M0.6", Value = true });
+                await Task.Delay((int)DelayTime * 1000);
+                ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M0.6", Value = false });
+            });
         }
 
         public RelayCommand SaveInfoCommand { get; set; }
+        public RelayCommand CommandStart { get; set; }
 
         public ObservableCollection<ParSet> parSets { get; set; } = Json<MorksPar>.Data.parSets;
 
@@ -30,7 +36,8 @@ namespace BPASmartClient.MorkS.ViewModel
         /// 加汤时间设置
         /// </summary>
         public float AddSoup { get { return Json<MorksPar>.Data.AddSoupTime; } set { Json<MorksPar>.Data.AddSoupTime = value; OnPropertyChanged(); } }
-
+        public float DelayTime { get { return _DelayTime; } set { _DelayTime = value; OnPropertyChanged(); } }
+        private float _DelayTime;
 
         private void SaveSettingData()
         {
@@ -48,6 +55,8 @@ namespace BPASmartClient.MorkS.ViewModel
                 bools.Add(Json<MorksPar>.Data.parSets[i].IsShield);
                 ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = $"VW{116 + (i * 6)}", Value = values.ToArray() });
             }
+            ushort times = Convert.ToUInt16(Json<MorksPar>.Data.AddSoupTime * 10);
+            ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2282", Value = times });
             ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M260.0", Value = bools.ToArray() });
             Json<MorksPar>.Save();
         }

From 497395c419328e76da610077bf6cfb06cead71df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Fri, 10 Mar 2023 10:17:05 +0800
Subject: [PATCH 12/96] =?UTF-8?q?=E7=85=AE=E9=9D=A2=E6=9C=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=A7=A3=E6=9E=90=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkS/Control_Morks.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index 31dd41f2..aeb0f644 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -330,6 +330,11 @@ namespace BPASmartClient.MorkS
                      Json<OrderStatistics>.Data.Count++;
                      Json<OrderStatistics>.Save();
                      OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT);
+                     if (order.MorkOrder.GoodBatchings.Count <= 1)
+                     {
+                         DeviceProcessLogShow($"数据解析失败，商品物料信息为空,请检查后台配置！");
+                         return;
+                     }
                      DeviceProcessLogShow($"接收到{OrderCount}次订单，订单ID：{order.MorkOrder.SuborderId}");
                      mORKS.HistorySuborderId.Add(order.MorkOrder.SuborderId);
                      foreach (var item in order.MorkOrder.GoodBatchings)
@@ -364,6 +369,10 @@ namespace BPASmartClient.MorkS
                                  }
                              }
                          }
+                         else
+                         {
+                             DeviceProcessLogShow($"数据解析失败，未找到商品信息,请检查后台配置！");
+                         }
                      }
                  }
              });

From 3d41fc71648c1fa37c56d8d3e36ef3e178d246a4 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Wed, 15 Mar 2023 13:19:03 +0800
Subject: [PATCH 13/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/HK_PLC/PlcReadAddressDB3.cs         |  16 +-
 .../Model/ProcessControl.cs                   | 218 +++++++------
 .../Model/RawMaterial/DevicePar.cs            |   2 +
 .../Model/WindSend/WindSendRawMaterial.cs     |   6 +
 .../View/WindSendParView.xaml                 | 302 ++++--------------
 .../ViewModel/WindSendParViewModel.cs         |  50 +--
 6 files changed, 209 insertions(+), 385 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
index 8891ccf7..3f025d9e 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
@@ -69,21 +69,21 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
         public int Standby9 { get; set; }
 
         [PlcComm("DB3.DBD10", "工站1_1号桶的位置")]
-        public int WorkStation1Barrel1Pos { get; set; }
+        public float WorkStation1Barrel1Pos { get; set; }
         [PlcComm("DB3.DBD14", "工站1_2号桶的位置")]
-        public int WorkStation1Barrel2Pos { get; set; }
+        public float WorkStation1Barrel2Pos { get; set; }
         [PlcComm("DB3.DBD18", "工站1_3号桶的位置")]
-        public int WorkStation1Barrel3Pos { get; set; }
+        public float WorkStation1Barrel3Pos { get; set; }
         [PlcComm("DB3.DBD22", "工站1_4号桶的位置")]
-        public int WorkStation1Barrel4Pos { get; set; }
+        public float WorkStation1Barrel4Pos { get; set; }
         [PlcComm("DB3.DBD26", "工站2_1号桶的位置")]
-        public int WorkStation2Barrel1Pos { get; set; }
+        public float WorkStation2Barrel1Pos { get; set; }
         [PlcComm("DB3.DBD30", "工站2_2号桶的位置")]
-        public int WorkStation2Barrel2Pos { get; set; }
+        public float WorkStation2Barrel2Pos { get; set; }
         [PlcComm("DB3.DBD34", "工站2_3号桶的位置")]
-        public int WorkStation2Barrel3Pos { get; set; }
+        public float WorkStation2Barrel3Pos { get; set; }
         [PlcComm("DB3.DBD38", "工站2_4号桶的位置")]
-        public int WorkStation2Barrel4Pos { get; set; }
+        public float WorkStation2Barrel4Pos { get; set; }
 
         [PlcComm("DB3.DBD42", "备用")]
         public int StandBy42 { get; set; }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index 2c87f223..ae5dbfd4 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -823,29 +823,30 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     {
                         if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 0)
                         {
+                            StockBinInit();
                             if (GVL_SmallStation.GetInstance.IsUseWindSend)
                             {
                                 WindSendData.TargetRecipeCode = code;
                                 WindSendData.IsAllowDosing = true;
                                 foreach (var item in RemoteRecipes.ElementAt(index).WindSend)
                                 {
-                                    if (item.RawMaterialName == "0037" || item.RawMaterialName == "粉料1")
+                                    if (item.RawMaterialName == "0037" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(0).RawMaterialName)
                                     {
                                         WindSendData.RawMaterial1_SetWeight = item.RawMaterialWeight;
                                     }
-                                    if (item.RawMaterialName == "0038" || item.RawMaterialName == "粉料2")
+                                    if (item.RawMaterialName == "0038" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(1).RawMaterialName)
                                     {
                                         WindSendData.RawMaterial2_SetWeight = item.RawMaterialWeight;
                                     }
-                                    if (item.RawMaterialName == "0039" || item.RawMaterialName == "粉料3")
+                                    if (item.RawMaterialName == "0039" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(2).RawMaterialName)
                                     {
                                         WindSendData.RawMaterial3_SetWeight = item.RawMaterialWeight;
                                     }
-                                    if (item.RawMaterialName == "0045" || item.RawMaterialName == "粉料4")
+                                    if (item.RawMaterialName == "0045" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(3).RawMaterialName)
                                     {
                                         WindSendData.RawMaterial4_SetWeight = item.RawMaterialWeight;
                                     }
-                                    if (item.RawMaterialName == "0046" || item.RawMaterialName == "粉料5")
+                                    if (item.RawMaterialName == "0046" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(4).RawMaterialName)
                                     {
                                         WindSendData.RawMaterial5_SetWeight = item.RawMaterialWeight;
                                     }
@@ -870,126 +871,144 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         }
                         if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 2)
                         {
-                            if (GVL_SmallStation.GetInstance.DosingTray1 == false && GVL_SmallStation.GetInstance.DosingTray1Loc == 0)
+                            if (RTrig.GetInstance("DB3.DBX50.0").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.0")))
                             {
-                                if (RTrig.GetInstance("DB3.DBX50.0").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.0")))
+                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD10");
+                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{res}料仓，允许配料");
+                                if (res > 0 && res is float loc)
                                 {
-                                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD10");
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{res}料仓，允许配料");
-                                    if (res > 0 && res is float loc)
+                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+                                    float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;//单位g转换kg
+                                    if (loc_index >= 0)
                                     {
-                                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                        float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;//单位g转换kg
-                                        if (loc_index >= 0)
-                                        {
-                                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//根据料仓编号 启动并写入每个原料重量
-                                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-                                        }
-                                        GVL_SmallStation.GetInstance.DosingTray1 = true;
-                                        GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{(int)loc}号仓，配料完成");
+                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//根据料仓编号 启动并写入每个原料重量
+                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
                                     }
+                                    else
+                                    {
+                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，错误没有找到{(int)loc}号仓的配方");
+                                    }
+                                    GVL_SmallStation.GetInstance.DosingTray1 = true;
+                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
+                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{(int)loc}号仓，正在配料");
                                 }
-                                else if (RTrig.GetInstance("DB3.DBX50.1").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.1")))
+                            }
+                            else if (RTrig.GetInstance("DB3.DBX50.1").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.1")))
+                            {
+                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD14");
+                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{res}料仓，允许配料");
+                                if (res > 0 && res is float loc)
                                 {
-                                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD14");
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{res}料仓，允许配料");
-                                    if (res > 0 && res is float loc)
+                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+                                    float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
+                                    if (loc_index >= 0)
                                     {
-                                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                        float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
-                                        if (loc_index >= 0)
-                                        {
-                                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
-                                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-                                        }
-                                        GVL_SmallStation.GetInstance.DosingTray1 = true;
-                                        GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{(int)loc}号仓，配料完成");
+                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                    }
+                                    else
+                                    {
+                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，错误没有找到{(int)loc}号仓的配方");
                                     }
+                                    GVL_SmallStation.GetInstance.DosingTray1 = true;
+                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
+                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{(int)loc}号仓，正在配料");
                                 }
-                                else if (RTrig.GetInstance("DB3.DBX50.2").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.2")))
+                            }
+                            else if (RTrig.GetInstance("DB3.DBX50.2").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.2")))
+                            {
+                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD18");
+                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{res}料仓，允许配料");
+                                if (res > 0 && res is float loc)
                                 {
-                                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD18");
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{res}料仓，允许配料");
-                                    if (res > 0 && res is float loc)
+                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+                                    float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
+                                    if (loc_index >= 0)
                                     {
-                                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                        float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
-                                        if (loc_index >= 0)
-                                        {
-                                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
-                                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-                                        }
-                                        GVL_SmallStation.GetInstance.DosingTray1 = true;
-                                        GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{(int)loc}号仓，配料完成");
+                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
                                     }
+                                    else
+                                    {
+                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，错误没有找到{(int)loc}号仓的配方");
+                                    }
+                                    GVL_SmallStation.GetInstance.DosingTray1 = true;
+                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
+                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{(int)loc}号仓，正在配料");
                                 }
-                                else if (RTrig.GetInstance("DB3.DBX50.3").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.3")))
+                            }
+                            else if (RTrig.GetInstance("DB3.DBX50.3").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.3")))
+                            {
+                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD22");
+                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{res}料仓，允许配料");
+                                if (res > 0 && res is float loc)
                                 {
-                                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD22");
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{res}料仓，允许配料");
-                                    if (res > 0 && res is float loc)
+                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+                                    float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
+                                    if (loc_index >= 0)
                                     {
-                                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                        float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
-                                        if (loc_index >= 0)
-                                        {
-                                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
-                                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-                                        }
-                                        GVL_SmallStation.GetInstance.DosingTray1 = true;
-                                        GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{(int)loc}号仓，配料完成");
+                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
                                     }
+                                    else
+                                    {
+                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，错误没有找到{(int)loc}号仓的配方");
+                                    }
+                                    GVL_SmallStation.GetInstance.DosingTray1 = true;
+                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
+                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{(int)loc}号仓，正在配料");
                                 }
                             }
-                            if (GVL_SmallStation.GetInstance.DosingTray1 && GVL_SmallStation.GetInstance.DosingTray1Loc > 0 && GVL_SmallStation.GetInstance.DosingTray1Loc < 16)
+                            /* if (GVL_SmallStation.GetInstance.DosingTray1 && GVL_SmallStation.GetInstance.DosingTray1Loc > 0 && GVL_SmallStation.GetInstance.DosingTray1Loc < 16)
+                             {
+                                 int i = GVL_SmallStation.GetInstance.DosingTray1Loc;*/
+                            for (int i = 1; i < 16; i++)
                             {
-                                int i = GVL_SmallStation.GetInstance.DosingTray1Loc;
                                 if (DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3)
                                 {
-                                    Thread.Sleep(GVL_SmallStation.Time);
-                                    MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成");
                                     int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
-                                    RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
-                                    bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
-                                    MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，下料完成重量：{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}");
-                                    float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000);
-                                    int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
-                                    if (iIndex >= 0)
+                                    if (res >= 0)
                                     {
-                                        if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
+                                        Thread.Sleep(GVL_SmallStation.Time);
+                                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成");
+                                        RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
+                                        bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
+                                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，下料完成重量：{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}");
+                                        float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000);
+                                        int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
+                                        if (iIndex >= 0)
                                         {
-                                            HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
-                                            App.Current.Dispatcher.Invoke(() =>
+                                            if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
                                             {
-                                                MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
-                                                HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
-                                            });
+                                                HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
+                                                App.Current.Dispatcher.Invoke(() =>
+                                                {
+                                                    MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
+                                                    HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
+                                                });
+                                            }
                                         }
+                                        /*if (info)
+                                        {
+                                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送成功");
+                                        }
+                                        else
+                                        {
+                                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送失败");
+                                        }*/
+                                        if (i >= 1 && i <= 8)
+                                        {
+                                            string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+                                            MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                        }
+                                        else if (i >= 9 && i <= 15)
+                                        {
+                                            string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+                                            MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                        }
+                                        GVL_SmallStation.GetInstance.DosingTray1 = false;
+                                        GVL_SmallStation.GetInstance.DosingTray1Loc = 0;
                                     }
-                                    if (info)
-                                    {
-                                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送成功");
-                                    }
-                                    else
-                                    {
-                                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送失败");
-                                    }
-                                    if (i >= 1 && i <= 8)
-                                    {
-                                        string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
-                                        MessageNotify.GetInstance.ShowRunLog(commInfo);
-                                    }
-                                    else if (i >= 9 && i <= 15)
-                                    {
-                                        string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
-                                        MessageNotify.GetInstance.ShowRunLog(commInfo1);
-                                    }
-                                    GVL_SmallStation.GetInstance.DosingTray1 = false;
-                                    GVL_SmallStation.GetInstance.DosingTray1Loc = 0;
                                 }
                             }
                             if ((RTrig.GetInstance("配方配料完成").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1"))))
@@ -1052,6 +1071,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     {
                         if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 0)
                         {
+                            StockBinInit();
                             MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，初始化");
                             foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
                             {
@@ -1307,7 +1327,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     else
                                     {
                                         MessageNotify.GetInstance.ShowRunLog($"原料：{recipe.Material[i].Material_Name}，不在配料表");
-                                        //MessageNotify.GetInstance.AlarmLog("配方名称与本地不符合");
                                     }
                                 }
                                 else
@@ -1386,7 +1405,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             {
                 Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
                 GVL_SmallStation.SiemensSendRecipeStatus = 0;
-
                 MessageNotify.GetInstance.ShowRunLog("系统流程复位，等待西门子重新下发订单");
             }), "BPASystemReset", true);
             //手动控制系统模式
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs
index bf29ce35..ad7a8237 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs
@@ -16,5 +16,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         public ConnectParMode deviceConnectPar { get { return _mdeviceConnectPar; } set { _mdeviceConnectPar = value; OnPropertyChanged(); } }
         private ConnectParMode _mdeviceConnectPar = new ConnectParMode();
         public ObservableCollection<RawMaterialStockBin> rawMaterialStockBin { get; set; } = new ObservableCollection<RawMaterialStockBin>();
+        public ObservableCollection<WindSendRawMaterial> windSendRawMaterial { get; set; } = new ObservableCollection<WindSendRawMaterial>();
+
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs
index 6784595a..8878fd96 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs
@@ -12,6 +12,12 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         public int DeviceIp { get { return _mIp; } set { _mIp = value; }}
         private int _mIp;
 
+        public int Location { get { return _mLocation; } set { _mLocation = value; OnPropertyChanged(); } }
+        private int _mLocation;
+
+        public string RawMaterialChineseName { get { return _mRawMaterialChineseName; } set { _mRawMaterialChineseName = value; OnPropertyChanged(); } }
+        private string _mRawMaterialChineseName;
+
         public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } }
         private string _mRawMaterialName;
         /// <summary>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml b/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml
index 7dbfa17d..4937284d 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml
@@ -7,6 +7,7 @@
     xmlns:local="clr-namespace:BPASmartClient.JXJFoodSmallStation.View"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
     d:DesignHeight="1080"
     d:DesignWidth="1920"
     mc:Ignorable="d">
@@ -15,286 +16,111 @@
         <vm:WindSendParViewModel />
     </UserControl.DataContext>
 
-    <UserControl.Resources>
-        <SolidColorBrush x:Key="tabColor" Color="#FF2AB2E7" />
-        <!--<SolidColorBrush x:Key="bordColor" Color="#33ffffff" />-->
-        <SolidColorBrush x:Key="bordColor" Color="#332AB2E7" />
-        <con:DataTableRedundantConverter x:Key="tabConvert" />
-
-        <Style x:Key="RowRadioButtonStyle" TargetType="{x:Type RadioButton}">
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type RadioButton}">
-                        <Border
-                            x:Name="NvaBor"
-                            Background="Transparent"
-                            BorderBrush="#FF2AB2E7"
-                            BorderThickness="0">
-                            <ContentControl
-                                Margin="10,4"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                HorizontalContentAlignment="Center"
-                                VerticalContentAlignment="Center"
-                                Content="{TemplateBinding Content}"
-                                FontSize="16" />
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsChecked" Value="True">
-                                <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
-                                <Setter TargetName="NvaBor" Property="BorderThickness" Value="0" />
-                            </Trigger>
-                            <MultiTrigger>
-                                <MultiTrigger.Conditions>
-                                    <Condition Property="IsChecked" Value="false" />
-                                    <Condition Property="IsMouseOver" Value="True" />
-                                </MultiTrigger.Conditions>
-                                <MultiTrigger.Setters>
-                                    <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
-                                </MultiTrigger.Setters>
-                            </MultiTrigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <Style x:Key="InputTextboxStyle" TargetType="TextBox">
-            <Setter Property="Margin" Value="5,0,0,0" />
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="Width" Value="150" />
-            <Setter Property="Height" Value="40" />
-            <Setter Property="CaretBrush" Value="{StaticResource TitleBorderColor}" />
-            <Setter Property="Foreground" Value="{StaticResource TitleBorderColor}" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="FontSize" Value="14" />
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-
-        <Style x:Key="ControlButtonStyle" TargetType="Button">
-            <Setter Property="Margin" Value="0" />
-            <Setter Property="FontSize" Value="18" />
-            <Setter Property="Foreground" Value="#FFF53F62" />
-            <Setter Property="FontWeight" Value="SemiBold" />
-            <Setter Property="FontFamily" Value="楷体" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border
-                            Name="TitleBarBr"
-                            BorderBrush="#00c2f4"
-                            BorderThickness="0"
-                            CornerRadius="0"
-                            Opacity="0.8">
-
-                            <ContentPresenter
-                                Margin="{TemplateBinding Margin}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-                            <Border.Background>
-                                <ImageBrush
-                                    ImageSource="/BPASmartClient.CustomResource;component/Image/组合边框1.1.png"
-                                    Opacity="0.8"
-                                    Stretch="Fill" />
-                            </Border.Background>
-
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="true">
-                                <Setter TargetName="TitleBarBr" Property="Opacity" Value="1" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <Style x:Key="TitleTextblockStyle" TargetType="TextBlock">
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="HorizontalAlignment" Value="Center" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-            <Setter Property="Foreground" Value="{StaticResource tabColor}" />
-            <Setter Property="FontFamily" Value="楷体" />
-            <Setter Property="FontWeight" Value="SemiBold" />
-        </Style>
-
-    </UserControl.Resources>
-
     <Grid Margin="10">
         <Grid.RowDefinitions>
-            <RowDefinition Height="40" />
+            <RowDefinition Height="60" />
             <RowDefinition Height="40" />
             <RowDefinition />
         </Grid.RowDefinitions>
-
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-            <Button
-                Width="150"
-                Height="40"
-                Margin="10,0,10,0"
-                Command="{Binding AddCommand}"
-                Content="添加原料参数"
-                FontSize="20"
-                Style="{StaticResource ImageButtonStyle}" />
-            <Button
-                Width="150"
-                Height="40"
-                Margin="10,0,10,0"
-                Command="{Binding SaveCommand}"
-                Content="保存参数"
-                FontSize="20"
-                Style="{StaticResource ImageButtonStyle}" />
-        </StackPanel>
-
         <!--#region 表格标题栏设置-->
+        <Grid>
+            <StackPanel HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
+                <!--<pry:IcoButton
+                    Margin="10"
+                    Command="{Binding UpdateRawMaterial}"
+                    Content="新增数据"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource IcoButtonStyle}" />-->
+                <pry:IcoButton
+                    Margin="10"
+                    Command="{Binding SaveRawMaterialPara}"
+                    Content="保存参数"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource IcoButtonStyle}" />
+            </StackPanel>
+
+        </Grid>
         <Grid
             Grid.Row="1"
             Margin="0,10,0,0"
             Background="#ff0C255F">
 
             <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition />
-                <ColumnDefinition />
-                <ColumnDefinition />
-                <ColumnDefinition />
-                <ColumnDefinition />
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
-
-
-            <TextBlock
-                Grid.Column="0"
-                Style="{StaticResource TitleTextblockStyle}"
-                Text="原料名称" />
-
-            <Grid Grid.Column="1">
-                <TextBlock Style="{StaticResource TitleTextblockStyle}" Text="料仓上限重量" />
-                <Border
-                    BorderBrush="{StaticResource bordColor}"
-                    BorderThickness="1,0,1,0"
-                    Cursor="SizeWE" />
+            <Grid Grid.Column="0">
+                <TextBlock  Text="序号" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"/>
+                <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
             </Grid>
+            <TextBlock  Grid.Column="1" FontSize="24" Text="料仓位置" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
 
-            <Grid Grid.Column="2">
-                <TextBlock Style="{StaticResource TitleTextblockStyle}" Text="料仓下限重量" />
-                <Border
-                    BorderBrush="{StaticResource bordColor}"
-                    BorderThickness="1,0,1,0"
-                    Cursor="SizeWE" />
-            </Grid>
-
-            <Grid Grid.Column="3">
-                <TextBlock Style="{StaticResource TitleTextblockStyle}" Text="上限重量报警阈值" />
-                <Border
-                    BorderBrush="{StaticResource bordColor}"
-                    BorderThickness="1,0,1,0"
-                    Cursor="SizeWE" />
-            </Grid>
-            <TextBlock
-                Grid.Column="4"
-                Style="{StaticResource TitleTextblockStyle}"
-                Text="下限重量报警阈值" />
-            
-            <Grid Grid.Column="5">
-                <TextBlock Style="{StaticResource TitleTextblockStyle}" Text="功能操作" />
-                <Border
-                    BorderBrush="{StaticResource bordColor}"
-                    BorderThickness="1,0,1,0"
-                    Cursor="SizeWE" />
-            </Grid>
-
-            <Border
-                Grid.ColumnSpan="10"
-                BorderBrush="{StaticResource bordColor}"
-                BorderThickness="1,0,1,0" />
+            <TextBlock  Grid.Column="2" FontSize="24" Text="原料编号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
 
+            <TextBlock  Grid.Column="3" FontSize="24" Text="原料名称" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
         </Grid>
-        <!--#endregion-->
-
         <Grid Grid.Row="2">
-            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
-                <ItemsControl ItemsSource="{Binding deviceParModels}">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"  >
+                <ItemsControl ItemsSource="{Binding WindSendRawMaterial}" Foreground="Aqua">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <Grid Name="gr" Height="30">
+                            <Grid Name="gr" >
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition />
                                     <ColumnDefinition />
                                     <ColumnDefinition />
                                     <ColumnDefinition />
-                                    <ColumnDefinition />
-                                    <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
-
-                                <TextBox
-                                    Grid.Column="0"
-                                    Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
-                                    Style="{StaticResource InputTextboxStyle}"
-                                    Text="{Binding MaterialName}" />
-                                
-                                <Grid Grid.Column="1">
-                                    <TextBox
-                                        Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
-                                        Style="{StaticResource InputTextboxStyle}"
-                                        Text="{Binding UpperLimitWeight}" />
+                                <Grid Grid.Column="0" Margin="5">
+                                    <TextBlock
+                                        FontSize="16"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding  Location}" />
                                     <Border
-                                        BorderBrush="{StaticResource bordColor}"
                                         BorderThickness="1,0,1,0"
                                         Cursor="SizeWE" />
+
                                 </Grid>
-                               
-                                <Grid Grid.Column="2">
-                                    <TextBox
-                                        Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
-                                        Style="{StaticResource InputTextboxStyle}"
-                                        Text="{Binding LowerLimitWeight}" />
+                                <Grid Grid.Column="1" Margin="5">
+                                    <TextBlock
+                                        Width="50"
+                                        FontSize="16"
+                                        TextAlignment="Center"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding  Location}" />
                                     <Border
-                                        BorderBrush="{StaticResource bordColor}"
                                         BorderThickness="1,0,1,0"
                                         Cursor="SizeWE" />
+
                                 </Grid>
-                                <Grid Grid.Column="3">
+                                <Grid Grid.Column="2" Margin="5">
                                     <TextBox
-                                        Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
-                                        Style="{StaticResource InputTextboxStyle}"
-                                        Text="{Binding UpperLimitWeightOffset}" />
+                                        Width="50"
+                                        FontSize="16"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center" 
+                                        Text="{Binding  RawMaterialName}" />
                                     <Border
-                                        BorderBrush="{StaticResource bordColor}"
                                         BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
+                                        Cursor="SizeWE"  />
                                 </Grid>
-
-                                <Grid Grid.Column="4">
+                                <Grid Grid.Column="3" Margin="5">
                                     <TextBox
-                                        Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
-                                        Style="{StaticResource InputTextboxStyle}"
-                                        Text="{Binding LowerLimitWeightOffset}" />
-                                    <Border
-                                        BorderBrush="{StaticResource bordColor}"
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
-                                </Grid>
-                                <Grid Grid.Column="5">
-                                    <Button
-                                        Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                        CommandParameter="{Binding MaterialName}"
-                                        Content="删除"
+                                        Width="50"
                                         FontSize="16"
-                                        Style="{StaticResource ControlButtonStyle}" />
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center" 
+                                        Text="{Binding  RawMaterialChineseName}" />
                                     <Border
-                                        BorderBrush="{StaticResource bordColor}"
                                         BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
+                                        Cursor="SizeWE"  />
                                 </Grid>
-
-                                <Border
-                                    Grid.ColumnSpan="10"
-                                    BorderBrush="{StaticResource bordColor}"
-                                    BorderThickness="1,0,1,1" />
-
                             </Grid>
                             <DataTemplate.Triggers>
                                 <Trigger Property="IsMouseOver" Value="true">
@@ -306,7 +132,5 @@
                 </ItemsControl>
             </ScrollViewer>
         </Grid>
-
-
     </Grid>
 </UserControl>
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs
index c2b6a6d2..c9e38fd0 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs
@@ -19,50 +19,24 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
     {
         public WindSendParViewModel()
         {
-            deviceParModels = Json<WindSendDevicePar>.Data.WindSendPar;
-            RemoveCommand = new RelayCommand<object>((o) =>
+            if (WindSendRawMaterial.Count == 0) 
             {
-                var res = deviceParModels.FirstOrDefault(p => p.MaterialName == o?.ToString());
-                if (res != null) deviceParModels.Remove(res);
-                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{o.ToString()}：原料删除成功!");
-            });
-            AddCommand = new RelayCommand(() => { deviceParModels.Add(new WindSendDeviceParMode()); });
-            SaveCommand = new RelayCommand(() =>
-            {
-                if (deviceParModels == null || deviceParModels.Count <= 0)
-                {
-                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "警告", $"没有可保存的参数!");
-                    return;
-                }
-
-                for (int i = 0; i < deviceParModels.Count; i++)
+                WindSendRawMaterial.Clear();
+                for (int i = 0; i < 5; i++)
                 {
-                    if (deviceParModels.Where(p => p.MaterialName == deviceParModels.ElementAt(i).MaterialName)?.ToList()?.Count >= 2)
-                        deviceParModels.ElementAt(i).IsRedundant = true;
-                    else
-                        deviceParModels.ElementAt(i).IsRedundant = false;
+                    WindSendRawMaterial.Add(new WindSendRawMaterial()
+                    {
+                        Location = i + 1,
+                    });
                 }
-
-                if (deviceParModels.FirstOrDefault(p => p.IsRedundant == true) != null)
-                {
-                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"原料名称冲突，请检查后重试!");
-                    return;
-                }
-
-                deviceParModels.Where(P => P.MaterialName.Length <= 0)?.ToList()?.ForEach(item =>
-                {
-                    Json<WindSendDevicePar>.Data.WindSendPar.Remove(item);
-                });
-                Json<WindSendDevicePar>.Save();
-                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"原料参数保存成功!");
+            }
+            SaveCommand = new RelayCommand(() =>
+            {
+                Json<DevicePar>.Save();
             });
         }
 
-        public ObservableCollection<WindSendDeviceParMode> deviceParModels { get; set; }
-
-        public RelayCommand<object> RemoveCommand { get; set; }
-
-        public RelayCommand AddCommand { get; set; }
+        public ObservableCollection<WindSendRawMaterial> WindSendRawMaterial => Json<DevicePar>.Data.windSendRawMaterial;
         public RelayCommand SaveCommand { get; set; }
 
     }

From 3bdfc7ff5b0a0f3d5374643b245ad79757c745e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Thu, 30 Mar 2023 11:23:59 +0800
Subject: [PATCH 14/96] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BPASmart.ConfigurationSoftware.csproj     |  2 +-
 BPASmart.PageLoad/BPASmart.PageLoad.csproj    |  2 +-
 BPASmart.Server/BPASmart.Server.csproj        |  2 +-
 .../BPASmart.VariableManager.csproj           |  2 +-
 .../BPASmartClient.Business.csproj            |  2 +-
 .../BPASmartClient.CustomResource.csproj      |  2 +-
 .../Pages/Model/MessageNotify.cs              | 62 ++++++++------
 .../BPASmartClient.DosingSystemSingle.csproj  |  2 +-
 .../BPASmartClient.SmallBatchingSystem.csproj |  2 +-
 BPASmartClient.Update/App.xaml                |  8 ++
 BPASmartClient.Update/App.xaml.cs             | 17 ++++
 BPASmartClient.Update/AssemblyInfo.cs         | 10 +++
 .../BPASmartClient.Update.csproj              | 14 +++
 BPASmartClient.Update/MainViewsModel.cs       | 21 +++++
 BPASmartClient.Update/MainWindow.xaml         | 68 +++++++++++++++
 BPASmartClient.Update/MainWindow.xaml.cs      | 85 +++++++++++++++++++
 BPASmartClient.Update/Models/UpdateModel.cs   | 41 +++++++++
 BPASmartClient/App.config                     |  8 +-
 ComputerTestDemo/ComputerTestDemo.csproj      |  2 +-
 DosingSystem/App.xaml.cs                      | 27 +++++-
 .../BPASmartClient.DosingSystem.csproj        |  3 +-
 DosingSystem/Model/DeviceInquire.cs           | 17 ++--
 DosingSystem/View/DeviceMaterialParView.xaml  |  3 +-
 SmartClient.sln                               | 23 +++++
 24 files changed, 371 insertions(+), 54 deletions(-)
 create mode 100644 BPASmartClient.Update/App.xaml
 create mode 100644 BPASmartClient.Update/App.xaml.cs
 create mode 100644 BPASmartClient.Update/AssemblyInfo.cs
 create mode 100644 BPASmartClient.Update/BPASmartClient.Update.csproj
 create mode 100644 BPASmartClient.Update/MainViewsModel.cs
 create mode 100644 BPASmartClient.Update/MainWindow.xaml
 create mode 100644 BPASmartClient.Update/MainWindow.xaml.cs
 create mode 100644 BPASmartClient.Update/Models/UpdateModel.cs

diff --git a/BPASmart.ConfigurationSoftware/BPASmart.ConfigurationSoftware.csproj b/BPASmart.ConfigurationSoftware/BPASmart.ConfigurationSoftware.csproj
index 190af161..f442881c 100644
--- a/BPASmart.ConfigurationSoftware/BPASmart.ConfigurationSoftware.csproj
+++ b/BPASmart.ConfigurationSoftware/BPASmart.ConfigurationSoftware.csproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.28" />
+    <PackageReference Include="BPA.Helper" Version="1.0.54" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BPASmart.PageLoad/BPASmart.PageLoad.csproj b/BPASmart.PageLoad/BPASmart.PageLoad.csproj
index 729ab884..53196873 100644
--- a/BPASmart.PageLoad/BPASmart.PageLoad.csproj
+++ b/BPASmart.PageLoad/BPASmart.PageLoad.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.28" />
+    <PackageReference Include="BPA.Helper" Version="1.0.54" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BPASmart.Server/BPASmart.Server.csproj b/BPASmart.Server/BPASmart.Server.csproj
index ce7c3363..c47c5a34 100644
--- a/BPASmart.Server/BPASmart.Server.csproj
+++ b/BPASmart.Server/BPASmart.Server.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.Communication" Version="1.0.36" />
-    <PackageReference Include="BPA.Helper" Version="1.0.28" />
+    <PackageReference Include="BPA.Helper" Version="1.0.54" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.9" />
   </ItemGroup>
 
diff --git a/BPASmart.VariableManager/BPASmart.VariableManager.csproj b/BPASmart.VariableManager/BPASmart.VariableManager.csproj
index c633d45b..caac5a94 100644
--- a/BPASmart.VariableManager/BPASmart.VariableManager.csproj
+++ b/BPASmart.VariableManager/BPASmart.VariableManager.csproj
@@ -30,7 +30,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.Communication" Version="1.0.36" />
-    <PackageReference Include="BPA.Helper" Version="1.0.28" />
+    <PackageReference Include="BPA.Helper" Version="1.0.54" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BPASmartClient.Business/BPASmartClient.Business.csproj b/BPASmartClient.Business/BPASmartClient.Business.csproj
index 25dfbd1c..0d77ddd4 100644
--- a/BPASmartClient.Business/BPASmartClient.Business.csproj
+++ b/BPASmartClient.Business/BPASmartClient.Business.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.ApolloClient" Version="1.0.12" />
-    <PackageReference Include="BPA.Helper" Version="1.0.33" />
+    <PackageReference Include="BPA.Helper" Version="1.0.54" />
     <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
index 609d0a2a..86047719 100644
--- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
+++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
@@ -409,7 +409,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.28" />
+    <PackageReference Include="BPA.Helper" Version="1.0.54" />
     <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
diff --git a/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs b/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs
index f0688f09..4e15c59e 100644
--- a/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs
+++ b/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs
@@ -81,7 +81,7 @@ namespace BPASmartClient.CustomResource.Pages.Model
                 catch (Exception)
                 {
 
-                   // throw;
+                    // throw;
                 }
             }
         }
@@ -109,34 +109,40 @@ namespace BPASmartClient.CustomResource.Pages.Model
 
         public bool ShowDialog(string info, DialogType dialogType = DialogType.Information)
         {
-            PromptView PV = new PromptView();
-            PV.TextBlockInfo = info;
-            switch (dialogType)
+            bool result = false;
+            Application.Current.Dispatcher.Invoke(() =>
             {
-                case DialogType.Warning:
-                    PV.TextBlockIcon = "&#xe61f;";
-                    PV.TextBlockForeground = Brushes.Yellow;
-                    PV.infoType.Text = "警告：";
-                    //PV.Cancel.Visibility = Visibility.Collapsed;
-                    break;
-                case DialogType.Error:
-                    PV.TextBlockIcon = "&#xed1a;";
-                    PV.TextBlockForeground = Brushes.Red;
-                    PV.infoType.Text = "错误：";
-                    //PV.Cancel.Visibility = Visibility.Collapsed;
-                    break;
-                case DialogType.Information:
-                    PV.TextBlockIcon = "&#xe657;";
-                    PV.TextBlockForeground = Brushes.DeepSkyBlue;
-                    PV.infoType.Text = "提示：";
-                    //PV.Cancel.Visibility = Visibility.Visible;
-                    break;
-                default:
-                    break;
-            }
-            PV.infoType.Foreground = PV.TextBlockForeground;
-            var res = PV.ShowDialog();
-            return res == null ? false : (bool)res;
+                PromptView PV = new PromptView();
+                PV.TextBlockInfo = info;
+                switch (dialogType)
+                {
+                    case DialogType.Warning:
+                        PV.TextBlockIcon = "&#xe61f;";
+                        PV.TextBlockForeground = Brushes.Yellow;
+                        PV.infoType.Text = "警告：";
+                        //PV.Cancel.Visibility = Visibility.Collapsed;
+                        break;
+                    case DialogType.Error:
+                        PV.TextBlockIcon = "&#xed1a;";
+                        PV.TextBlockForeground = Brushes.Red;
+                        PV.infoType.Text = "错误：";
+                        //PV.Cancel.Visibility = Visibility.Collapsed;
+                        break;
+                    case DialogType.Information:
+                        PV.TextBlockIcon = "&#xe657;";
+                        PV.TextBlockForeground = Brushes.DeepSkyBlue;
+                        PV.infoType.Text = "提示：";
+                        //PV.Cancel.Visibility = Visibility.Visible;
+                        break;
+                    default:
+                        break;
+                }
+                PV.infoType.Foreground = PV.TextBlockForeground;
+
+                var res = PV.ShowDialog();
+                result = res == null ? false : (bool)res;
+            });
+            return result;
         }
     }
 
diff --git a/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj b/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj
index 46d83b78..472a4704 100644
--- a/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj
+++ b/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.33" />
+    <PackageReference Include="BPA.Helper" Version="1.0.54" />
     <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
diff --git a/BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj b/BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj
index 00d07de3..3a434956 100644
--- a/BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj
+++ b/BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj
@@ -22,7 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.Communication" Version="1.0.36" />
-    <PackageReference Include="BPA.Helper" Version="1.0.28" />
+    <PackageReference Include="BPA.Helper" Version="1.0.54" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
   </ItemGroup>
 
diff --git a/BPASmartClient.Update/App.xaml b/BPASmartClient.Update/App.xaml
new file mode 100644
index 00000000..ef55777f
--- /dev/null
+++ b/BPASmartClient.Update/App.xaml
@@ -0,0 +1,8 @@
+<Application
+    x:Class="BPASmartClient.Update.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:BPASmartClient.Update"
+    StartupUri="MainWindow.xaml">
+    <Application.Resources />
+</Application>
diff --git a/BPASmartClient.Update/App.xaml.cs b/BPASmartClient.Update/App.xaml.cs
new file mode 100644
index 00000000..d59b4ae7
--- /dev/null
+++ b/BPASmartClient.Update/App.xaml.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace BPASmartClient.Update
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}
diff --git a/BPASmartClient.Update/AssemblyInfo.cs b/BPASmartClient.Update/AssemblyInfo.cs
new file mode 100644
index 00000000..8b5504ec
--- /dev/null
+++ b/BPASmartClient.Update/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/BPASmartClient.Update/BPASmartClient.Update.csproj b/BPASmartClient.Update/BPASmartClient.Update.csproj
new file mode 100644
index 00000000..01761f98
--- /dev/null
+++ b/BPASmartClient.Update/BPASmartClient.Update.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BPA.Helper" Version="1.0.54" />
+  </ItemGroup>
+
+</Project>
diff --git a/BPASmartClient.Update/MainViewsModel.cs b/BPASmartClient.Update/MainViewsModel.cs
new file mode 100644
index 00000000..a4c464ce
--- /dev/null
+++ b/BPASmartClient.Update/MainViewsModel.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BPA.Helper;
+using BPASmartClient.Update.Model;
+
+namespace BPASmartClient.Update
+{
+    public class MainViewsModel : NotifyBase
+    {
+        public MainViewsModel()
+        {
+
+        }
+        public UpdateModel um { get { return _mum; } set { _mum = value; OnPropertyChanged(); } }
+        private UpdateModel _mum = new UpdateModel();
+
+    }
+}
diff --git a/BPASmartClient.Update/MainWindow.xaml b/BPASmartClient.Update/MainWindow.xaml
new file mode 100644
index 00000000..004b2e85
--- /dev/null
+++ b/BPASmartClient.Update/MainWindow.xaml
@@ -0,0 +1,68 @@
+<Window
+    x:Class="BPASmartClient.Update.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.Update"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="Update"
+    Width="600"
+    Height="400"
+    mc:Ignorable="d">
+
+    <Window.DataContext>
+        <local:MainViewsModel />
+    </Window.DataContext>
+
+    <Grid Margin="20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40" />
+            <RowDefinition Height="40" />
+            <RowDefinition />
+            <RowDefinition Height="80"/>
+            <RowDefinition Height="40" />
+        </Grid.RowDefinitions>
+
+        <TextBlock Grid.Row="0" Text="{Binding um.Version, StringFormat=当前软件版本号：\{0\}}" />
+        <TextBlock Grid.Row="1" Text="{Binding um.UpgradeVersion, StringFormat=更新软件版本号：\{0\}}" />
+        <TextBlock
+            Grid.Row="2"
+            Text="{Binding um.UpdateDescription}"
+            TextWrapping="Wrap" />
+
+        <Grid Name="grProgressbar" Margin="0 0 0 20"  Grid.Row="3">
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+            <TextBlock Name="tb" Text="当前更新进度：1/4" VerticalAlignment="Bottom"/>
+            <ProgressBar Name="progressbar" Grid.Row="1" Height="15" VerticalAlignment="Center" Minimum="0" Maximum="100" Value="10"/>
+        </Grid>
+
+        <Grid Grid.Row="4">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Button
+                Name="cancel"
+                Grid.Column="0"
+                Width="100"
+                Background="DeepSkyBlue"
+                Click="cancel_Click"
+                BorderThickness="0"
+                Content="取消更新"
+                Foreground="#272727" />
+            <Button
+                Name="ok"
+                Grid.Column="1"
+                Width="100"
+                Click="ok_Click"
+                Background="DeepSkyBlue"
+                BorderThickness="0"
+                Content="开始更新"
+                Foreground="#272727" />
+        </Grid>
+
+    </Grid>
+</Window>
diff --git a/BPASmartClient.Update/MainWindow.xaml.cs b/BPASmartClient.Update/MainWindow.xaml.cs
new file mode 100644
index 00000000..cece6f13
--- /dev/null
+++ b/BPASmartClient.Update/MainWindow.xaml.cs
@@ -0,0 +1,85 @@
+using BPA.Helper;
+using BPASmartClient.Update.Model;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.Update
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+            this.grProgressbar.Visibility = Visibility.Collapsed;
+        }
+
+        private void cancel_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
+        private async void ok_Click(object sender, RoutedEventArgs e)
+        {
+            this.cancel.Visibility = Visibility.Collapsed;
+            this.grProgressbar.Visibility = Visibility.Visible;
+            await Task.Run(() =>
+            {
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    this.progressbar.Value = 25;
+                    this.tb.Text = "当前更新进度：1/4";
+                });
+                Thread.Sleep(2000);
+
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    this.progressbar.Value = 50;
+                    this.tb.Text = "当前更新进度：2/4";
+                });
+                Thread.Sleep(1500);
+
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    this.progressbar.Value = 75;
+                    this.tb.Text = "当前更新进度：3/4";
+                });
+                Thread.Sleep(3000);
+
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    this.progressbar.Value = 100;
+                    this.tb.Text = "当前更新进度：4/4";
+                });
+                Thread.Sleep(1500);
+
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    this.progressbar.Value = 100;
+                    this.tb.Text = "当前更新进度：更新完成";
+                });
+                Thread.Sleep(1500);
+            });
+            string directory = AppDomain.CurrentDomain.BaseDirectory;
+            Process.Start($"{directory}BPASmartClient.DosingSystem.exe");
+            Json<UpdateModel>.Save();
+            this.Close();
+        }
+    }
+}
diff --git a/BPASmartClient.Update/Models/UpdateModel.cs b/BPASmartClient.Update/Models/UpdateModel.cs
new file mode 100644
index 00000000..a97ddfad
--- /dev/null
+++ b/BPASmartClient.Update/Models/UpdateModel.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BPA.Helper;
+
+namespace BPASmartClient.Update.Model
+{
+    public class UpdateModel : NotifyBase
+    {
+        /// <summary>
+        /// 软件名称
+        /// </summary>
+        public string Name { get { return _mName; } set { _mName = value; OnPropertyChanged(); } }
+        private string _mName = "味魔方管理系统软件[简称：味魔方] ";
+
+
+        /// <summary>
+        /// 软件当前版本号
+        /// </summary>
+        public string Version { get { return _mVersion; } set { _mVersion = value; OnPropertyChanged(); } }
+        private string _mVersion = "V1.0.1";
+
+
+        /// <summary>
+        /// 软件升级版本号
+        /// </summary>
+        public string UpgradeVersion { get { return _mUpgradeVersion; } set { _mUpgradeVersion = value; OnPropertyChanged(); } }
+        private string _mUpgradeVersion = "V1.0.2";
+
+
+        /// <summary>
+        /// 软件更新说明
+        /// </summary>
+        public string UpdateDescription { get { return _mUpdateDescription; } set { _mUpdateDescription = value; OnPropertyChanged(); } }
+        private string _mUpdateDescription = "下列 Bug 问题已修复：\n1、当在某些语言环境中保存文档后重新打开时，Canvas的缩放级别与文件保存时不同。\n2、删除样本数据后执行“另存为”时，有时无法使用串行打印机打印。\n3、如果显示放大率设置为100％以外的值，有时仅部分显示最小化、最大化和关闭按钮。\n4、其他小Bug。";
+
+
+    }
+}
diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index 9c45fe12..618157de 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -7,9 +7,9 @@
     <add key="IsEnableTest" value="false"/>
 
     <!--测试环境-->
-    <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
+    <add key="apollouri" value="http://10.2.1.21:28080/"/>
     <add key="AppId" value="test1_HostComputer"/>
-    <add key ="Namespaces" value="DEV.test1.Config"/>-->
+    <add key ="Namespaces" value="DEV.test1.Config"/>
 
     <!--开发环境-->
     <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
@@ -17,9 +17,9 @@
     <add key ="Namespaces" value="DEV.Config"/>-->
 
     <!--正式环境-->
-    <add key="apollouri" value="http://47.108.65.220:28080/"/>
+    <!--<add key="apollouri" value="http://47.108.65.220:28080/"/>
     <add key="appid" value="hostcomputer"/>
-    <add key ="namespaces" value="test1.config"/>
+    <add key ="namespaces" value="test1.config"/>-->
 
     <!--阿里云上报启动方式:API 或者 LOCAL-->
     <!--API  :通过客户端ID,调用接口查询“设备连接信息”-->
diff --git a/ComputerTestDemo/ComputerTestDemo.csproj b/ComputerTestDemo/ComputerTestDemo.csproj
index 0a23019a..392136ef 100644
--- a/ComputerTestDemo/ComputerTestDemo.csproj
+++ b/ComputerTestDemo/ComputerTestDemo.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.Communication" Version="1.0.36" />
-    <PackageReference Include="BPA.Helper" Version="1.0.28" />
+    <PackageReference Include="BPA.Helper" Version="1.0.54" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/DosingSystem/App.xaml.cs b/DosingSystem/App.xaml.cs
index 49e8932b..284a1be0 100644
--- a/DosingSystem/App.xaml.cs
+++ b/DosingSystem/App.xaml.cs
@@ -13,6 +13,10 @@ using BPASmartClient.CustomResource.Pages.View;
 using BPASmartClient.CustomResource.Pages.ViewModel;
 using BPASmartClient.DosingSystem.View;
 using BPA.Helper;
+using BPASmartClient.DosingSystem.Model;
+using System.Diagnostics;
+using System.IO;
+using BPASmartClient.Update.Model;
 
 namespace BPASmartClient.DosingSystem
 {
@@ -40,11 +44,32 @@ namespace BPASmartClient.DosingSystem
             DataInit();
             DeviceInquire.GetInstance.Init();//配料机设备上线监听，设备列表初始化
             MainView mv = new MainView();
-            mv.TitleName = "味魔方管理系统软件[简称：味魔方] 1.0.1";
+            mv.TitleName = $"味魔方管理系统软件[简称：味魔方] V1.0.1";
             LoginView lv = new LoginView();
             var res = lv.ShowDialog();
             if (res != null && res == true)
             {
+                #region 更新测试
+                //string directory = $"{AppDomain.CurrentDomain.BaseDirectory}AccessFile\\JSON\\UpdateModel.json";
+                //if (File.Exists(directory))
+                //    mv.TitleName = $"味魔方管理系统软件[简称：味魔方] {Json<UpdateModel>.Data.UpgradeVersion}";
+                //else
+                //{
+                //    mv.TitleName = $"味魔方管理系统软件[简称：味魔方] V1.0.1";
+                //    Task.Run(() =>
+                //    {
+                //        Thread.Sleep(3000);
+                //        var tt = MessageNotify.GetInstance.ShowDialog("检测到新版本，请问是否现在更新？", DialogType.Information);
+                //        if (tt)
+                //        {
+                //            string directory = AppDomain.CurrentDomain.BaseDirectory;
+                //            Process.Start($"{directory}BPASmartClient.Update.exe");
+                //            App.Current.Dispatcher.Invoke(() => { mv.Close(); });
+                //        }
+                //    });
+                //}
+                #endregion
+
                 BPASmartClient.CustomResource.Pages.Model.MessageNotify.GetInstance.ShowUserLog("用户登录");
                 mv.Show();
             }
diff --git a/DosingSystem/BPASmartClient.DosingSystem.csproj b/DosingSystem/BPASmartClient.DosingSystem.csproj
index 9616088a..897021d5 100644
--- a/DosingSystem/BPASmartClient.DosingSystem.csproj
+++ b/DosingSystem/BPASmartClient.DosingSystem.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.28" />
+    <PackageReference Include="BPA.Helper" Version="1.0.54" />
     <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
@@ -30,6 +30,7 @@
     <ProjectReference Include="..\BPASmartClient.CustomResource\BPASmartClient.CustomResource.csproj" />
     <ProjectReference Include="..\BPASmartClient.Modbus\BPASmartClient.Modbus.csproj" />
     <ProjectReference Include="..\BPASmartClient.S7Net\BPASmartClient.S7Net.csproj" />
+    <ProjectReference Include="..\BPASmartClient.Update\BPASmartClient.Update.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/DosingSystem/Model/DeviceInquire.cs b/DosingSystem/Model/DeviceInquire.cs
index d674e6c9..8b6902e7 100644
--- a/DosingSystem/Model/DeviceInquire.cs
+++ b/DosingSystem/Model/DeviceInquire.cs
@@ -87,14 +87,13 @@ namespace BPASmartClient.DosingSystem
         private void TestData()
         {
 
-            //aa(1, "盐");
-            //aa(2, "郫县豆瓣");
-            //aa(3, "芥菜");
-            //aa(4, "调味剂");
-            //aa(5, "香料");
-            //aa(6, "鸡精");
-            //aa(7, "味精");
-
+            aa(1, "盐");
+            aa(2, "郫县豆瓣");
+            aa(3, "芥菜");
+            aa(4, "调味剂");
+            aa(5, "香料");
+            aa(6, "鸡精");
+            aa(7, "味精");
             for (int i = 0; i < 8; i++)
             {
                 DeviceLists.TryAdd($"192.168.1.{i + 1}", new DeviceStatus() { DeviceName = $"测试设备{i + 1}" });
@@ -144,7 +143,7 @@ namespace BPASmartClient.DosingSystem
         {
             if (!string.IsNullOrEmpty(Json<DevicePar>.Data.BaseParModel.NetworkSegAddress)) IPSegment = Json<DevicePar>.Data.BaseParModel.NetworkSegAddress;
             else Json<DevicePar>.Data.BaseParModel.NetworkSegAddress = IPSegment;
-            //TestData();
+            TestData();
             IpAddressLines();
             SiemensDevice.GetInstance.Connect(Json<DevicePar>.Data.BaseParModel.DeviceAddress);
             DeviceDataInit();
diff --git a/DosingSystem/View/DeviceMaterialParView.xaml b/DosingSystem/View/DeviceMaterialParView.xaml
index 0a20bd8d..0d8cdd3a 100644
--- a/DosingSystem/View/DeviceMaterialParView.xaml
+++ b/DosingSystem/View/DeviceMaterialParView.xaml
@@ -62,8 +62,7 @@
         <Style x:Key="InputTextboxStyle" TargetType="TextBox">
             <Setter Property="Margin" Value="5,0,0,0" />
             <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="Width" Value="150" />
+            <Setter Property="HorizontalContentAlignment" Value="Left" />
             <Setter Property="Height" Value="40" />
             <Setter Property="CaretBrush" Value="{StaticResource TitleBorderColor}" />
             <Setter Property="Foreground" Value="{StaticResource TitleBorderColor}" />
diff --git a/SmartClient.sln b/SmartClient.sln
index d42e1fe1..5122830f 100644
--- a/SmartClient.sln
+++ b/SmartClient.sln
@@ -212,6 +212,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.RobotGripper
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MilkTeaCube", "BPASmartClient.MilkTeaCube\BPASmartClient.MilkTeaCube.csproj", "{915F0718-B7AC-428D-ACD5-7DAACC28539F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.Update", "BPASmartClient.Update\BPASmartClient.Update.csproj", "{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1986,6 +1988,26 @@ Global
 		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Release|x64.Build.0 = Release|Any CPU
 		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Release|x86.ActiveCfg = Release|Any CPU
 		{915F0718-B7AC-428D-ACD5-7DAACC28539F}.Release|x86.Build.0 = Release|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Debug|ARM.Build.0 = Debug|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Debug|x64.Build.0 = Debug|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Debug|x86.Build.0 = Debug|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Release|ARM.ActiveCfg = Release|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Release|ARM.Build.0 = Release|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Release|ARM64.Build.0 = Release|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Release|x64.ActiveCfg = Release|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Release|x64.Build.0 = Release|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Release|x86.ActiveCfg = Release|Any CPU
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2084,6 +2106,7 @@ Global
 		{B38F72AE-3C15-4C4E-A47E-DB2B9B318F02} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}
 		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F} = {666CB1A9-562E-453A-A2C7-FD9D77CFDFDD}
 		{915F0718-B7AC-428D-ACD5-7DAACC28539F} = {666CB1A9-562E-453A-A2C7-FD9D77CFDFDD}
+		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC}

From 0a2c2465a2d75bbfa33c07c0dfb1701c88e2ef1d Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Sun, 9 Apr 2023 20:04:58 +0800
Subject: [PATCH 15/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Model/AlarmHelper.cs                |    1 -
 BPASmartClient.Device/BaseDevice.cs           |    2 +-
 BPASmartClient.Helper/ExpandMethod.cs         |  120 +
 BPASmartClient.Helper/ThreadManage.cs         |    1 -
 .../Model/GVL_BigStation.cs                   |   10 +
 .../Model/HK_PLC/DB_Write.cs                  |   19 +
 .../Model/ProcessControl.cs                   | 1133 +++++----
 .../Model/RawMaterial/RecipeData.cs           |    8 +
 .../Model/RecipeDosing.cs                     |   25 +
 .../View/HardwareStatusView.xaml              |   17 +-
 .../View/ManualFlowView.xaml                  |  111 +-
 .../View/RecipeReceiveView.xaml               |   14 +-
 .../View/RecipeSendDownView.xaml              |    9 +-
 .../View/RecipeSendDownView.xaml.cs           |   16 +-
 .../ViewModel/HardwareStatusViewModel.cs      |  107 +-
 .../ViewModel/ManualFlowViewModel.cs          |   64 +-
 .../ViewModel/RecipeReceiveViewModel.cs       |   24 +
 .../ViewModel/RecipeSendDownViewModel.cs      |    6 +-
 .../App.xaml.cs                               |   49 +-
 .../BPASmartClient.JXJFoodSmallStation.csproj |    7 +
 .../Model/Bom/BomMaterial.cs                  |   21 +
 .../Model/Bom/BomMaterialData.cs              |   16 +
 ...lcCommAttribute.cs => VarCommAttribute.cs} |    4 +-
 .../Model/GVL_SmallStation.cs                 |  221 +-
 .../Model/HK_PLC/HKDeviceStatus.cs            |   42 +-
 .../Model/HK_PLC/HKDeviceWrite.cs             |   23 +
 .../Model/HK_PLC/PlcReadAddressDB3.cs         |  156 +-
 .../Model/ProcessControl.cs                   | 2070 ++++++++++++-----
 .../Model/RawMaterial/DeviceInquire.cs        |    1 -
 .../Model/RawMaterial/DevicePar.cs            |    2 +
 .../Model/Siemens/SiemensDeviceStatus.cs      |   23 +-
 .../Model/WindSend/WindSendDeviceStatus.cs    |    7 +-
 .../Model/WindSend/WindSendRawMaterial.cs     |    4 +-
 .../View/BomOfMaterialView.xaml               |  250 ++
 .../View/BomOfMaterialView.xaml.cs            |   28 +
 .../View/ManualFlowView.xaml                  |   51 +-
 .../View/ManualFlowView.xaml.cs               |    5 +
 .../View/PlcVarMonitorView.xaml               |    7 +-
 .../View/ProcessMonitorView.xaml              |   90 +
 .../View/ProcessMonitorView.xaml.cs           |   28 +
 .../View/RecipeReceiveView.xaml               |    4 +-
 .../View/RobotView.xaml                       |    4 +-
 .../View/StockBinRawMaterialView.xaml         |   14 +-
 .../View/WindSendParView.xaml                 |    6 +-
 .../View/WindSendParView.xaml.cs              |    3 +-
 .../ViewModel/BomOfMaterialViewModel.cs       |   85 +
 .../ViewModel/HardwareStatusViewModel.cs      |    4 +-
 .../ViewModel/ManualControlViewModel.cs       |  216 +-
 .../ViewModel/ManualFlowViewModel.cs          |   41 +-
 .../ViewModel/ProcessMonitorViewModel.cs      |   23 +
 .../ViewModel/RobotViewModel.cs               |   24 +-
 .../ViewModel/SystemParViewModel.cs           |   17 +-
 .../ViewModel/WindSendParViewModel.cs         |    5 +-
 BPASmartClient.MorkS/Control_Morks.cs         |    9 +-
 BPASmartClient.MorkS/GVL_MORKS.cs             |    3 +
 BPASmartClient.MorkS/Model/MorksPar.cs        |    4 +
 BPASmartClient.MorkS/View/ParSet.xaml         |   27 +-
 .../ViewModel/ParSetViewModel.cs              |    4 +
 BPASmartClient/App.config                     |    8 +-
 .../ViewModel/RecipeControlViewModel.cs       |  536 ++---
 60 files changed, 3990 insertions(+), 1839 deletions(-)
 create mode 100644 BPASmartClient.JXJFoodBigStation/Model/RecipeDosing.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterial.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterialData.cs
 rename BPASmartClient.JXJFoodSmallStation/Model/GVL/{PlcCommAttribute.cs => VarCommAttribute.cs} (78%)
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceWrite.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml
 create mode 100644 BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml
 create mode 100644 BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/ViewModel/ProcessMonitorViewModel.cs

diff --git a/BPASmartClient.CustomResource/Pages/Model/AlarmHelper.cs b/BPASmartClient.CustomResource/Pages/Model/AlarmHelper.cs
index a1aa60c6..e504cf29 100644
--- a/BPASmartClient.CustomResource/Pages/Model/AlarmHelper.cs
+++ b/BPASmartClient.CustomResource/Pages/Model/AlarmHelper.cs
@@ -67,7 +67,6 @@ namespace BPASmartClient.CustomResource.Pages.Model
                 }
                 Thread.Sleep(100);
             }), $"{typeof(AlarmT).Name},报警通用模块监听");
-
         }
 
         /// <summary>
diff --git a/BPASmartClient.Device/BaseDevice.cs b/BPASmartClient.Device/BaseDevice.cs
index e5b10552..be2eea4b 100644
--- a/BPASmartClient.Device/BaseDevice.cs
+++ b/BPASmartClient.Device/BaseDevice.cs
@@ -284,7 +284,7 @@ namespace BPASmartClient.Device
                     foreach (var faces in res)
                     {
                         if (faces.Name == "IStatus")
-                        {
+                        {   
                             InterfaceStatus = item.GetValue(this) as IStatus;
                             GetMonitorData(InterfaceStatus);
                         }
diff --git a/BPASmartClient.Helper/ExpandMethod.cs b/BPASmartClient.Helper/ExpandMethod.cs
index e3df2666..050ca1c3 100644
--- a/BPASmartClient.Helper/ExpandMethod.cs
+++ b/BPASmartClient.Helper/ExpandMethod.cs
@@ -185,6 +185,126 @@ namespace BPASmartClient.Helper
 
             return false;
         }
+        public static string ToBinString(this object value)
+        {
+            int num = 0;
+            int num2 = 0;
+            int num3 = 0;
+            string text = "";
+            long num4 = 0L;
+            try
+            {
+                if (value.GetType().Name.IndexOf("[]") < 0)
+                {
+                    string a = value.GetType().Name;
+                    switch (a)
+                    {
+                        case "Byte":
+                            num3 = 7;
+                            num4 = (byte)value;
+                            break;
+                        case "UInt16":
+                            num3 = 15;
+                            num4 = (ushort)value;
+                            break;
+                        case "Int16":
+                            num3 = 15;
+                            num4 = (short)value;
+                            break;
+                        case "UInt32":
+                            num3 = 31;
+                            num4 = (uint)value;
+                            break;
+                        case "Int32":
+                            num3 = 31;
+                            num4 = (int)value;
+                            break;
+                        case "Int64":
+                            num3 = 63;
+                            num4 = (long)value;
+                            break;
+                        default:
+                            throw new Exception();
+                    }
+
+                    for (num = num3; num >= 0; num += -1)
+                    {
+                        if ((num + 1) % 4 == 0) text = text + " ";
+                        text = (((num4 & (long)Math.Pow(2.0, num)) <= 0) ? (text + "0") : (text + "1"));
+                    }
+                }
+                else
+                {
+                    switch (value.GetType().Name)
+                    {
+                        case "Byte[]":
+                            {
+                                num3 = 7;
+                                byte[] array4 = (byte[])value;
+                                for (num2 = 0; num2 <= array4.Length - 1; num2++)
+                                {
+                                    for (num = num3; num >= 0; num += -1)
+                                    {
+                                        text = (((array4[num2] & (byte)Math.Pow(2.0, num)) <= 0) ? (text + "0") : (text + "1"));
+                                    }
+                                }
+
+                                break;
+                            }
+                        case "Int16[]":
+                            {
+                                num3 = 15;
+                                short[] array2 = (short[])value;
+                                for (num2 = 0; num2 <= array2.Length - 1; num2++)
+                                {
+                                    for (num = num3; num >= 0; num += -1)
+                                    {
+                                        text = (((array2[num2] & (byte)Math.Pow(2.0, num)) <= 0) ? (text + "0") : (text + "1"));
+                                    }
+                                }
+
+                                break;
+                            }
+                        case "Int32[]":
+                            {
+                                num3 = 31;
+                                int[] array3 = (int[])value;
+                                for (num2 = 0; num2 <= array3.Length - 1; num2++)
+                                {
+                                    for (num = num3; num >= 0; num += -1)
+                                    {
+                                        text = (((array3[num2] & (byte)Math.Pow(2.0, num)) <= 0) ? (text + "0") : (text + "1"));
+                                    }
+                                }
+
+                                break;
+                            }
+                        case "Int64[]":
+                            {
+                                num3 = 63;
+                                byte[] array = (byte[])value;
+                                for (num2 = 0; num2 <= array.Length - 1; num2++)
+                                {
+                                    for (num = num3; num >= 0; num += -1)
+                                    {
+                                        text = (((array[num2] & (byte)Math.Pow(2.0, num)) <= 0) ? (text + "0") : (text + "1"));
+                                    }
+                                }
+
+                                break;
+                            }
+                        default:
+                            throw new Exception();
+                    }
+                }
+
+                return text;
+            }
+            catch
+            {
+                return "";
+            }
+        }
 
 
 
diff --git a/BPASmartClient.Helper/ThreadManage.cs b/BPASmartClient.Helper/ThreadManage.cs
index 25f0cd24..33d37d20 100644
--- a/BPASmartClient.Helper/ThreadManage.cs
+++ b/BPASmartClient.Helper/ThreadManage.cs
@@ -201,5 +201,4 @@ namespace BPASmartClient.Helper
             return false;
         }
     }
-
 }
diff --git a/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs b/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs
index 624df1bd..ff7f543e 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs
@@ -62,6 +62,16 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方
         /// </summary>
         public static int Recipe4DosingStatus { get; set; }
+
+
+        public static int[] RecipeDosingStatus { get; set; } = new int[4] { 0, 0, 0, 0 };
+        public static bool[] AllowIssueRecipe { get; set; } = new bool[4] { false, false, false, false };
+        public static bool[] ReceviceFinishRecipe { get; set; } = new bool[4] { false, false, false, false };
+        public static bool[] DosingFinishRecipe { get; set; } = new bool[4] { false, false, false, false };
+
+        public static bool[] IsTrayArrive { get; set; } = new bool[5] { false, false, false, false,false };
+        public static DateTime[] RecipeDosingTime { get; set; } = new DateTime[4] { DateTime.Now, DateTime.Now, DateTime.Now, DateTime.Now };
+
         /// <summary>
         /// 是否处于手动下发配方
         /// </summary>
diff --git a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/DB_Write.cs b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/DB_Write.cs
index 82c4d8dd..4d12381e 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/DB_Write.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/DB_Write.cs
@@ -58,6 +58,25 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
         /// </summary>
         public bool Tray5InPlace { get; set; }
         /// <summary>
+        /// 配方1配料完成
+        /// </summary>
+        public bool Recipe1DoisngFinish { get; set; }
+
+        /// <summary>
+        /// 配方2配料完成
+        /// </summary>
+        public bool Recipe2DoisngFinish { get; set; }
+
+        /// <summary>
+        /// 配方3配料完成
+        /// </summary>
+        public bool Recipe3DoisngFinish { get; set; }
+
+        /// <summary>
+        /// 配方4配料完成
+        /// </summary>
+        public bool Recipe4DoisngFinish { get; set; }
+        /// <summary>
         /// 配方编码
         /// </summary>
         public short RecipeCode { get; set; }
diff --git a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
index b5f1a742..738a4e2e 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
@@ -27,27 +27,27 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// <summary>
         /// 西门子配方数据
         /// </summary>
-        public ObservableCollection<RecipeData> SiemensRecipes = new ObservableCollection<RecipeData>();
+        public ObservableCollection<RecipeData> SiemensRecipes { get; set; } = new ObservableCollection<RecipeData>();
         /// <summary>
         /// 本地配方数据
         /// </summary>
-        public ObservableCollection<RecipeData> LocalRecipes = new ObservableCollection<RecipeData>();
+        public ObservableCollection<RecipeData> LocalRecipes { get; set; } = new ObservableCollection<RecipeData>();
         /// <summary>
         /// 配方等待执行
         /// </summary>
-        public ObservableCollection<RecipeData> RecipeWaitExecute = new ObservableCollection<RecipeData>();
+        public ObservableCollection<RecipeData> RecipeWaitExecute { get; set; } = new ObservableCollection<RecipeData>();   
         /// <summary>
         /// 配方正在执行
         /// </summary>
-        public ObservableCollection<RecipeData> RecipeExecuting = new ObservableCollection<RecipeData>();
+        public ObservableCollection<RecipeData> RecipeExecuting { get; set; } = new ObservableCollection<RecipeData>();
         /// <summary>
         /// 配方执行完成
         /// </summary>
-        public ObservableCollection<RecipeData> RecipeExecuteComple = new ObservableCollection<RecipeData>();
+        public ObservableCollection<RecipeData> RecipeExecuteComple { get; set; } = new ObservableCollection<RecipeData>();
         /// <summary>
         /// 原料的名称和料仓的位置对应
         /// </summary>
-        public ConcurrentDictionary<int, string> RawMaterialsNamePos = new ConcurrentDictionary<int, string>();
+        public ConcurrentDictionary<int, string> RawMaterialsNamePos { get; set; } = new ConcurrentDictionary<int, string>();
         /// <summary>
         /// 硬件料仓的原料信息
         /// </summary>
@@ -60,6 +60,9 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         public ConcurrentQueue<string> SiemensRecipeQueue2 = new ConcurrentQueue<string>();
         public ConcurrentQueue<string> SiemensRecipeQueue3 = new ConcurrentQueue<string>();
         public ConcurrentQueue<string> SiemensRecipeQueue4 = new ConcurrentQueue<string>();
+
+        public ConcurrentDictionary<int, ConcurrentQueue<string>> SiemensRecipeQueue = new ConcurrentDictionary<int, ConcurrentQueue<string>>();
+        public ObservableCollection<RecipeDosing> recipe = new ObservableCollection<RecipeDosing>();
         /// <summary>
         /// 本地配方队列
         /// </summary>
@@ -89,7 +92,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         for (int i = 0; i < GVL_BigStation.Max_DosingSotckBinNum; i++)
                         {
                             int index = RawMaterialsNamePos.Values.ToList().IndexOf(recipe.Material[i].Material_Name);
-                            if (index>=0)
+                            if (index >= 0)
                             {
                                 RawMaterials.Add(new RawMaterial()
                                 {
@@ -101,7 +104,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             }
                             else
                             {
-                                MessageNotify.GetInstance.ShowAlarmLog($"本地原料名称和西门子下发的原料名称无法对应，原料名称：{recipe.Material[i].Material_Name},");
+                                MessageNotify.GetInstance.ShowAlarmLog($"本地缺少原料{recipe.Material[i].Material_Name}，和西门子下发的原料名称无法对应,");
                             }
                         }
                         App.Current.Dispatcher.Invoke(() =>
@@ -118,11 +121,11 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                 }
             }), "SiemensSendRecipe", true);
-            //testRawMaterialNameData();//自定义料仓名称
             DeviceConnectInit();//设备连接初始化
             ThreadInit();//线程初始化
             VarResetInit();//变量初始化
         }
+        #region 本地配方--暂时不使用
         private void LocalRecipeRecevice()
         {
             if (LocalRecipes.Count > 0)
@@ -223,7 +226,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
                             }
                         }
-                        else 
+                        else
                         {
                             HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
@@ -249,7 +252,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         {
                             GVL_BigStation.BarrelWasherSign = false;
                         }
-                        GVL_BigStation.Recipe1DosingStatus = 3; 
+                        GVL_BigStation.Recipe1DosingStatus = 3;
                         switch (trayCode)
                         {
                             case 1:
@@ -331,7 +334,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             }
                         }
                         LocalRecipeQueue1.TryDequeue(out code);
-                        RecipeExecuteComple.Add(LocalRecipes.ElementAt(index));//将配方添加到完成列表
                         //App.Current.Dispatcher.Invoke(() => {
                         //    Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
                         //});
@@ -373,7 +375,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         default:
                             break;
                     }
-                    if (HKDevice.PlcRead.IsAllowIssueRecipe2 && GVL_BigStation.Recipe2DosingStatus == 0 &&Inplace)//配方2是否允许下发配发
+                    if (HKDevice.PlcRead.IsAllowIssueRecipe2 && GVL_BigStation.Recipe2DosingStatus == 0 && Inplace)//配方2是否允许下发配发
                     {
                         if (LocalRecipes.ElementAt(index).IsWashingBarrel)
                         {
@@ -497,10 +499,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             }
                         }
                         LocalRecipeQueue2.TryDequeue(out code);
-                        RecipeExecuteComple.Add(LocalRecipes.ElementAt(index));//将该配方添加到下
-                        //App.Current.Dispatcher.Invoke(() => {
-                        //    Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                        //});
                         LocalRecipes.RemoveAt(index);
                         GVL_BigStation.Recipe2DosingStatus = 0;
                     }
@@ -555,7 +553,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
                             }
                         }
-                        else 
+                        else
                         {
                             HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
@@ -664,10 +662,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         HKDevice.HK_PLC_S7.Write<bool>("DB98.DBX1.1", false);
                         LocalRecipeQueue3.TryDequeue(out code);
-                        RecipeExecuteComple.Add(LocalRecipes.ElementAt(index));//将该配方添加到下
-                        //App.Current.Dispatcher.Invoke(() => {
-                        //    Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                        //});
                         LocalRecipes.RemoveAt(index);
                         GVL_BigStation.Recipe3DosingStatus = 0;
                     }
@@ -722,7 +716,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
                             }
                         }
-                        else 
+                        else
                         {
                             HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
@@ -828,19 +822,16 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             {
                                 item.Laying_Off_Weight = HKDevice.PlcRead.StockBin14ActualWeight;
                             }
-                        }
+                        }      
                         HKDevice.HK_PLC_S7.Write<bool>("DB98.DBX1.3", false);
                         LocalRecipeQueue4.TryDequeue(out code);
-                        RecipeExecuteComple.Add(LocalRecipes.ElementAt(index));//将该配方添加到下
-                        //App.Current.Dispatcher.Invoke(() => {
-                        //    Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                        //});
                         LocalRecipes.RemoveAt(index);
                         GVL_BigStation.Recipe4DosingStatus = 0;
                     }
                 }
             }
         }
+        #endregion
         private void ReceviceData()
         {
             SiemensRecipes = Json<RemoteRecipe>.Data.Recipes;
@@ -848,151 +839,178 @@ namespace BPASmartClient.JXJFoodBigStation.Model
             {
                 foreach (var data in SiemensRecipes)
                 {
-                    if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1)
+                    if (data.RecipesSource == RecipeSource.远程)
                     {
-                        if (!(SiemensRecipeQueue1.Contains(data.RecipeCode)))
+                        if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1)
                         {
-                            if (SiemensDevice.DL_Status is DL_Status_DB status)
+                            if (!(SiemensRecipeQueue1.Contains(data.RecipeCode)))
                             {
-                                switch (GVL_BigStation.SiemensSendRecipeStatus) 
+                                if (SiemensDevice.DL_Status is DL_Status_DB status)
                                 {
-                                    case 3:
+                                    switch (GVL_BigStation.SiemensSendRecipeStatus)
+                                    {
+                                        case 3:
+                                            SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
+                                            SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方1，发送配方编号和请求配料标志给西门子");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 4;
+                                            break;
+                                        case 4:
+                                            if (SiemensDevice.DL_Status.Dosing_Start_ACK)
+                                            {
+                                                SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
+                                                SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
+                                                MessageNotify.GetInstance.ShowRunLog($"配方1，西门子确认开始配料");
+                                                GVL_BigStation.SiemensSendRecipeStatus = 5;
+                                            }
+                                            break;
+                                        case 5:
+                                            if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
+                                            {
+                                                SiemensRecipeQueue1.Enqueue(data.RecipeCode);
+                                                MessageNotify.GetInstance.ShowRunLog($"配方1，配方：{data.RecipeCode}，加入队列");
+                                                GVL_BigStation.SiemensSendRecipeStatus = 0;
+                                            }
+                                            break;
+                                        default:
+                                            break;
+                                    }
+                                }
+                            }
+                        }
+                        else if (SiemensRecipeQueue2.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe2)
+                        {
+                            if (!(SiemensRecipeQueue2.Contains(data.RecipeCode)))
+                            {
+                                if (SiemensDevice.DL_Status is DL_Status_DB status)
+                                {
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 3)
+                                    {
                                         SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
                                         SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方1，发送配方编号和请求配料标志给西门子");
+                                        MessageNotify.GetInstance.ShowRunLog($"配方2，发送配方编号和请求配料标志给西门子");
                                         GVL_BigStation.SiemensSendRecipeStatus = 4;
-                                        break;
-                                    case 4:
+                                    }
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 4)
+                                    {
                                         if (SiemensDevice.DL_Status.Dosing_Start_ACK)
                                         {
                                             SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
                                             SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
-                                            MessageNotify.GetInstance.ShowRunLog($"配方1，西门子确认开始配料");
+                                            MessageNotify.GetInstance.ShowRunLog($"配方2，西门子确认开始配料");
                                             GVL_BigStation.SiemensSendRecipeStatus = 5;
                                         }
-                                        break;
-                                    case 5:
+                                    }
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 5)
+                                    {
                                         if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
                                         {
-                                            SiemensRecipeQueue1.Enqueue(data.RecipeCode);
-                                            MessageNotify.GetInstance.ShowRunLog($"配方1，配方：{data.RecipeCode}，加入队列");
+                                            SiemensRecipeQueue2.Enqueue(data.RecipeCode);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方2，配方：{data.RecipeCode}，加入队列");
                                             GVL_BigStation.SiemensSendRecipeStatus = 0;
                                         }
-                                        break;
-                                    default:
-                                        break;
+                                    }
                                 }
                             }
                         }
-                    }
-                    else if (SiemensRecipeQueue2.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe2)
-                    {
-                        if (!(SiemensRecipeQueue2.Contains(data.RecipeCode)))
+                        else if (SiemensRecipeQueue3.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe3)
                         {
-                            if (SiemensDevice.DL_Status is DL_Status_DB status)
+                            if (!(SiemensRecipeQueue3.Contains(data.RecipeCode)))
                             {
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 3)
+                                if (SiemensDevice.DL_Status is DL_Status_DB status)
                                 {
-                                    SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
-                                    SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
-                                    MessageNotify.GetInstance.ShowRunLog($"配方2，发送配方编号和请求配料标志给西门子");
-                                    GVL_BigStation.SiemensSendRecipeStatus = 4;
-                                }
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 4)
-                                {
-                                    if (SiemensDevice.DL_Status.Dosing_Start_ACK)
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 3)
+                                    {
+                                        SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
+                                        SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
+                                        MessageNotify.GetInstance.ShowRunLog($"配方3，发送配方编号和请求配料标志给西门子");
+                                        GVL_BigStation.SiemensSendRecipeStatus = 4;
+                                    }
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 4)
                                     {
-                                        SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
-                                        SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方2，西门子确认开始配料");
-                                        GVL_BigStation.SiemensSendRecipeStatus = 5;
+                                        if (SiemensDevice.DL_Status.Dosing_Start_ACK)
+                                        {
+                                            SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
+                                            SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方3，西门子确认开始配料");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 5;
+                                        }
                                     }
-                                }
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 5)
-                                {
-                                    if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 5)
                                     {
-                                        SiemensRecipeQueue2.Enqueue(data.RecipeCode);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方2，配方：{data.RecipeCode}，加入队列");
-                                        GVL_BigStation.SiemensSendRecipeStatus = 0;
+                                        if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
+                                        {
+                                            SiemensRecipeQueue3.Enqueue(data.RecipeCode);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方3，配方：{data.RecipeCode}，加入队列");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 0;
+                                        }
                                     }
                                 }
                             }
                         }
-                    }
-                    else if (SiemensRecipeQueue3.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe3)
-                    {
-                        if (!(SiemensRecipeQueue3.Contains(data.RecipeCode))) 
+                        else if (SiemensRecipeQueue4.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe4)
                         {
-                            if (SiemensDevice.DL_Status is DL_Status_DB status)
+                            if (!(SiemensRecipeQueue4.Contains(data.RecipeCode)))
                             {
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 3)
-                                {
-                                    SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
-                                    SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
-                                    MessageNotify.GetInstance.ShowRunLog($"配方3，发送配方编号和请求配料标志给西门子");
-                                    GVL_BigStation.SiemensSendRecipeStatus = 4;
-                                }
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 4)
+                                if (SiemensDevice.DL_Status is DL_Status_DB status)
                                 {
-                                    if (SiemensDevice.DL_Status.Dosing_Start_ACK)
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 3)
                                     {
-                                        SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
-                                        SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方3，西门子确认开始配料");
-                                        GVL_BigStation.SiemensSendRecipeStatus = 5;
+                                        SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
+                                        SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
+                                        MessageNotify.GetInstance.ShowRunLog($"配方4，发送配方编号和请求配料标志给西门子");
+                                        GVL_BigStation.SiemensSendRecipeStatus = 4;
                                     }
-                                }
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 5)
-                                {
-                                    if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 4)
+                                    {
+                                        if (SiemensDevice.DL_Status.Dosing_Start_ACK)
+                                        {
+                                            SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
+                                            SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方4，西门子确认开始配料");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 5;
+                                        }
+                                    }
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 5)
                                     {
-                                        SiemensRecipeQueue3.Enqueue(data.RecipeCode);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方3，配方：{data.RecipeCode}，加入队列");
-                                        GVL_BigStation.SiemensSendRecipeStatus = 0;
+                                        if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
+                                        {
+                                            SiemensRecipeQueue4.Enqueue(data.RecipeCode);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方4，配方：{data.RecipeCode}，加入队列");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 0;
+                                        }
                                     }
                                 }
                             }
                         }
                     }
-                    else if (SiemensRecipeQueue4.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe4)
+                    else 
                     {
-                        if (!(SiemensRecipeQueue4.Contains(data.RecipeCode))) 
+                        if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1) 
                         {
-                            if (SiemensDevice.DL_Status is DL_Status_DB status)
-                            {
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 3)
-                                {
-                                    SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
-                                    SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
-                                    MessageNotify.GetInstance.ShowRunLog($"配方4，发送配方编号和请求配料标志给西门子");
-                                    GVL_BigStation.SiemensSendRecipeStatus = 4;
-                                }
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 4)
-                                {
-                                    if (SiemensDevice.DL_Status.Dosing_Start_ACK)
-                                    {
-                                        SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
-                                        SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方4，西门子确认开始配料");
-                                        GVL_BigStation.SiemensSendRecipeStatus = 5;
-                                    }
-                                }
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 5)
-                                {
-                                    if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
-                                    {
-                                        SiemensRecipeQueue4.Enqueue(data.RecipeCode);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方4，配方：{data.RecipeCode}，加入队列");
-                                        GVL_BigStation.SiemensSendRecipeStatus = 0;
-                                    }
-                                }
-                            }
+                            SiemensRecipeQueue1.Enqueue(data.RecipeCode);
+                            MessageNotify.GetInstance.ShowRunLog($"配方1，配方：{data.RecipeCode}，加入队列");
+                        }
+                        else if (SiemensRecipeQueue2.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe2)
+                        {
+                            SiemensRecipeQueue2.Enqueue(data.RecipeCode);
+                            MessageNotify.GetInstance.ShowRunLog($"配方2，配方：{data.RecipeCode}，加入队列");
+                        }
+                        else if(SiemensRecipeQueue3.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe3)
+                        {
+                            SiemensRecipeQueue3.Enqueue(data.RecipeCode);
+                            MessageNotify.GetInstance.ShowRunLog($"配方3，配方：{data.RecipeCode}，加入队列");
+                        }
+                        else if (SiemensRecipeQueue4.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe4)
+                        {
+                            SiemensRecipeQueue4.Enqueue(data.RecipeCode);
+                            MessageNotify.GetInstance.ShowRunLog($"配方4，配方：{data.RecipeCode}，加入队列");
+
                         }
                     }
                 }
             }
-            else 
+            else
             {
                 SiemensRecipeQueue1.Clear();
                 SiemensRecipeQueue2.Clear();
@@ -1004,10 +1022,8 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                 GVL_BigStation.Recipe3DosingStatus = 0;
                 GVL_BigStation.Recipe4DosingStatus = 0;
             }
-
-           
         }
-        public void Order_Cancel() 
+        public void Order_Cancel()
         {
             if (GVL_BigStation.Order_Cancel) //订单取消
             {
@@ -1126,6 +1142,8 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 });
                                 SiemensRecipeQueue1.TryDequeue(out code);
                                 GVL_BigStation.Order_CancelStep = 0;
+                                GVL_BigStation.Order_Cancel = false;
+                                GVL_BigStation.Order_CancelRecipeCode = "";
                                 MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
                             }
                             break;
@@ -1158,6 +1176,8 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 });
                                 SiemensRecipeQueue2.TryDequeue(out code);
                                 GVL_BigStation.Order_CancelStep = 0;
+                                GVL_BigStation.Order_Cancel = false;
+                                GVL_BigStation.Order_CancelRecipeCode = "";
                                 MessageNotify.GetInstance.ShowRunLog($"队列2，西门子取消订单完成，订单号：{code}");
                             }
                             break;
@@ -1190,6 +1210,8 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 });
                                 SiemensRecipeQueue3.TryDequeue(out code);
                                 GVL_BigStation.Order_CancelStep = 0;
+                                GVL_BigStation.Order_Cancel = false;
+                                GVL_BigStation.Order_CancelRecipeCode = "";
                                 MessageNotify.GetInstance.ShowRunLog($"队列3，西门子取消订单完成，订单号：{code}");
                             }
                             break;
@@ -1222,6 +1244,8 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 });
                                 SiemensRecipeQueue4.TryDequeue(out code);
                                 GVL_BigStation.Order_CancelStep = 0;
+                                GVL_BigStation.Order_Cancel = false;
+                                GVL_BigStation.Order_CancelRecipeCode = "";
                                 MessageNotify.GetInstance.ShowRunLog($"队列4，西门子取消订单完成，订单号：{code}");
                             }
                             break;
@@ -1263,42 +1287,42 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.IsAllowIssueRecipe1 && GVL_BigStation.Recipe1DosingStatus == 0 && Inplace)//配方1是否允许下发配发
                     {
-                        
+
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             if (!GVL_BigStation.BarrelWasherSign)
                             {
                                 GVL_BigStation.BarrelWasherSign = true;
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
-                                
+                                MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+
                                 GVL_BigStation.DosingRecipe1Time = DateTime.Now;
                                 HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
                                 GVL_BigStation.Recipe1DosingStatus = 1;
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                                MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                             }
                         }
-                        else 
+                        else
                         {
                             GVL_BigStation.DosingRecipe1Time = DateTime.Now;
                             HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
                             GVL_BigStation.Recipe1DosingStatus = 1;
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                         }
-                       
+
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe1 && GVL_BigStation.Recipe1DosingStatus == 1)
                     {
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                            MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
                         }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", false);
                         StockBinParReset();
-                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
+                        MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
                         GVL_BigStation.Recipe1DosingStatus = 2;
                     }
                     if (GVL_BigStation.Recipe1DosingStatus == 2 && HKDevice.PlcRead.Recipe1DosingFinish)
@@ -1309,67 +1333,9 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         GVL_BigStation.Recipe1DosingFinish = true;
                         GVL_BigStation.Recipe1DosingStatus = 3;
-                        MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
-                        foreach (var item in SiemensRecipes.ElementAt(index).RawMaterial)
-                        {
-                            if (item.RawMaterialLocation == 1)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin1ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 2)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin2ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 3)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin3ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 4)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin4ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 5)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin5ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 6)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin6ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 7)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin7ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 8)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin8ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 9)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin9ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 10)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin10ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 11)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin11ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 12)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin12ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 13)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin13ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 14)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin14ActualWeight;
-                            }
-                        }
-                        if (SiemensDevice.IsConnected)
+                        MessageNotify.GetInstance.ShowRunLog($"配方1，配方状态：{code}配料完成");
+                        ReadStockBinDosingWeight(SiemensRecipes.ElementAt(index));
+                        if (SiemensDevice.IsConnected && !GVL_BigStation.IsUseLocalRecipe)
                         {
                             FinishData.Order_No = SiemensRecipes.ElementAt(index).RecipeCode;
                             FinishData.Product_Code = SiemensRecipes.ElementAt(index).RecipeName;
@@ -1383,30 +1349,27 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
                                 FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
                                 FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
+                                MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe1Time).TotalSeconds;
                             FinishData.ProcessTime = Convert.ToInt16(a);
                             SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
-                            MessageNotify.GetInstance.ShowRunLog($"配方配料完成，将信号反馈给西门子");
+                            MessageNotify.GetInstance.ShowRunLog($"配方1，{code}配方配料完成，将信号反馈给西门子");
                         }
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.4", true);
+                        GVL_BigStation.Recipe1DosingStatus = 3;
+                    }
+                    if (GVL_BigStation.Recipe1DosingStatus == 3 && HKDevice.PlcRead.Recipe1DosingFinish == false)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.4", false);
                         SiemensRecipeQueue1.TryDequeue(out code);
-                        RecipeExecuteComple.Add(SiemensRecipes.ElementAt(index));//将配方添加到完成列表
-                        if (!GVL_BigStation.IsUseLocalRecipe)
-                        {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
-                        else
+                        App.Current.Dispatcher.Invoke(() =>
                         {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
+                            Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
+                        });
                         GVL_BigStation.Recipe1DosingStatus = 0;
+                        MessageNotify.GetInstance.ShowRunLog($"配方1，{code}配方配料完成，复位plc配料完成信号");
                     }
                 }
             }
@@ -1438,7 +1401,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         default:
                             break;
                     }
-                    if (HKDevice.PlcRead.IsAllowIssueRecipe2 && GVL_BigStation.Recipe2DosingStatus == 0 && Inplace )//配方2是否允许下发配发
+                    if (HKDevice.PlcRead.IsAllowIssueRecipe2 && GVL_BigStation.Recipe2DosingStatus == 0 && Inplace)//配方2是否允许下发配发
                     {
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
@@ -1446,22 +1409,22 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             {
                                 GVL_BigStation.BarrelWasherSign = true;
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+                                MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
 
                                 GVL_BigStation.DosingRecipe2Time = DateTime.Now;
                                 HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", true);
                                 GVL_BigStation.Recipe2DosingStatus = 1;
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                                MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                             }
                         }
-                        else 
+                        else
                         {
                             GVL_BigStation.DosingRecipe2Time = DateTime.Now;
                             HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", true);
                             GVL_BigStation.Recipe2DosingStatus = 1;
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                         }
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe2 && GVL_BigStation.Recipe2DosingStatus == 1)
@@ -1469,12 +1432,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                            MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
                         }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", false);
                         StockBinParReset();
                         GVL_BigStation.Recipe2DosingStatus = 2;
-                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
+                        MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
                     }
                     if (GVL_BigStation.Recipe2DosingStatus == 2 && HKDevice.PlcRead.Recipe2DosingFinish)
                     {
@@ -1483,105 +1446,44 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             GVL_BigStation.BarrelWasherSign = false;
                         }
                         GVL_BigStation.Recipe2DosingFinish = true;
-                        GVL_BigStation.Recipe2DosingStatus = 3;
-                        MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
-                        foreach (var item in SiemensRecipes.ElementAt(index).RawMaterial)
+                        MessageNotify.GetInstance.ShowRunLog($"配方2，配方状态：{code}配料完成");
+                        ReadStockBinDosingWeight(SiemensRecipes.ElementAt(index));
+                        if (SiemensDevice.IsConnected && !GVL_BigStation.IsUseLocalRecipe)
                         {
-                            if (item.RawMaterialLocation == 1)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin1ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 2)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin2ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 3)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin3ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 4)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin4ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 5)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin5ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 6)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin6ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 7)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin7ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 8)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin8ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 9)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin9ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 10)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin10ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 11)
+                            FinishData.Order_No = SiemensRecipes.ElementAt(index).RecipeCode;
+                            FinishData.Product_Code = SiemensRecipes.ElementAt(index).RecipeName;
+                            FinishData.job_No = (short)SiemensRecipes.ElementAt(index).TrayCode;
+                            for (int i = 0; i < FinishData.Material.Length; i++)
                             {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin11ActualWeight;
+                                FinishData.Material[i] = new UDT1();
                             }
-                            else if (item.RawMaterialLocation == 12)
+                            for (int i = 0; i < SiemensRecipes.ElementAt(index).RawMaterial.Count; i++)
                             {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin12ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 13)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin13ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 14)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin14ActualWeight;
-                            }
-                        }
-                        if (SiemensDevice.IsConnected)
-                        {
-                            FinishData.Order_No = SiemensRecipes.ElementAt(index).RecipeCode;
-                            FinishData.Product_Code = SiemensRecipes.ElementAt(index).RecipeName;
-                            FinishData.job_No = (short)SiemensRecipes.ElementAt(index).TrayCode;
-                            for (int i = 0; i < FinishData.Material.Length; i++)
-                            {
-                                FinishData.Material[i] = new UDT1();
-                            }
-                            for (int i = 0; i < SiemensRecipes.ElementAt(index).RawMaterial.Count; i++)
-                            {
-                                FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
-                                FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
-                                FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
+                                FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
+                                FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
+                                FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
+                                MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe2Time).TotalSeconds;
                             FinishData.ProcessTime = Convert.ToInt16(a);
                             SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
-                            MessageNotify.GetInstance.ShowRunLog($"配方配料完成，将信号反馈给西门子");
+                            MessageNotify.GetInstance.ShowRunLog($"配方2，{code}配方配料完成，将信号反馈给西门子");
                         }
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.5", true);
+                        GVL_BigStation.Recipe2DosingStatus = 3;
+                    }
+                    if (GVL_BigStation.Recipe2DosingStatus == 3 && HKDevice.PlcRead.Recipe2DosingFinish == false)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.5", false);
                         SiemensRecipeQueue2.TryDequeue(out code);
                         RecipeExecuteComple.Add(SiemensRecipes.ElementAt(index));
-                        if (!GVL_BigStation.IsUseLocalRecipe)
-                        {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
-                        else
+                        App.Current.Dispatcher.Invoke(() =>
                         {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
+                            Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
+                        });
                         GVL_BigStation.Recipe2DosingStatus = 0;
+                        MessageNotify.GetInstance.ShowRunLog($"配方2，{code}配方配料完成，复位plc配料完成信号");
                     }
                 }
             }
@@ -1621,21 +1523,21 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             {
                                 GVL_BigStation.BarrelWasherSign = true;
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+                                MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
                                 GVL_BigStation.DosingRecipe3Time = DateTime.Now;
                                 HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
                                 GVL_BigStation.Recipe3DosingStatus = 1;
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                                MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                             }
                         }
-                        else 
+                        else
                         {
                             GVL_BigStation.DosingRecipe3Time = DateTime.Now;
                             HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
                             GVL_BigStation.Recipe3DosingStatus = 1;
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                         }
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe3 && GVL_BigStation.Recipe3DosingStatus == 1)
@@ -1643,12 +1545,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                            MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
                         }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", false);
                         StockBinParReset();
                         GVL_BigStation.Recipe3DosingStatus = 2;
-                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
+                        MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
                     }
                     if (HKDevice.PlcRead.Recipe3DosingFinish && GVL_BigStation.Recipe3DosingStatus == 2)
                     {
@@ -1658,67 +1560,9 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         GVL_BigStation.Recipe3DosingFinish = true;
                         GVL_BigStation.Recipe3DosingStatus = 3;
-                        MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
-                        foreach (var item in SiemensRecipes.ElementAt(index).RawMaterial)
-                            {
-                                if (item.RawMaterialLocation == 1)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin1ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 2)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin2ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 3)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin3ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 4)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin4ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 5)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin5ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 6)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin6ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 7)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin7ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 8)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin8ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 9)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin9ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 10)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin10ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 11)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin11ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 12)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin12ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 13)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin13ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 14)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin14ActualWeight;
-                                }
-                            }
-                        if (SiemensDevice.IsConnected)
+                        MessageNotify.GetInstance.ShowRunLog($"配方3，配方状态：{code}配料完成");
+                        ReadStockBinDosingWeight(SiemensRecipes.ElementAt(index));
+                        if (SiemensDevice.IsConnected && !GVL_BigStation.IsUseLocalRecipe)
                         {
                             FinishData.Order_No = SiemensRecipes.ElementAt(index).RecipeCode;
                             FinishData.Product_Code = SiemensRecipes.ElementAt(index).RecipeName;
@@ -1732,30 +1576,27 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
                                 FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
                                 FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
+                                MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe3Time).TotalSeconds;
                             FinishData.ProcessTime = Convert.ToInt16(a);
                             SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
-                            MessageNotify.GetInstance.ShowRunLog($"配方配料完成，将信号反馈给西门子");
+                            MessageNotify.GetInstance.ShowRunLog($"配方3，{code}配方配料完成，将信号反馈给西门子");
                         }
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.6", true);
+                        GVL_BigStation.Recipe3DosingStatus = 3;
+                    }
+                    if (GVL_BigStation.Recipe3DosingStatus == 3 && HKDevice.PlcRead.Recipe3DosingFinish == false)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.6", false);
                         SiemensRecipeQueue3.TryDequeue(out code);
-                        RecipeExecuteComple.Add(SiemensRecipes.ElementAt(index));//将该配方添加到下
-                        if (!GVL_BigStation.IsUseLocalRecipe)
-                        {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
-                        else
+                        App.Current.Dispatcher.Invoke(() =>
                         {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
+                            Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
+                        });
                         GVL_BigStation.Recipe3DosingStatus = 0;
+                        MessageNotify.GetInstance.ShowRunLog($"配方3，{code}配方配料完成，复位plc配料完成信号");
                     }
                 }
             }
@@ -1795,12 +1636,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             {
                                 GVL_BigStation.BarrelWasherSign = true;
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+                                MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
                                 GVL_BigStation.DosingRecipe4Time = DateTime.Now;
                                 HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
                                 GVL_BigStation.Recipe4DosingStatus = 1;
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                                MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                             }
                         }
                         else
@@ -1809,7 +1650,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
                             GVL_BigStation.Recipe4DosingStatus = 1;
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                         }
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe4 && GVL_BigStation.Recipe4DosingStatus == 1)
@@ -1817,12 +1658,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                            MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
                         }
                         GVL_BigStation.Recipe4DosingStatus = 2;
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", false);
                         StockBinParReset();
-                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
+                        MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
                     }
                     if (GVL_BigStation.Recipe4DosingStatus == 2 && HKDevice.PlcRead.Recipe4DosingFinish)
                     {
@@ -1832,67 +1673,9 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         GVL_BigStation.Recipe4DosingFinish = true;
                         GVL_BigStation.Recipe4DosingStatus = 3;
-                        MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
-                        foreach (var item in SiemensRecipes.ElementAt(index).RawMaterial)
-                        {
-                            if (item.RawMaterialLocation == 1)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin1ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 2)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin2ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 3)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin3ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 4)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin4ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 5)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin5ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 6)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin6ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 7)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin7ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 8)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin8ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 9)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin9ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 10)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin10ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 11)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin11ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 12)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin12ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 13)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin13ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 14)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin14ActualWeight;
-                            }
-                        }
-                        if (SiemensDevice.IsConnected)
+                        MessageNotify.GetInstance.ShowRunLog($"配方4，配方状态：{code}配料完成");
+                        ReadStockBinDosingWeight(SiemensRecipes.ElementAt(index));
+                        if (SiemensDevice.IsConnected && !GVL_BigStation.IsUseLocalRecipe)
                         {
                             FinishData.Order_No = SiemensRecipes.ElementAt(index).RecipeCode;
                             FinishData.Product_Code = SiemensRecipes.ElementAt(index).RecipeName;
@@ -1906,30 +1689,27 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
                                 FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
                                 FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
+                                MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe4Time).TotalSeconds;
                             FinishData.ProcessTime = Convert.ToInt16(a);
                             SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
-                            MessageNotify.GetInstance.ShowRunLog($"配方配料完成，将信号反馈给西门子");
+                            MessageNotify.GetInstance.ShowRunLog($"配方4，{code}配方配料完成，将信号反馈给西门子");
                         }
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.7", true);
+                        GVL_BigStation.Recipe4DosingStatus = 3;
+                    }
+                    if (GVL_BigStation.Recipe4DosingStatus == 3 && HKDevice.PlcRead.Recipe4DosingFinish == false)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.7", false);
                         SiemensRecipeQueue4.TryDequeue(out code);
-                        RecipeExecuteComple.Add(SiemensRecipes.ElementAt(index));//将该配方添加到下
-                        if (!GVL_BigStation.IsUseLocalRecipe)
-                        {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
-                        else
+                        App.Current.Dispatcher.Invoke(() =>
                         {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
+                            Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
+                        });
                         GVL_BigStation.Recipe4DosingStatus = 0;
+                        MessageNotify.GetInstance.ShowRunLog($"配方4，{code}配方配料完成，复位plc配料完成信号");
                     }
                 }
             }
@@ -1950,39 +1730,25 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         private void testRawMaterialNameData()
         {
             //RawMaterialsInfo = Json<RawMaterialData>.Data.RawMaterial;
-            //foreach (var material in RawMaterialsInfo)
-            //{
-            //    if (!string.IsNullOrEmpty(material.RawMaterialName))
-            //    {
-            //        if (!RawMaterialsNamePos.ContainsKey(material.RawMaterialName))
-            //        {
-            //            RawMaterialsNamePos.Add(material.RawMaterialName, (short)material.RawMaterialLocation);
-            //        }
-            //    }
-            //}
+            /*foreach (var material in RawMaterialsInfo)
+            {
+                if (!string.IsNullOrEmpty(material.RawMaterialName))
+                {
+                    if (!RawMaterialsNamePos.ContainsKey(material.RawMaterialName))
+                    {
+                        RawMaterialsNamePos.Add(material.RawMaterialName, (short)material.RawMaterialLocation);
+                    }
+                }
+            }*/
             if (RawMaterialsNamePos.Count == 14)
             {
-                for (int i = 0; i < typeof(StockBinName).GetProperties().Length; i++) 
+                for (int i = 0; i < typeof(StockBinName).GetProperties().Length; i++)
                 {
                     PropertyInfo pro = GVL_BigStation.stockBinName.GetType().GetProperty(typeof(StockBinName).GetProperties()[i].Name);
-                    RawMaterialsNamePos[i+1] = pro.GetValue(GVL_BigStation.stockBinName, null).ToString();
+                    RawMaterialsNamePos[i + 1] = pro.GetValue(GVL_BigStation.stockBinName, null).ToString();
                 }
-               /* RawMaterialsNamePos[1] = GVL_BigStation.stockBinName.RawMaterialName1;
-                RawMaterialsNamePos[2] = GVL_BigStation.stockBinName.RawMaterialName2;
-                RawMaterialsNamePos[3] = GVL_BigStation.stockBinName.RawMaterialName3;
-                RawMaterialsNamePos[4] = GVL_BigStation.stockBinName.RawMaterialName4;
-                RawMaterialsNamePos[5] = GVL_BigStation.stockBinName.RawMaterialName5;
-                RawMaterialsNamePos[6] = GVL_BigStation.stockBinName.RawMaterialName6;
-                RawMaterialsNamePos[7] = GVL_BigStation.stockBinName.RawMaterialName7;
-                RawMaterialsNamePos[8] = GVL_BigStation.stockBinName.RawMaterialName8;
-                RawMaterialsNamePos[9] = GVL_BigStation.stockBinName.RawMaterialName9;
-                RawMaterialsNamePos[10] = GVL_BigStation.stockBinName.RawMaterialName10;
-                RawMaterialsNamePos[11] = GVL_BigStation.stockBinName.RawMaterialName11;
-                RawMaterialsNamePos[12] = GVL_BigStation.stockBinName.RawMaterialName12;
-                RawMaterialsNamePos[13] = GVL_BigStation.stockBinName.RawMaterialName13;
-                RawMaterialsNamePos[14] = GVL_BigStation.stockBinName.RawMaterialName14;*/
             }
-            else 
+            else
             {
                 RawMaterialsNamePos.TryAdd(1, GVL_BigStation.stockBinName.RawMaterialName1);
                 RawMaterialsNamePos.TryAdd(2, GVL_BigStation.stockBinName.RawMaterialName2);
@@ -2018,13 +1784,15 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     HardWareRawMaterialInfo.ElementAt(index).RawMaterialName = item.Value;
                     HardWareRawMaterialInfo.ElementAt(index).RawMaterialChineseName = name;
                 }
-                else if (num == -1) 
+                else if (num == -1)
                 {
                     HardWareRawMaterialInfo.ElementAt(index).RawMaterialLocation = item.Key;
                     HardWareRawMaterialInfo.ElementAt(index).RawMaterialName = "";
                     HardWareRawMaterialInfo.ElementAt(index).RawMaterialChineseName = "";
                 }
             }
+            
+            RawMaterialsInfo = HardWareRawMaterialInfo;
         }
         /// <summary>
         /// MES的物料名称和物料编码对应
@@ -2095,7 +1863,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// <summary>
         /// 设备连接 西门子和海科PLC
         /// </summary>
-        public void DeviceConnectInit() 
+        public void DeviceConnectInit()
         {
             GVL_BigStation.IsAllowHKPlcConnect = ConfigurationManager.AppSettings["HKPlc_Connect"].ToLower() == "true" ? true : false;
             GVL_BigStation.IsAllowSiemensConnect = ConfigurationManager.AppSettings["Siemens_Connect"].ToLower() == "true" ? true : false;
@@ -2141,7 +1909,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
             }
         }
 
-        public void ThreadInit() 
+        public void ThreadInit()
         {
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
@@ -2238,16 +2006,16 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                 }
                 else
                 {
-                    if (GVL_BigStation.IsUseLocalRecipe)
+                    /*if (GVL_BigStation.IsUseLocalRecipe)
                     {
                         LocalRecipeRecevice();
                         LocalRecipeDosing();
                     }
                     else
-                    {
+                    {*/
                         ReceviceData();
                         RecipeInfoToHKPLC();
-                    }
+                   /* }*/
                 }
                 Thread.Sleep(10);
             }), "配方数据执行流程", true);
@@ -2255,7 +2023,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// <summary>
         /// 初始化变量复位
         /// </summary>
-        public void VarResetInit() 
+        public void VarResetInit()
         {
             LocalRecipeQueue1.Clear();
             LocalRecipeQueue2.Clear();
@@ -2266,5 +2034,364 @@ namespace BPASmartClient.JXJFoodBigStation.Model
             SiemensRecipeQueue3.Clear();
             SiemensRecipeQueue4.Clear();
         }
+        public void RecipeDosing()
+        {
+            GVL_BigStation.AllowIssueRecipe[0] = HKDevice.PlcRead.IsAllowIssueRecipe1;
+            GVL_BigStation.AllowIssueRecipe[1] = HKDevice.PlcRead.IsAllowIssueRecipe2;
+            GVL_BigStation.AllowIssueRecipe[2] = HKDevice.PlcRead.IsAllowIssueRecipe3;
+            GVL_BigStation.AllowIssueRecipe[3] = HKDevice.PlcRead.IsAllowIssueRecipe4;
+            GVL_BigStation.ReceviceFinishRecipe[0] = HKDevice.PlcRead.ReceiveFinishRecipe1;
+            GVL_BigStation.ReceviceFinishRecipe[1] = HKDevice.PlcRead.ReceiveFinishRecipe2;
+            GVL_BigStation.ReceviceFinishRecipe[2] = HKDevice.PlcRead.ReceiveFinishRecipe3;
+            GVL_BigStation.ReceviceFinishRecipe[3] = HKDevice.PlcRead.ReceiveFinishRecipe4;
+            GVL_BigStation.DosingFinishRecipe[0] = HKDevice.PlcRead.Recipe1DosingFinish;
+            GVL_BigStation.DosingFinishRecipe[1] = HKDevice.PlcRead.Recipe2DosingFinish;
+            GVL_BigStation.DosingFinishRecipe[2] = HKDevice.PlcRead.Recipe3DosingFinish;
+            GVL_BigStation.DosingFinishRecipe[3] = HKDevice.PlcRead.Recipe4DosingFinish;
+            GVL_BigStation.IsTrayArrive[0] = HKDevice.PlcRead.Tray1InPlace;
+            GVL_BigStation.IsTrayArrive[1] = HKDevice.PlcRead.Tray2InPlace;
+            GVL_BigStation.IsTrayArrive[2] = HKDevice.PlcRead.Tray3InPlace;
+            GVL_BigStation.IsTrayArrive[3] = HKDevice.PlcRead.Tray4InPlace;
+            GVL_BigStation.IsTrayArrive[4] = HKDevice.PlcRead.Tray5InPlace;
+            #region 接收配方
+            SiemensRecipes = Json<RemoteRecipe>.Data.Recipes;
+            if (SiemensRecipes.Count > 0)
+            {
+                foreach (var data in SiemensRecipes)
+                {
+                    foreach (var item in SiemensRecipeQueue)
+                    {
+                        if (item.Value.Count == 0 && item.Key == data.TrayCode && GVL_BigStation.AllowIssueRecipe[item.Key-1])
+                        {
+                            if (SiemensDevice.DL_Status is DL_Status_DB status)
+                            {
+                                switch (GVL_BigStation.SiemensSendRecipeStatus)
+                                {
+                                    case 3:
+                                        SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
+                                        SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
+                                        MessageNotify.GetInstance.ShowRunLog($"配方1，发送配方编号和请求配料标志给西门子");
+                                        GVL_BigStation.SiemensSendRecipeStatus = 4;
+                                        break;
+                                    case 4:
+                                        if (SiemensDevice.DL_Status.Dosing_Start_ACK)
+                                        {
+                                            SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
+                                            SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方1，西门子确认开始配料");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 5;
+                                        }
+                                        break;
+                                    case 5:
+                                        if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
+                                        {
+                                            item.Value.Enqueue(data.RecipeCode);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方1，配方：{data.RecipeCode}，加入队列");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 0;
+                                        }
+                                        break;
+                                    default:
+                                        break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                SiemensRecipeQueue.Clear();
+                GVL_BigStation.BarrelWasherSign = false;
+                for (int i = 0; i < GVL_BigStation.RecipeDosingStatus.Length; i++)
+                {
+                    GVL_BigStation.RecipeDosingStatus[i] = 0;
+                }
+            }
+            #endregion
+            #region 取消配方
+            if (GVL_BigStation.Order_Cancel) //订单取消
+            {
+                if (!string.IsNullOrEmpty(GVL_BigStation.Order_CancelRecipeCode))
+                {
+                    string code = GVL_BigStation.Order_CancelRecipeCode;
+                    int index = Array.FindIndex(Json<RemoteRecipe>.Data.Recipes.ToArray(), p => p.RecipeCode == GVL_BigStation.Order_CancelRecipeCode);
+                    short TrayCode = 0;
+                    if (index >= 0)
+                    {
+                        TrayCode = (short)Json<RemoteRecipe>.Data.Recipes.ElementAt(index).TrayCode;
+                    }
+                    switch (GVL_BigStation.Order_CancelStep)
+                    {
+                        case 0:
+                            if (index == -1)
+                            {
+                                GVL_BigStation.Order_CancelStep = 10;
+                            }
+                            else
+                            {
+                                GVL_BigStation.Order_CancelStep = 20;
+                                foreach (var item in SiemensRecipeQueue)
+                                {
+                                    if (item.Value.Contains(code)) 
+                                    {
+                                        GVL_BigStation.Order_CancelStep = 30;
+                                    }
+                                }
+                            }
+                            break;
+                        case 10:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
+                            GVL_BigStation.Order_CancelStep = 11;
+                            break;
+                        case 11:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                                GVL_BigStation.Order_CancelStep = 12;
+                            }
+                            break;
+                        case 12:
+                            MessageNotify.GetInstance.ShowRunLog($"西门子取消订单,但未找到订单:{GVL_BigStation.Order_CancelRecipeCode}");
+                            GVL_BigStation.Order_Cancel = false;
+                            GVL_BigStation.Order_CancelRecipeCode = "";
+                            GVL_BigStation.Order_CancelStep = 0;
+                            break;
+
+                        case 20:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
+                            GVL_BigStation.Order_CancelStep = 21;
+                            break;
+                        case 21:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                                GVL_BigStation.Order_CancelStep = 22;
+                            }
+                            break;
+                        case 22:
+                            GVL_BigStation.SiemensSendRecipeStatus = 0;
+                            App.Current.Dispatcher.Invoke(() =>
+                            {
+                                Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);
+                            });
+                            MessageNotify.GetInstance.ShowRunLog($"正在执行请求订单流程，配方还未到PLC，订单号：{GVL_BigStation.Order_CancelRecipeCode}");
+                            GVL_BigStation.Order_Cancel = false;
+                            GVL_BigStation.Order_CancelRecipeCode = "";
+                            GVL_BigStation.Order_CancelStep = 0;
+                            break;
+
+                        case 30:
+                            foreach (var item in SiemensRecipeQueue)
+                            {
+                                if (item.Value.Contains(code))
+                                {
+                                    if (GVL_BigStation.RecipeDosingStatus[item.Key-1] != 0)
+                                    {
+                                        HKDevice.HK_PLC_S7.Write("DB99.DBX230.0", true);
+                                        HKDevice.HK_PLC_S7.Write("DB99.DBW232", (short)TrayCode);
+                                        GVL_BigStation.RecipeDosingStatus[item.Key - 1] = 0;
+                                        item.Value.TryDequeue(out code);
+                                        GVL_BigStation.Order_CancelStep = 32;
+                                        MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
+                                    }
+                                    else
+                                    {
+                                        GVL_BigStation.Order_CancelStep = 32;
+                                        MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
+                                    }
+                                }
+                            }
+                            break;
+                        case 32:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
+                            GVL_BigStation.Order_CancelStep = 33;
+                            break;
+                        case 33:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                                App.Current.Dispatcher.Invoke(() =>
+                                {
+                                    Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);
+                                });
+                                GVL_BigStation.Order_CancelStep = 0;
+                                MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+            #endregion
+            #region 配料
+            foreach (var data in SiemensRecipeQueue)
+            {
+                int index = Array.FindIndex(SiemensRecipes.ToArray(), p => p.RecipeCode == data.Value.ElementAt(0));
+                if (index >= 0 && index < SiemensRecipes.Count)
+                {
+                    string code = SiemensRecipes.ElementAt(index).RecipeCode;
+                    int trayCode = SiemensRecipes.ElementAt(index).TrayCode;
+                    if (GVL_BigStation.RecipeDosingStatus[data.Key] == 0 && GVL_BigStation.AllowIssueRecipe[data.Key] && GVL_BigStation.IsTrayArrive[trayCode - 1])//配方4是否允许下发配发
+                    {
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            if (!GVL_BigStation.BarrelWasherSign)//其他配方在洗桶时，等待其他配方洗完，在发送数据
+                            {
+                                GVL_BigStation.BarrelWasherSign = true;
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+
+                                GVL_BigStation.RecipeDosingTime[data.Key] = DateTime.Now;
+                                HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                                HKDevice.HK_PLC_S7.Write($"DB99.DBX0.{2 + data.Key}", true);
+                                GVL_BigStation.RecipeDosingStatus[data.Key] = 1;
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            }
+                        }
+                        else
+                        {
+                            GVL_BigStation.RecipeDosingTime[data.Key] = DateTime.Now;
+                            HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                            HKDevice.HK_PLC_S7.Write($"DB99.DBX0.{2 + data.Key}", true);
+                            GVL_BigStation.RecipeDosingStatus[data.Key] = 1;
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                        }
+                    }
+                    if (GVL_BigStation.RecipeDosingStatus[data.Key] == 1 && GVL_BigStation.ReceviceFinishRecipe[data.Key])
+                    {
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                        }
+                        GVL_BigStation.RecipeDosingStatus[data.Key] = 2;
+                        HKDevice.HK_PLC_S7.Write($"DB99.DBX0.{2 + data.Key}", true);
+                        StockBinParReset();
+                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
+                    }
+                    if (GVL_BigStation.RecipeDosingStatus[data.Key] == 2 && GVL_BigStation.DosingFinishRecipe[data.Key])
+                    {
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            GVL_BigStation.BarrelWasherSign = false;
+                        }
+                        MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
+                        ReadStockBinDosingWeight(SiemensRecipes.ElementAt(index));
+                        if (SiemensDevice.IsConnected)
+                        {
+                            FinishData.Order_No = SiemensRecipes.ElementAt(index).RecipeCode;
+                            FinishData.Product_Code = SiemensRecipes.ElementAt(index).RecipeName;
+                            FinishData.job_No = (short)SiemensRecipes.ElementAt(index).TrayCode;
+                            for (int i = 0; i < FinishData.Material.Length; i++)
+                            {
+                                FinishData.Material[i] = new UDT1();
+                            }
+                            for (int i = 0; i < SiemensRecipes.ElementAt(index).RawMaterial.Count; i++)
+                            {
+                                FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
+                                FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
+                                FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
+                                MessageNotify.GetInstance.ShowRunLog($"配方{data.Key}，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
+                            }
+                            FinishData.Ask_For_Finish = true;
+                            double a = DateTime.Now.Subtract(GVL_BigStation.RecipeDosingTime[data.Key]).TotalSeconds;
+                            FinishData.ProcessTime = Convert.ToInt16(a);
+                            SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
+                            MessageNotify.GetInstance.ShowRunLog($"{code}配方配料完成，将信号反馈给西门子");
+                        }
+                        data.Value.TryDequeue(out code);
+                        if (!GVL_BigStation.IsUseLocalRecipe)
+                        {
+                            App.Current.Dispatcher.Invoke(() =>
+                            {
+                                Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
+                            });
+                        }
+                        else
+                        {
+                            App.Current.Dispatcher.Invoke(() =>
+                            {
+                                Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
+                            });
+                        }
+                        HKDevice.HK_PLC_S7.Write($"DB99.DBX1.{data.Key + 3}", true);
+                        GVL_BigStation.RecipeDosingStatus[data.Key] = 3;
+                    }
+                    if (GVL_BigStation.RecipeDosingStatus[data.Key] == 3 && GVL_BigStation.DosingFinishRecipe[data.Key] == false)
+                    {
+                        HKDevice.HK_PLC_S7.Write($"DB99.DBX1.{data.Key + 3}", false);
+                        GVL_BigStation.RecipeDosingStatus[data.Key] = 0;
+                    }
+                }
+            }
+            #endregion
+        }
+        /// <summary>
+        /// 读取配料完成时，每个料仓的配料重量
+        /// </summary>
+        /// <param name="recipes"></param>
+        public void ReadStockBinDosingWeight(RecipeData recipes)
+        {
+            foreach (var item in recipes.RawMaterial)
+            {
+                if (item.RawMaterialLocation == 1)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin1ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 2)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin2ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 3)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin3ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 4)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin4ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 5)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin5ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 6)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin6ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 7)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin7ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 8)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin8ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 9)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin9ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 10)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin10ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 11)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin11ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 12)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin12ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 13)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin13ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 14)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin14ActualWeight;
+                }
+            }
+        }
     }
 }
diff --git a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs
index dc05bc4f..9d1a21c9 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs
@@ -44,5 +44,13 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// 原料数据
         /// </summary>
         public ObservableCollection<RawMaterial> RawMaterial { get; set; } = new ObservableCollection<RawMaterial>();
+
+        public RecipeSource RecipesSource { get { return _mRecipesSource; } set { _mRecipesSource = value; OnPropertyChanged(); } }
+        private RecipeSource _mRecipesSource = RecipeSource.远程;
+    }
+    public enum RecipeSource 
+    {
+        本地,
+        远程
     }
 }
diff --git a/BPASmartClient.JXJFoodBigStation/Model/RecipeDosing.cs b/BPASmartClient.JXJFoodBigStation/Model/RecipeDosing.cs
new file mode 100644
index 00000000..d55082c1
--- /dev/null
+++ b/BPASmartClient.JXJFoodBigStation/Model/RecipeDosing.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodBigStation.Model
+{
+    public class RecipeDosing
+    {
+        public string RecipeCode { get; set; }
+        public int RecipeTray { get; set; }
+        public int DosingStatus { get; set; }
+
+
+        public bool IsAllowIssue { get; set; }
+        public bool IsAGVArrive { get; set; }
+        public bool IsReceviceFinish { get; set; }
+        public bool IsDosingFinish { get; set; }
+
+        public DateTime DosingStartTime { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.JXJFoodBigStation/View/HardwareStatusView.xaml b/BPASmartClient.JXJFoodBigStation/View/HardwareStatusView.xaml
index ae8c420d..e0d3a366 100644
--- a/BPASmartClient.JXJFoodBigStation/View/HardwareStatusView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/HardwareStatusView.xaml
@@ -374,7 +374,7 @@
                         <UniformGrid
                             HorizontalAlignment="Left"
                             VerticalAlignment="Top"
-                            Columns="6"
+                            Columns="7"
                             Rows="1" />
                     </ItemsPanelTemplate>
                 </ListView.ItemsPanel>
@@ -386,7 +386,7 @@
                                 <Grid.RowDefinitions>
                                     <RowDefinition />
                                     <RowDefinition />
-                                    <RowDefinition />
+                                    <!--<RowDefinition />-->
                                     <!--<RowDefinition Height="0.1*"/>-->
                                 </Grid.RowDefinitions>
                                 <!--<TextBox
@@ -465,7 +465,7 @@
                                         Text=" 号仓" />
                                 </StackPanel>
 
-                                <Button Grid.Row="2"
+                                <!--<Button Grid.Row="2"
                                     Width="200"
                                     Height="40"
                                     Margin="5,0,5,0"
@@ -474,7 +474,7 @@
                                     Content="修改原料名称"
                                     FontSize="20"
                                     Panel.ZIndex="0"
-                                    Style="{StaticResource ImageButtonStyle}"></Button>
+                                    Style="{StaticResource ImageButtonStyle}"></Button>-->
 
 
                                 <Image
@@ -536,7 +536,7 @@
                 Height="{Binding ElementName=gr, Path=ActualHeight}"
                 Margin="10,0,30,0"
                 ConveyorBeltWidth="70"
-                Direction="2"
+                Direction="0"
                 StrokeBrush="#00BEFA"
                 StrokeDashArray="1.5 1.5"
                 StrokeFillBrush="#00BEFA"
@@ -558,7 +558,7 @@
                         <UniformGrid
                             HorizontalAlignment="Left"
                             VerticalAlignment="Top"
-                            Columns="6"
+                            Columns="7"
                             Rows="1" />
                     </ItemsPanelTemplate>
                 </ListView.ItemsPanel>
@@ -568,7 +568,6 @@
                         <Border Margin="5" Background="Transparent">
                             <Grid Height="220">
                                 <Grid.RowDefinitions>
-                                    <RowDefinition/>
                                     <RowDefinition/>
                                     <RowDefinition/>
                                     <!--<RowDefinition  Height="0.1*"/>-->
@@ -637,7 +636,7 @@
                                         Foreground="#FF0084FF"
                                         Text=" 号仓" />
                                 </StackPanel>
-                                <Button Grid.Row="2"
+                                <!--<Button Grid.Row="2"
                                     Width="200"
                                     Height="40"
                                     Margin="5,0,5,0"
@@ -645,7 +644,7 @@
                                     CommandParameter="{Binding DeviceName}"
                                     Content="修改原料名称"
                                     FontSize="20"
-                                    Style="{StaticResource ImageButtonStyle}"></Button>
+                                    Style="{StaticResource ImageButtonStyle}"></Button>-->
                                 <Image
                                     Grid.RowSpan="2"
                                     Source="/BPASmartClient.CustomResource;component/Image/光柱.png"
diff --git a/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
index 084de0e0..3697d340 100644
--- a/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
@@ -13,6 +13,8 @@
     
     <Grid Margin="10">
         <Grid.RowDefinitions>
+            <RowDefinition Height="50" />
+            <RowDefinition Height="50" />
             <RowDefinition Height="100" />
             <RowDefinition Height="1*" />
         </Grid.RowDefinitions>
@@ -23,7 +25,8 @@
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
-                    Command="{Binding Tray1InPlace}"
+                    Command="{Binding TrayInPlace}"
+                    CommandParameter="1"
                     Content="AGV到达工位1"
                     FontSize="20"
                     Panel.ZIndex="0"
@@ -32,7 +35,8 @@
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
-                    Command="{Binding Tray2InPlace}"
+                    Command="{Binding TrayInPlace}"
+                    CommandParameter="2"
                     Content="AGV到达工位2"
                     FontSize="20"
                     Panel.ZIndex="0"
@@ -41,7 +45,8 @@
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
-                    Command="{Binding Tray3InPlace}"
+                    Command="{Binding TrayInPlace}"
+                    CommandParameter="3"
                     Content="AGV到达工位3"
                     FontSize="20"
                     Panel.ZIndex="0"
@@ -50,7 +55,8 @@
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
-                    Command="{Binding Tray4InPlace}"
+                    Command="{Binding TrayInPlace}"
+                    CommandParameter="4"
                     Content="AGV到达工位4"
                     FontSize="20"
                     Panel.ZIndex="0"
@@ -59,11 +65,71 @@
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
-                    Command="{Binding Tray5InPlace}"
+                    Command="{Binding TrayInPlace}"
+                    CommandParameter="5"
                     Content="AGV到达工位5"
                     FontSize="20"
                     Panel.ZIndex="0"
                     Style="{StaticResource ImageButtonStyle}"></Button>
+            </StackPanel>
+        </Grid>
+        <Grid Grid.Row="1">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center">
+                <Button
+                    Width="200"
+                    Height="40"
+                    Margin="5,0,5,0"
+                    Command="{Binding TrayLeave}"
+                    CommandParameter="1"
+                    Content="AGV离开工位1"
+                    FontSize="20"
+                    Panel.ZIndex="0"
+                    Style="{StaticResource ImageButtonStyle}"></Button>
+                <Button
+                    Width="200"
+                    Height="40"
+                    Margin="5,0,5,0"
+                    Command="{Binding TrayLeave}"
+                    CommandParameter="2"
+                    Content="AGV离开工位2"
+                    FontSize="20"
+                    Panel.ZIndex="0"
+                    Style="{StaticResource ImageButtonStyle}"></Button>
+                <Button
+                    Width="200"
+                    Height="40"
+                    Margin="5,0,5,0"
+                    Command="{Binding TrayLeave}"
+                    CommandParameter="3"
+                    Content="AGV离开工位3"
+                    FontSize="20"
+                    Panel.ZIndex="0"
+                    Style="{StaticResource ImageButtonStyle}"></Button>
+                <Button
+                    Width="200"
+                    Height="40"
+                    Margin="5,0,5,0"
+                    Command="{Binding TrayLeave}"
+                    CommandParameter="4"
+                    Content="AGV离开工位4"
+                    FontSize="20"
+                    Panel.ZIndex="0"
+                    Style="{StaticResource ImageButtonStyle}"></Button>
+                <Button
+                    Width="200"
+                    Height="40"
+                    Margin="5,0,5,0"
+                    Command="{Binding TrayLeave}"
+                    CommandParameter="5"
+                    Content="AGV离开工位5"
+                    FontSize="20"
+                    Panel.ZIndex="0"
+                    Style="{StaticResource ImageButtonStyle}"></Button>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Row="2">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center">
                 <Button
                     Width="200"
                     Height="40"
@@ -84,10 +150,11 @@
                     Style="{StaticResource ImageButtonStyle}"></Button>
             </StackPanel>
         </Grid>
-        <Grid Grid.Row="1">
+        <Grid Grid.Row="3">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition></ColumnDefinition>
                 <ColumnDefinition></ColumnDefinition>
+                <ColumnDefinition></ColumnDefinition>
             </Grid.ColumnDefinitions>
             <StackPanel>
                 <WrapPanel>
@@ -100,66 +167,66 @@
                     <Button Style="{StaticResource ImageButtonStyle}" Width="120" Height="40" FontSize="20" Content="取消订单" Margin="5" Command="{Binding CancelRecipeCommand}"></Button>
                 </WrapPanel>
             </StackPanel>
-            <StackPanel Grid.Column="1">
+            <StackPanel Grid.Column="3">
                 <WrapPanel>
                     <TextBlock Text="料仓名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBinName}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBinName}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓1名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin1Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin1Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓2名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin2Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin2Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓3名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin3Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin3Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓4名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin4Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin4Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓5名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin5Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin5Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓6名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin6Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin6Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓7名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin7Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin7Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓8名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin8Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin8Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓9名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin9Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin9Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓10名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin10Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin10Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓11名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin11Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin11Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓12名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin12Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin12Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓13名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin13Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin13Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓14名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin14Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin14Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
             </StackPanel>
         </Grid>
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
index 1c3603c8..3c220ef4 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
@@ -159,11 +159,23 @@
             <CheckBox
                 x:Name="IsUseLocalRecipe"
                 Margin="0,0,10,0"
-                Content="本地配方"
+                Content="使用本地配方配料"
                 FontFamily="楷体"
                 VerticalAlignment="Center"
                 Foreground="Aqua"
                 IsChecked="{Binding IsUseLocalRecipe}" />
+
+            <!--<pry:IcoButton 
+                Width="140"
+                Margin="10"
+                HorizontalAlignment="Left"
+                Command="{Binding RefreshRecipe}"
+                Content="刷新配方"
+                FontSize="16"
+                Foreground="Aqua"
+                IcoText="&#xe626;"
+                Style="{StaticResource IcoButtonStyle}" />-->
+            
             <pry:IcoButton 
                 Width="140"
                 Margin="10"
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
index fe52930c..5b5688dd 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
@@ -419,7 +419,6 @@
 
         <Grid.ColumnDefinitions>
             <ColumnDefinition />
-            <ColumnDefinition Width="0.25*" />
         </Grid.ColumnDefinitions>
 
         <Grid Name="ggr" Margin="10">
@@ -822,7 +821,7 @@
 
         </Grid>
 
-        <Grid
+        <!--<Grid
             Name="gr"
             Grid.Column="1"
             Margin="10">
@@ -924,11 +923,11 @@
                             </ItemsControl>
 
                         </Grid>
-                        <!--<TreeView x:Name="repiceListMaking"   ItemsSource="{Binding RecipeProcesse}"
+                        --><!--<TreeView x:Name="repiceListMaking"   ItemsSource="{Binding RecipeProcesse}"
                                   ScrollViewer.VerticalScrollBarVisibility="Disabled" HorizontalAlignment="Stretch" Background="Wheat"  ItemContainerStyle="{StaticResource recipeTreeItem}">
                         </TreeView>-->
 
-                        <!--  等待和已完成  -->
+                        <!--  等待和已完成  --><!--
 
                         <TreeView
                             x:Name="repiceList"
@@ -945,6 +944,6 @@
                     </Grid>
                 </Border>
             </ScrollViewer>
-        </Grid>
+        </Grid>-->
     </Grid>
 </UserControl>
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml.cs b/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml.cs
index a5099747..66464759 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml.cs
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml.cs
@@ -28,24 +28,24 @@ namespace BPASmartClient.JXJFoodBigStation.View
 
         private void RadioButtonCompelete_Click(object sender, RoutedEventArgs e)
         {
-            repiceList.ItemsSource = RecipeSendDownViewModel.UserTreeCompelete;
-            repiceList.Visibility = Visibility.Visible;
-            repiceListMaking.Visibility = Visibility.Hidden;
+            //repiceList.ItemsSource = RecipeSendDownViewModel.UserTreeCompelete;
+            //repiceList.Visibility = Visibility.Visible;
+            //repiceListMaking.Visibility = Visibility.Hidden;
 
 
         }
 
         private void RadioButtonWait_Click(object sender, RoutedEventArgs e)
         {
-            repiceList.ItemsSource = RecipeSendDownViewModel.UserTreeWait;
-            repiceList.Visibility = Visibility.Visible;
-            repiceListMaking.Visibility = Visibility.Hidden;
+            //repiceList.ItemsSource = RecipeSendDownViewModel.UserTreeWait;
+            //repiceList.Visibility = Visibility.Visible;
+            //repiceListMaking.Visibility = Visibility.Hidden;
         }
 
         private void RadioButtonMaking_Click(object sender, RoutedEventArgs e)
         {
-            repiceListMaking.Visibility = Visibility.Visible;
-            repiceList.Visibility = Visibility.Hidden;
+            //repiceListMaking.Visibility = Visibility.Visible;
+            //repiceList.Visibility = Visibility.Hidden;
 
         }
     }
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/HardwareStatusViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/HardwareStatusViewModel.cs
index 2118adfb..cd1e96f6 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/HardwareStatusViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/HardwareStatusViewModel.cs
@@ -12,6 +12,8 @@ using Microsoft.Toolkit.Mvvm.Input;
 using BPASmartClient.JXJFoodBigStation.Model;
 using BPASmartClient.JXJFoodBigStation.View;
 using System.Windows.Forms;
+using BPASmartClient.JXJFoodBigStation.Model.HK_PLC;
+using System.Reflection;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
@@ -19,101 +21,30 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
     {
         public HardwareStatusViewModel()
         {
-
-            for (int i = 6; i > 0; i--)
-            {
-                TopDeviceCurrentStatuses.Add(new DeviceCurrentStatus()
-                {
-                    DeviceName = i.ToString(),
-                    DeviceNum = i,
-                    RunStatus = true,
-                    Weight = new Random().Next(0, 100)
-                });
-            }
-            for (int i = 7; i < 13; i++)
+            foreach (PropertyInfo mi in typeof(StockBinName).GetProperties())
             {
-                BottomDeviceCurrentStatuses.Add(new DeviceCurrentStatus()
+                object ab = GVL_BigStation.stockBinName.GetType().GetProperty(mi.Name).GetValue(GVL_BigStation.stockBinName, null);
+                if (mi.Name=="RawMaterialName1" || mi.Name == "RawMaterialName2" || mi.Name == "RawMaterialName3" || mi.Name == "RawMaterialName4" || mi.Name == "RawMaterialName5" || mi.Name == "RawMaterialName6" || mi.Name == "RawMaterialName7")
                 {
-                    DeviceName = i.ToString(),
-                    DeviceNum = i,
-                    RunStatus = false,
-                    Weight = new Random().Next(0, 100)
-                });
-            }
-            StartCommand = new RelayCommand<string>((deviceName) => 
-            {
-                if (deviceName != null)
-                {
-                    var top = TopDeviceCurrentStatuses.FirstOrDefault(p => p.DeviceName == deviceName);
-                    if (top != null)
-                    {
-                        ActionManage.GetInstance.Send("StartTopDevice", deviceName);
-                    }
-                    var bottom = BottomDeviceCurrentStatuses.FirstOrDefault(p => p.DeviceName == deviceName);
-                    if (bottom != null)
+                    TopDeviceCurrentStatuses.Add(new DeviceCurrentStatus()
                     {
-                        ActionManage.GetInstance.Send("StartBottomDevice", deviceName);
-                    }
+                        DeviceName = ab.ToString(),
+                        DeviceNum = TopDeviceCurrentStatuses.Count + 1,
+                        RunStatus = true,
+                        Weight = new Random().Next(0, 100)
+                    });
                 }
-            });
-            StopCommand = new RelayCommand<string>((deviceName) => 
-            {
-                if (deviceName != null)
+                else
                 {
-                    var top = TopDeviceCurrentStatuses.FirstOrDefault(p => p.DeviceName == deviceName);
-                    if (top != null)
-                    {
-                        ActionManage.GetInstance.Send("StopTopDevice", deviceName);
-                    }
-                    var bottom = BottomDeviceCurrentStatuses.FirstOrDefault(p => p.DeviceName == deviceName);
-                    if (bottom != null)
+                    BottomDeviceCurrentStatuses.Add(new DeviceCurrentStatus()
                     {
-                        ActionManage.GetInstance.Send("StopBottomDevice", deviceName);
-                    }
+                        DeviceName = ab.ToString(),
+                        DeviceNum = BottomDeviceCurrentStatuses.Count + 8,
+                        RunStatus = false,
+                        Weight = new Random().Next(0, 100)
+                    });
                 }
-            });
-
-            UpdateRawMaterName = new RelayCommand<string>((deviceName) =>
-            {
-                ActionManage.GetInstance.CancelRegister("UpdateDeviceName");
-                ActionManage.GetInstance.Register(new Action<object>((res) =>
-                {
-                    if (res != null && res is string newName)
-                    {
-                        int cnt = Array.FindIndex(TopDeviceCurrentStatuses.ToArray(), p => p.DeviceName == deviceName);
-                        if (cnt >= 0)
-                        {
-                            int index = Array.FindIndex(BottomDeviceCurrentStatuses.ToArray(), p => p.DeviceName == newName);
-                            int index1 = Array.FindIndex(TopDeviceCurrentStatuses.ToArray(), p => p.DeviceName == newName);
-                            if (index == -1 && index1 == -1)
-                            {
-                                var obj = TopDeviceCurrentStatuses.FirstOrDefault(p => p.DeviceName == deviceName);
-                                obj.DeviceName = newName;
-                            }
-                            else
-                            {
-                                System.Windows.Forms.MessageBox.Show("设备名称与其他名称冲突", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                            }
-                        }
-                        else 
-                        {
-                            int index = Array.FindIndex(TopDeviceCurrentStatuses.ToArray(), p => p.DeviceName == newName);
-                            int index1 = Array.FindIndex(BottomDeviceCurrentStatuses.ToArray(), p => p.DeviceName == newName);
-                            if (index == -1 && index1 == -1)
-                            {
-                                var obj = BottomDeviceCurrentStatuses.FirstOrDefault(p => p.DeviceName == deviceName);
-                                obj.DeviceName = newName;
-                            }
-                            else
-                            {
-                                System.Windows.Forms.MessageBox.Show("设备名称与其他名称冲突", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                            }
-                        }
-                    }
-                }), "UpdateDeviceName");
-                ChangeDeviceNameView view = new ChangeDeviceNameView();
-                view.ShowDialog();
-            });
+            }
         }
         public ObservableCollection<DeviceCurrentStatus> TopDeviceCurrentStatuses { get; set; } = new ObservableCollection<DeviceCurrentStatus>();
         public ObservableCollection<DeviceCurrentStatus> BottomDeviceCurrentStatuses { get; set; } = new ObservableCollection<DeviceCurrentStatus>();
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
index 44d109e2..4b9201b8 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
@@ -21,25 +21,21 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
     {
         public ManualFlowViewModel()
         {
-            Tray1InPlace = new RelayCommand(() =>
+            TrayInPlace = new RelayCommand<object>((o) =>
             {
-                GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(1, true);
-            });
-            Tray2InPlace = new RelayCommand(() =>
-            {
-                GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(2, true);
-            });
-            Tray3InPlace = new RelayCommand(() =>
-            {
-                GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(3, true);
-            });
-            Tray4InPlace = new RelayCommand(() =>
-            {
-                GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(4, true);
+                if (o != null)
+                {
+                    byte loc = Convert.ToByte(o);
+                    GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(loc, true);
+                }
             });
-            Tray5InPlace = new RelayCommand(() =>
+            TrayLeave = new RelayCommand<object>((o) => 
             {
-                GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(5, true);
+                if (o!=null) 
+                {
+                    byte loc = Convert.ToByte(o);
+                    GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(loc, false);
+                }
             });
             ClearTrayInPlace = new RelayCommand(() =>
             {
@@ -82,11 +78,8 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                 StockBin14Name = GVL_BigStation.stockBinName.RawMaterialName14;
             }), "设备状态读取",true);
         }
-        public RelayCommand Tray1InPlace { get; set; }
-        public RelayCommand Tray2InPlace { get; set; }
-        public RelayCommand Tray3InPlace { get; set; }
-        public RelayCommand Tray4InPlace { get; set; }
-        public RelayCommand Tray5InPlace { get; set; }
+        public RelayCommand<object> TrayInPlace { get; set; }
+        public RelayCommand<object> TrayLeave { get; set; }
         public RelayCommand ClearTrayInPlace { get; set; }
         public RelayCommand ClearAllRecipe { get; set; }
         public static bool Heartbeat { get { return _mHeartbeat; } set { _mHeartbeat = value; OnStaticPropertyChanged(); } }
@@ -94,34 +87,35 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
 
         public string CancelRecipeCode { get { return _CancelRecipeCode; } set { _CancelRecipeCode = value; OnPropertyChanged(); } }
         public string _CancelRecipeCode { get; set; }
+
         public static string StockBin1Name { get { return _StockBin1Name; } set { _StockBin1Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin1Name { get; set; }
+        private static string _StockBin1Name { get; set; }
         public static string StockBin2Name { get { return _StockBin2Name; } set { _StockBin2Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin2Name { get; set; }
+        private static string _StockBin2Name { get; set; }
         public static string StockBin3Name { get { return _StockBin3Name; } set { _StockBin3Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin3Name { get; set; }
+        private static string _StockBin3Name { get; set; }
         public static string StockBin4Name { get { return _StockBin4Name; } set { _StockBin4Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin4Name { get; set; }
+        private static string _StockBin4Name { get; set; }
         public static string StockBin5Name { get { return _StockBin5Name; } set { _StockBin5Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin5Name { get; set; }
+        private static string _StockBin5Name { get; set; }
         public static string StockBin6Name { get { return _StockBin6Name; } set { _StockBin6Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin6Name { get; set; }
+        private static string _StockBin6Name { get; set; }
         public static string StockBin7Name { get { return _StockBin7Name; } set { _StockBin7Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin7Name { get; set; }
+        private static string _StockBin7Name { get; set; }
         public static string StockBin8Name { get { return _StockBin8Name; } set { _StockBin8Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin8Name { get; set; }
+        private static string _StockBin8Name { get; set; }
         public static string StockBin9Name { get { return _StockBin9Name; } set { _StockBin9Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin9Name { get; set; }
+        private static string _StockBin9Name { get; set; }
         public static string StockBin10Name { get { return _StockBin10Name; } set { _StockBin10Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin10Name { get; set; }
+        private static string _StockBin10Name { get; set; }
         public static string StockBin11Name { get { return _StockBin11Name; } set { _StockBin11Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin11Name { get; set; }
+        private static string _StockBin11Name { get; set; }
         public static string StockBin12Name { get { return _StockBin12Name; } set { _StockBin12Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin12Name { get; set; }
+        private static string _StockBin12Name { get; set; }
         public static string StockBin13Name { get { return _StockBin13Name; } set { _StockBin13Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin13Name { get; set; }
+        private static string _StockBin13Name { get; set; }
         public static string StockBin14Name { get { return _StockBin14Name; } set { _StockBin14Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin14Name { get; set; }
+        private static string _StockBin14Name { get; set; }
         public RelayCommand CancelRecipeCommand { get; set; }
 
         public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs
index b1eaec92..f4e90230 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs
@@ -46,6 +46,27 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                 RecipeInfosView nrv = new RecipeInfosView();
                 nrv.ShowDialog();
             });
+
+            //RefreshRecipe = new RelayCommand(() =>
+            //{
+            //    foreach (var item in ProcessControl.GetInstance.RawMaterialsInfo)
+            //    {
+            //        RawMaterialNames.Add(item.RawMaterialName);
+            //    }
+
+            //    foreach (var item in Json<LocalRecipe>.Data.Recipes)
+            //    {
+            //        foreach (var tep in item.RawMaterial)
+            //        {
+            //            if (RawMaterialNames.Contains(tep.RawMaterialName))
+            //            {
+            //                int index = Array.FindIndex(ProcessControl.GetInstance.RawMaterialsInfo.ToArray(), p => p.RawMaterialName == tep.RawMaterialName);
+            //                tep.RawMaterialLocation = ProcessControl.GetInstance.RawMaterialsInfo.ElementAt(index).RawMaterialLocation;
+            //            }
+            //        }
+            //    }
+            //});
+
             //模拟配方
             //NewSimulateRecipe = new RelayCommand(() =>
             //{
@@ -104,9 +125,12 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
       //  public RelayCommand NewSimulateRecipe { get; set; }
         public RelayCommand ClearAllRecipe { get; set; }
         public RelayCommand NewRecipe { get; set; }
+        public RelayCommand RefreshRecipe { get; set; }
         public bool IsUseLocalRecipe { get { return _isUseLocalRecipe; } set { _isUseLocalRecipe = value;  OnPropertyChanged(); } }
         public bool _isUseLocalRecipe { get; set; }
         public RelayCommand<string> RemoveCommand { get; set; }
         public ObservableCollection<RecipeData> Recipes { get; set; } = new ObservableCollection<RecipeData>();
+
+        public ObservableCollection<string> RawMaterialNames { get; set; } = new ObservableCollection<string>();
     }
 }
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
index 4f9acbb1..0a6fc51b 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
@@ -3,6 +3,7 @@ using BPASmartClient.CustomResource.UserControls;
 using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.Helper;
 using BPASmartClient.JXJFoodBigStation.Model;
+using BPASmartClient.JXJFoodBigStation.Model.Siemens;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
@@ -44,9 +45,10 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                         var res = Recipes.FirstOrDefault(p => p.RecipeName == recipeName);
                         if (res != null)
                         {
-                            if (!ProcessControl.GetInstance.LocalRecipes.Contains(res))
+                            if (!Json<RemoteRecipe>.Data.Recipes.Contains(res))
                             {
-                                ProcessControl.GetInstance.LocalRecipes.Add(res);
+                                res.RecipesSource = RecipeSource.本地;
+                                Json<RemoteRecipe>.Data.Recipes.Add(res);
                                 MessageNotify.GetInstance.ShowRunLog($"手动下发配方:{recipeName}完成");
                                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"配方下发完成");
                             }
diff --git a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
index 70aafb9e..249d610c 100644
--- a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
@@ -78,21 +78,21 @@ namespace BPASmartClient.JXJFoodSmallStation
 
             #region 配方管理菜单
             ObservableCollection<SubMenumodel> RecipeManage = new ObservableCollection<SubMenumodel>();
-            RecipeManage.Add(new SubMenumodel()
-            {
-                SubMenuName = "味魔方配方管理",
-                SubMenuPermission = new Permission[] { Permission.管理员 },
-                AssemblyName = "BPASmartClient.JXJFoodSmallStation",
-                ToggleWindowPath = "View.RecipeSettingsView"
-            });
+            //RecipeManage.Add(new SubMenumodel()
+            //{
+            //    SubMenuName = "味魔方配方管理",
+            //    SubMenuPermission = new Permission[] { Permission.管理员 },
+            //    AssemblyName = "BPASmartClient.JXJFoodSmallStation",
+            //    ToggleWindowPath = "View.RecipeSettingsView"
+            //});
 
-            RecipeManage.Add(new SubMenumodel()
-            {
-                SubMenuName = "味魔方配方下发",
-                SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员 },
-                AssemblyName = "BPASmartClient.JXJFoodSmallStation",
-                ToggleWindowPath = "View.RecipeControlView"
-            });
+            //RecipeManage.Add(new SubMenumodel()
+            //{
+            //    SubMenuName = "味魔方配方下发",
+            //    SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员 },
+            //    AssemblyName = "BPASmartClient.JXJFoodSmallStation",
+            //    ToggleWindowPath = "View.RecipeControlView"
+            //});
             RecipeManage.Add(new SubMenumodel()
             {
                 SubMenuName = "本地配方管理",
@@ -120,7 +120,7 @@ namespace BPASmartClient.JXJFoodSmallStation
             ObservableCollection<SubMenumodel> ParSet = new ObservableCollection<SubMenumodel>();
             ParSet.Add(new SubMenumodel()
             {
-                SubMenuName = "柔性味魔方参数设置",
+                SubMenuName = "味魔方参数设置",
                 SubMenuPermission = new Permission[] { Permission.管理员 },
                 AssemblyName = "BPASmartClient.JXJFoodSmallStation",
                 ToggleWindowPath = "View.DeviceMaterialParView"
@@ -141,11 +141,19 @@ namespace BPASmartClient.JXJFoodSmallStation
             });
             ParSet.Add(new SubMenumodel()
             {
-                SubMenuName = "原料与料仓对应设置",
+                SubMenuName = "原料与料仓管理",
                 SubMenuPermission = new Permission[] { Permission.管理员 },
                 AssemblyName = "BPASmartClient.JXJFoodSmallStation",
                 ToggleWindowPath = "View.StockBinRawMaterialView"
             });
+            ParSet.Add(new SubMenumodel()
+            {
+                SubMenuName = "西门子物料管理",
+                SubMenuPermission = new Permission[] { Permission.管理员 },
+                AssemblyName = "BPASmartClient.JXJFoodSmallStation",
+                ToggleWindowPath = "View.BomOfMaterialView"
+            });
+            
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
             {
                 MainMenuIcon = "&#xe62d;",
@@ -252,12 +260,19 @@ namespace BPASmartClient.JXJFoodSmallStation
             });
             DeviceMonitor.Add(new SubMenumodel()
             {
-                SubMenuName = "变量监控",
+                SubMenuName = "Plc变量监控",
                 SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
                 AssemblyName = "BPASmartClient.JXJFoodSmallStation",
                 ToggleWindowPath = "View.PlcVarMonitorView"
             });
             DeviceMonitor.Add(new SubMenumodel()
+            {
+                SubMenuName = "流程变量监控",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.JXJFoodSmallStation",
+                ToggleWindowPath = "View.ProcessMonitorView"
+            });
+            DeviceMonitor.Add(new SubMenumodel()
             {
                 SubMenuName = "设备状态",
                 SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
diff --git a/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj b/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
index f14324ad..6c3c8aaa 100644
--- a/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
+++ b/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
@@ -26,6 +26,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Update="View\BomOfMaterialView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="View\RobotView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -38,6 +41,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Page Update="View\BomOfMaterialView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="View\ChangeDeviceNameView.xaml">
         <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
     </Page>
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterial.cs b/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterial.cs
new file mode 100644
index 00000000..56606358
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterial.cs
@@ -0,0 +1,21 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.Model.Bom
+{
+    public class BomMaterial:ObservableObject
+    {
+        public int Count { get { return _count; } set { _count = value; OnPropertyChanged(); } }
+        public int _count { get; set; }
+        
+        public string MaterialCode { get { return _materialCode; }set { _materialCode = value;OnPropertyChanged(); } }
+        private string _materialCode="";
+
+        public string MaterialName { get { return _materialName; } set { _materialName = value; OnPropertyChanged(); } }
+        private string _materialName="";
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterialData.cs b/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterialData.cs
new file mode 100644
index 00000000..d7cacf1b
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterialData.cs
@@ -0,0 +1,16 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.Model.Bom
+{
+    public class BomMaterialData
+    {
+        public ObservableCollection<BomMaterial> Materials { get; set; } = new ObservableCollection<BomMaterial>();
+
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcCommAttribute.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL/VarCommAttribute.cs
similarity index 78%
rename from BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcCommAttribute.cs
rename to BPASmartClient.JXJFoodSmallStation/Model/GVL/VarCommAttribute.cs
index 8d72460d..1e23d1d9 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcCommAttribute.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/GVL/VarCommAttribute.cs
@@ -7,9 +7,9 @@ using System.Threading.Tasks;
 namespace BPASmartClient.JXJFoodSmallStation.Model.GVL
 {
     [AttributeUsage(AttributeTargets.Property)]
-    public sealed class PlcCommAttribute:Attribute
+    public sealed class VarCommAttribute:Attribute
     {
-        public PlcCommAttribute(string address,string des) 
+        public VarCommAttribute(string address,string des) 
         {
             Address = address;
             Describe = des;
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
index 3313406a..50859211 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
@@ -1,4 +1,5 @@
-using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
+using BPASmartClient.JXJFoodSmallStation.Model.GVL;
+using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
 using BPASmartClient.JXJFoodSmallStation.Model.Siemens;
 using System;
 using System.Collections.Concurrent;
@@ -16,181 +17,261 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         public static GVL_SmallStation GetInstance => SmallStation ?? (SmallStation = new GVL_SmallStation());
         private GVL_SmallStation() { }
 
-        public static PlcReadAddressDB3 plcReadDataDB3 { get; set; } = new PlcReadAddressDB3();
+        public PlcReadAddressDB3 plcReadDataDB3 { get; set; } = new PlcReadAddressDB3();
+        /// <summary>
+        /// 配料站料仓数目
+        /// </summary>
+        public const int Max_DosingSotckBinNum = 15;
+        /// <summary>
+        /// 风送料仓数目
+        /// </summary>
+        public const int Max_PowderSotckBinNum = 5;
 
+        [VarComm("Global", "订单取消")]
         /// <summary>
         /// 订单取消
         /// </summary>
-        public static bool Order_Cancel { get; set; }
+        public bool Order_Cancel { get; set; }
+
+        [VarComm("Global", "订单取消的配方编号")]
         /// <summary>
-        /// 取消订单的编号
+        /// 订单取消的配方编号
         /// </summary>
-        public static string Order_CancelRecipeCode { get; set; } = "";
+        public string Order_CancelRecipeCode { get; set; } = "";
+
+
+        [VarComm("Global", "柔性配料料仓配料情况")]
         /// <summary>
-        /// 托盘1托盘到位 逻辑完成
+        /// 料仓配料情况
         /// </summary>
-        public static int Tray1LogicFinish { get; set; } = 0;
+        public ushort StockBinDosing { get; set; } = 0;
+
+        [VarComm("Global", "托盘1托盘到位情况0:未到位,1=AGV到位,2=托盘有货架,3=AGV取托盘完成")]
         /// <summary>
-        /// 托盘2托盘到位 逻辑完成
+        /// 托盘1托盘到位情况
         /// </summary>
-        public static int Tray2LogicFinish { get; set; } = 0;
+        public int Tray1LogicFinish { get; set; } = 0;
+
+        [VarComm("Global", "托盘2托盘到位情况0:未到位,1=AGV到位,2=托盘有货架,3=AGV取托盘完成")]
         /// <summary>
-        /// 托盘1有货架
+        /// 托盘2托盘到位 逻辑完成
         /// </summary>
-        public static bool Station1HaveTray { get; set; }
+        public int Tray2LogicFinish { get; set; } = 0;
+
+        [VarComm("Global", "托盘1有货架")]
         /// <summary>
-        /// 托盘2有货架
+        /// 托盘1有货架
         /// </summary>
-        public static bool Station2HaveTray { get; set; }
+        public bool Station1HaveTray { get; set; }
+
+
+        [VarComm("Global", "托盘2有货架")]
         /// <summary>
         /// 托盘2有货架
         /// </summary>
-        public static int nStep { get; set; }
+        public bool Station2HaveTray { get; set; }
+
+
+        [VarComm("Global", "托盘1传感器信号")]
         /// <summary>
         /// 托盘1传感器信号
         /// </summary>
-        public static bool Station1Sensor { get; set; }
+        public bool Station1Sensor { get; set; }
+
+        [VarComm("Global", "托盘2传感器信号")]
         /// <summary>
         /// 托盘2传感器信号
         /// </summary>
-        public static bool Station2Sensor { get; set; }
+        public bool Station2Sensor { get; set; }
+
+
+        [VarComm("Global", "托盘1气缸信号")]
         /// <summary>
         /// 托盘1气缸信号
         /// </summary>
-        public static bool Station1Cylinder { get; set; }
+        public bool Station1Cylinder { get; set; }
+
+        [VarComm("Global", "托盘2气缸信号")]
         /// <summary>
         /// 托盘2气缸信号
         /// </summary>
-        public static bool Station2Cylinder { get; set; }
+        public bool Station2Cylinder { get; set; }
+
+        [VarComm("Global", "AGV放托盘1完成")]
         /// <summary>
         /// AGV放托盘1完成
         /// </summary>
-        public static bool AGV_PutTray1Finish { get; set; }
+        public bool AGV_PutTray1Finish { get; set; }
+
+        [VarComm("Global", "AGV取托盘1完成")]
         /// <summary>
         /// AGV取托盘1完成
         /// </summary>
-        public static bool AGV_GetTray1Finish { get; set; }
+        public bool AGV_GetTray1Finish { get; set; }
 
+        [VarComm("Global", "AGV放托盘2完成")]
+        /// <summary>
+        /// AGV放托盘1完成
+        /// </summary>
+        public bool AGV_PutTray2Finish { get; set; }
 
-        public static bool AGV_PutTray2Finish { get; set; }
-        public static bool AGV_GetTray2Finish { get; set; }
+        [VarComm("Global", "AGV取托盘2完成")]
+        /// <summary>
+        /// AGV取托盘2完成
+        /// </summary>
+        public bool AGV_GetTray2Finish { get; set; }
 
-        public static bool CylinderReset { get; set; }
+        [VarComm("Global", "托盘1气缸复位")]
         /// <summary>
-        /// 配料站料仓数目
+        /// 托盘1气缸复位
         /// </summary>
-        public const int Max_DosingSotckBinNum = 15;
+        public bool CylinderReset { get; set; }
+
+        [VarComm("Global", "发送给plc的心跳")]
         /// <summary>
-        /// 风送料仓数目
+        /// 发送给plc的心跳
         /// </summary>
-        public const int Max_PowderSotckBinNum = 5;
         public bool HeartBeatToPlc { get; set; } = false;
+
+        [VarComm("Global", "来自plc的心跳")]
+        /// <summary>
+        /// 来自plc的心跳
+        /// </summary>
         public bool HeartBeatFromPlc { get; set; } = false;
+
+        [VarComm("Global", "是否允许西门子下发配方")]
         /// <summary>
         /// 是否允许西门子下发配方
         /// </summary>
-        public static bool IsAllowSiemensSendRecipe { get; set; } = false;
+        public bool IsAllowSiemensSendRecipe { get; set; } = false;
+
+        [VarComm("Global", "西门子下发配方状态0=等待下发配方 1=请求下发配方 2=接收配方 3=配方接收配方完成 4=请求配料 5=西门子确认开始配料 6=西门子确认开始配料信号复位")]
         /// <summary>
         /// 西门子下发配方状态 0:等待下发配方 1：请求下发配方 2：上位机接收配方 3：配方接收配方完成 4：上位机向西门子请求配料 5：西门子确认开始配料 6:西门子确认开始配料 信号复位
         /// </summary>
-        public static int SiemensSendRecipeStatus { get; set; } = 0;
+        public int SiemensSendRecipeStatus { get; set; } = 0;
+    
+        [VarComm("Global", "配方1下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料")]
         /// <summary>
-        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方
+        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料
         /// </summary>
         public int RecipeStatusIDTray1 { get; set; } = 0;
 
+        [VarComm("Global", "配方1下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料")]
         /// <summary>
-        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方
+        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料
         /// </summary>
-        public int RecipeStatusIDTray2 { get; set; } = 0;
+        public int[] RecipeProcessStatus { get; set; } = new int[5] { 0, 0, 0, 0, 0 };
 
+
+        [VarComm("Global", "配方2下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料")]
         /// <summary>
-        /// Tray1的柔性味魔方配料标志（下发配方时，若柔性味魔方的状态=3，复位该状态）
-        /// </summary>
-        public bool DosingTray1 { get; set; } = false;//默认为true,初始时，判断柔性味魔方的状态。
-        /// <summary>
-        /// Tray2的柔性味魔方配料标志
+        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料
         /// </summary>
-        public bool DosingTray2 { get; set; } = false;
+        public int RecipeStatusIDTray2 { get; set; } = 0;
 
-        public int DosingTray1Loc { get; set; } = 0;
-        public int DosingTray2Loc { get; set; } = 0;
+        [VarComm("Global", "当前配方正在配料位置")]
         /// <summary>
         /// 当前料仓的位置
         /// </summary>
         public int StockInIsWork { get; set; } = 0;
 
-        /// <summary>
-        /// 记录AGV进站送货的指令顺序
-        /// </summary>
-        public int AgvDeliveryPosition { get; set; }= 0;
-        /// <summary>
-        /// 记录AGV进站取货的指令顺序
-        /// </summary>
-        public int AgvPickUpPosition { get; set; } = 0;
 
+        [VarComm("Global", "是否使用粉仓配料")]
         /// <summary>
-        /// 是否使用粉仓
+        /// 是否使用粉仓配料
         /// </summary>
         public bool IsUseWindSend { get; set; } = false;
+
+        [VarComm("Global", "粉仓正在配料")]
         /// <summary>
-        /// 风送配料完成标志
+        /// 粉仓正在配料
         /// </summary>
-        public bool WindSendDosingFinish { get; set; } = false;
+        public bool WindSendDosing { get; set; } = false;
+
 
         /// <summary>
-        /// 顶升气缸的信号
+        /// 所有气缸的信号
         /// </summary>
-        public bool[] Cylinder_JackInfo = new bool[15];
+        public bool[] Cylinder_JackInfo { get; set; } = new bool[30];
 
         #region 本地模拟配方
+
+        [VarComm("Global", "是否使用本地模拟配方")]
         /// <summary>
         /// 是否使用本地模拟配方
         /// </summary>
         public bool IsUseLocalRecipe { get; set; }
+
         /// <summary>
-        /// 是否使用本地模拟订单+风送配方
+        /// 配料时间
         /// </summary>
-        public bool IsUseWindSendDosing { get; set; }
-        public static int test1 = 1;
         public DateTime time1;
+
+        /// <summary>
+        /// 原料的名称和原料编号对应，Mes提供的信息
+        /// </summary>
+        public ConcurrentDictionary<string, string> RawMaterialsNameCode { get; set; } = new ConcurrentDictionary<string, string>();
+        
+        [VarComm("Global", "风送是否允许AGV到工站")]
         /// <summary>
         /// 风送是否允许AGV到工站
         /// </summary>
-        public static bool WindSendAllowAGVPutGet { get; set; } = false;
+        public bool WindSendAllowAGVPutGet { get; set; } = false;
+
+        [VarComm("Global", "粉料仓配料完成")]
         /// <summary>
         /// 粉料仓配料完成
         /// </summary>
-        public static bool WindSendDosingComple { get; set; } = false;
+        public bool WindSendDosingComple { get; set; } = false;
+
+        [VarComm("Global", "PLC的系统模式 DB44.DBX0.1")]
         /// <summary>
-        /// 系统模式
+        /// PLC的系统模式 DB44.DBX0.1
         /// </summary>
-        public static bool SystemMode { get; set; } = false;
+        public bool PlcSystemMode { get; set; } = false;
+
+        [VarComm("Global", "PLC的系统模式 DB44.DBX0.1")]
         /// <summary>
-        /// 系统状态
+        /// 不使用15个料仓报警
         /// </summary>
-        public static bool SystemStatus { get; set; } = false;
+        public bool DisEnableStockBinAlarm { get; set; } = false;
+
+        [VarComm("Global", "PLC的系统自动启停 DB44.DBX0.0")]
+        /// <summary>
+        /// PLC的系统自动启停 DB44.DBX0.0
+        /// </summary>
+        public bool PlcSystemIsAutoRun { get; set; } = false;
+
+        [VarComm("Global", "PLC的系统自动暂停/开始 DB44.DBX0.2")]
         /// <summary>
-        /// 系统运行状态
+        /// PLC的系统自动暂停/开始 DB44.DBX0.2
         /// </summary>
-        public static bool SystemRunStatus { get; set; } = false;
+        public bool PlcSystemIsPause { get; set; } = false;
+
+        [VarComm("Global", "延迟采集料仓的配料完成重量")]
         /// <summary>
-        /// 系统运行状态
+        /// 延迟采集料仓的配料完成重量
         /// </summary>
-        public static int Time { get; set; } = 1000;
+        public int Time { get; set; } = 1000;
+
+        [VarComm("Global", "取消订单的步骤号")]
         /// <summary>
         /// 取消订单的步骤： 1-9：配料过程中配方1取消配方 10-19：配料过程中配方2取消配方 20-29：下发订单的过程中取消订单(订单未到达上位机)  30-39：下发订单的过程中取消订单(订单未到达PLC)
         /// </summary>
-        public static int OrderCancelStep = 0;
+        public int OrderCancelStep { get; set; } = 0;
 
+        [VarComm("Global", "机器人的状态")]
         /// <summary>
         /// 机器人的状态
         /// </summary>
-        public static ushort RobotStatus = 0;
+        public ushort RobotStatus { get; set; } = 0;
+
+        [VarComm("Global", "机器人的程序号")]
         /// <summary>
-        /// 机器人的状态
+        /// 机器人的程序号
         /// </summary>
-        public static byte RobotProgramNum = 0;
+        public byte RobotProgramNum { get; set; } = 0;
         #endregion
     }
     public enum IssueRecipeCondition
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
index 6ccc889a..f90bd07f 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using BPASmartClient.S7Net;
 using BPASmartClient.CustomResource.Pages.Model;
 using System.Threading;
+using System.Collections.ObjectModel;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
 {
@@ -30,9 +31,10 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
                     var res1 = this.HK_PLC_S7.ReadClass<PlcReadAddressDB3>(3);
                     if (res1 != null && res1 is PlcReadAddressDB3 data1)
                     {
-                        GVL_SmallStation.plcReadDataDB3 = data1;
+                        GVL_SmallStation.GetInstance.plcReadDataDB3 = data1;
                     }
                 }
+                Thread.Sleep(10);
             }),"海科PLC设备状态",true);
         }
         ///// <summary>
@@ -187,5 +189,41 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
                 }
             }
         }
+
+        public void IssueRecipeToPlc(ObservableCollection<RemoteRecipeRawMaterial> rawMaterials,int recipeLoction)
+        {
+            if (IsConnected)
+            {
+                ushort barrel1 = 0;
+                ushort barrel2 = 0;
+                ushort barrel3 = 0;
+                foreach (var item in rawMaterials)
+                {
+                    switch (item.RawMaterialBarrelNum)
+                    {
+                        case 1:
+                            barrel1 = barrel1.SetBitValue((byte)item.RawMaterialLocation, true);
+                            break;
+                        case 2:
+                            barrel2 = barrel2.SetBitValue((byte)item.RawMaterialLocation, true);
+                            break;
+                        case 3:
+                            barrel3 = barrel3.SetBitValue((byte)item.RawMaterialLocation, true);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                string AddresBarrel1 = "DB4.DBW" + (12 + (recipeLoction - 1) * 6);
+                string AddresBarrel2 = "DB4.DBW" + (14 + (recipeLoction - 1) * 6);
+                string AddresBarrel3 = "DB4.DBW" + (16 + (recipeLoction - 1) * 6);
+                HK_PLC_S7.Write<ushort>(AddresBarrel1, barrel1);
+                HK_PLC_S7.Write<ushort>(AddresBarrel2, barrel2);
+                HK_PLC_S7.Write<ushort>(AddresBarrel3, barrel3);
+                MessageNotify.GetInstance.ShowRunLog($"配方下发，plc配方位置{recipeLoction},桶1料仓配料{barrel1.ToBinString}");
+                MessageNotify.GetInstance.ShowRunLog($"配方下发，plc配方位置{recipeLoction},桶2料仓配料{barrel1.ToBinString}");
+                MessageNotify.GetInstance.ShowRunLog($"配方下发，plc配方位置{recipeLoction},桶3料仓配料{barrel1.ToBinString}");
+            }
+        }
     }
-}   
+}   
\ No newline at end of file
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceWrite.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceWrite.cs
new file mode 100644
index 00000000..5ca62ab8
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceWrite.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
+{
+    public class HKDeviceWrite
+    {
+        public string Address { get; set; }
+        public PlcVarType PlcVarType { get; set; } = PlcVarType.Bool;
+        public object Value { get; set; }
+    }
+    public enum PlcVarType 
+    {
+        Bool,
+        Byte,
+        Int,
+        Dint,
+        Real,
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
index 3f025d9e..26f141b4 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
@@ -9,170 +9,170 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
 {
     public class PlcReadAddressDB3
     {
-        [PlcComm("DB3.DBX0.0","心跳")]
+        [VarComm("DB3.DBX0.0","心跳")]
         public bool HeartBeat { get; set; }
-        [PlcComm("DB3.DBX0.1", "备用1")]
+        [VarComm("DB3.DBX0.1", "备用1")]
         public bool Standby1 { get; set; }
-        [PlcComm("DB3.DBX0.2", "备用2")]
+        [VarComm("DB3.DBX0.2", "备用2")]
         public bool Standby2 { get; set; }
-        [PlcComm("DB3.DBX0.3", "备用3")]
+        [VarComm("DB3.DBX0.3", "备用3")]
         public bool Standby3 { get; set; }
-        [PlcComm("DB3.DBX0.4", "备用4")]
+        [VarComm("DB3.DBX0.4", "备用4")]
         public bool Standby4 { get; set; }
-        [PlcComm("DB3.DBX0.5", "备用5")]
+        [VarComm("DB3.DBX0.5", "备用5")]
         public bool Standby5 { get; set; }
-        [PlcComm("DB3.DBX0.6", "备用6")]
+        [VarComm("DB3.DBX0.6", "备用6")]
         public bool Standby6 { get; set; }
-        [PlcComm("DB3.DBX0.7", "工站1有托盘")]
+        [VarComm("DB3.DBX0.7", "工站1有托盘")]
         public bool WorkStation1HaveTray { get; set; }
 
-        [PlcComm("DB3.DBX1.0", "工站2有托盘")]
+        [VarComm("DB3.DBX1.0", "工站2有托盘")]
         public bool WorkStation2HaveTray { get; set; }
-        [PlcComm("DB3.DBX1.1", "工站1配料完成")]
+        [VarComm("DB3.DBX1.1", "工站1配料完成")]
         public bool WorkStation1DosingComplete { get; set; }
-        [PlcComm("DB3.DBX1.2", "工站2配料完成")]
+        [VarComm("DB3.DBX1.2", "工站2配料完成")]
         public bool WorkStation2DosingComplete { get; set; }
-        [PlcComm("DB3.DBX1.3", "工站1接收配方完成")]
+        [VarComm("DB3.DBX1.3", "工站1接收配方完成")]
         public bool WorkStation1ReceviceRecipeComplete { get; set; }
-        [PlcComm("DB3.DBX1.4", "工站2接收配方完成")]
+        [VarComm("DB3.DBX1.4", "工站2接收配方完成")]
         public bool WorkStation2ReceviceRecipeComplete { get; set; }
-        [PlcComm("DB3.DBX1.5", "工站1气缸报警")]
+        [VarComm("DB3.DBX1.5", "工站1气缸报警")]
         public bool WorkStation1CylinderAlarm { get; set; }
-        [PlcComm("DB3.DBX1.6", "工站2气缸报警")]
+        [VarComm("DB3.DBX1.6", "工站2气缸报警")]
         public bool WorkStation2CylinderAlarm { get; set; }
-        [PlcComm("DB3.DBX1.7", "允许配方1下发配方")]
+        [VarComm("DB3.DBX1.7", "允许配方1下发配方")]
         public bool AllowRecipe1Issue { get; set; }
 
-        [PlcComm("DB3.DBX2.0", "允许配方2下发配方")]
+        [VarComm("DB3.DBX2.0", "允许配方2下发配方")]
         public bool AllowRecipe2Issue { get; set; }
-        [PlcComm("DB3.DBX2.1", "工站1传感器信号")]
+        [VarComm("DB3.DBX2.1", "工站1传感器信号")]
         public bool WorkStation1Sensor { get; set; }
-        [PlcComm("DB3.DBX2.2", "工站2传感器信号")]
+        [VarComm("DB3.DBX2.2", "工站2传感器信号")]
         public bool WorkStation2Sensor { get; set; }
-        [PlcComm("DB3.DBX2.3", "工站1气缸信号，false=伸出")]
+        [VarComm("DB3.DBX2.3", "工站1气缸信号，false=伸出")]
         public bool WorkStation1Cylinder { get; set; }
-        [PlcComm("DB3.DBX2.4", "工站2气缸信号，false=伸出")]
+        [VarComm("DB3.DBX2.4", "工站2气缸信号，false=伸出")]
         public bool WorkStation2Cylinder { get; set; }
-        [PlcComm("DB3.DBX2.5", "工站1取消订单")]
+        [VarComm("DB3.DBX2.5", "工站1取消订单")]
         public bool WorkStation1OrderCancel { get; set; }
-        [PlcComm("DB3.DBX2.6", "工站2取消订单")]
+        [VarComm("DB3.DBX2.6", "工站2取消订单")]
         public bool WorkStation2OrderCancel { get; set; }
-        [PlcComm("DB3.DBX2.7", "备用7")]
+        [VarComm("DB3.DBX2.7", "备用7")]
         public bool Standby7 { get; set; }
-        [PlcComm("DB3.DBB3", "备用")]
+        [VarComm("DB3.DBB3", "备用")]
         public byte Standby81 { get; set; }
-        [PlcComm("DB3.DBB4", "备用")]
+        [VarComm("DB3.DBB4", "备用")]
         public byte Standby82 { get; set; }
-        [PlcComm("DB3.DBB5", "备用")]
+        [VarComm("DB3.DBB5", "备用")]
         public byte Standby83 { get; set; }
-        [PlcComm("DB3.DBW6", "备用")]
+        [VarComm("DB3.DBW6", "备用")]
         public int Standby9 { get; set; }
 
-        [PlcComm("DB3.DBD10", "工站1_1号桶的位置")]
+        [VarComm("DB3.DBD10", "工站1_1号桶的位置")]
         public float WorkStation1Barrel1Pos { get; set; }
-        [PlcComm("DB3.DBD14", "工站1_2号桶的位置")]
+        [VarComm("DB3.DBD14", "工站1_2号桶的位置")]
         public float WorkStation1Barrel2Pos { get; set; }
-        [PlcComm("DB3.DBD18", "工站1_3号桶的位置")]
+        [VarComm("DB3.DBD18", "工站1_3号桶的位置")]
         public float WorkStation1Barrel3Pos { get; set; }
-        [PlcComm("DB3.DBD22", "工站1_4号桶的位置")]
+        [VarComm("DB3.DBD22", "工站1_4号桶的位置")]
         public float WorkStation1Barrel4Pos { get; set; }
-        [PlcComm("DB3.DBD26", "工站2_1号桶的位置")]
+        [VarComm("DB3.DBD26", "工站2_1号桶的位置")]
         public float WorkStation2Barrel1Pos { get; set; }
-        [PlcComm("DB3.DBD30", "工站2_2号桶的位置")]
+        [VarComm("DB3.DBD30", "工站2_2号桶的位置")]
         public float WorkStation2Barrel2Pos { get; set; }
-        [PlcComm("DB3.DBD34", "工站2_3号桶的位置")]
+        [VarComm("DB3.DBD34", "工站2_3号桶的位置")]
         public float WorkStation2Barrel3Pos { get; set; }
-        [PlcComm("DB3.DBD38", "工站2_4号桶的位置")]
+        [VarComm("DB3.DBD38", "工站2_4号桶的位置")]
         public float WorkStation2Barrel4Pos { get; set; }
 
-        [PlcComm("DB3.DBD42", "备用")]
+        [VarComm("DB3.DBD42", "备用")]
         public int StandBy42 { get; set; }
-        [PlcComm("DB3.DBD46", "备用")]
+        [VarComm("DB3.DBD46", "备用")]
         public int StandBy46 { get; set; }
 
-        [PlcComm("DB3.DBX50.0", "工站1_1号桶允许配料")]
+        [VarComm("DB3.DBX50.0", "工站1_1号桶允许配料")]
         public bool WorkStation1Barrel1AllowDosing { get; set; }
-        [PlcComm("DB3.DB50.1", "工站1_2号桶允许配料")]
+        [VarComm("DB3.DB50.1", "工站1_2号桶允许配料")]
         public bool WorkStation1Barrel2AllowDosing { get; set; }
-        [PlcComm("DB3.DB50.2", "工站1_3号桶允许配料")]
+        [VarComm("DB3.DB50.2", "工站1_3号桶允许配料")]
         public bool WorkStation1Barrel3AllowDosing { get; set; }
-        [PlcComm("DB3.DB50.3", "工站1_4号桶允许配料")]
+        [VarComm("DB3.DB50.3", "工站1_4号桶允许配料")]
         public bool WorkStation1Barrel4AllowDosing { get; set; }
-        [PlcComm("DB3.DB50.4", "工站2_1号桶允许配料")]
+        [VarComm("DB3.DB50.4", "工站2_1号桶允许配料")]
         public bool WorkStation2Barrel1AllowDosing { get; set; }
-        [PlcComm("DB3.DB50.5", "工站2_2号桶允许配料")]
+        [VarComm("DB3.DB50.5", "工站2_2号桶允许配料")]
         public bool WorkStation2Barrel2AllowDosing { get; set; }
-        [PlcComm("DB3.DB50.6", "工站2_3号桶允许配料")]
+        [VarComm("DB3.DB50.6", "工站2_3号桶允许配料")]
         public bool WorkStation2Barrel3AllowDosing { get; set; }
-        [PlcComm("DB3.DB50.7", "工站2_4号桶允许配料")]
+        [VarComm("DB3.DB50.7", "工站2_4号桶允许配料")]
         public bool WorkStation2Barrel4AllowDosing { get; set; }
 
-        [PlcComm("DB3.DBD52", "备用")]
+        [VarComm("DB3.DBD52", "备用")]
         public int Standby15 { get; set; }
-        [PlcComm("DB3.DBD56", "备用")]
+        [VarComm("DB3.DBD56", "备用")]
         public int Standby16 { get; set; }
-        [PlcComm("DB3.DBD60", "备用")]
+        [VarComm("DB3.DBD60", "备用")]
         public int Standby17 { get; set; }
-        [PlcComm("DB3.DBD64", "备用")]
+        [VarComm("DB3.DBD64", "备用")]
         public int Standby18 { get; set; }
-        [PlcComm("DB3.DBD68", "备用")]
+        [VarComm("DB3.DBD68", "备用")]
         public int Standby19 { get; set; }
-        [PlcComm("DB3.DBD72", "备用")]
+        [VarComm("DB3.DBD72", "备用")]
         public int Standby20 { get; set; }
-        [PlcComm("DB3.DBD76", "备用")]
+        [VarComm("DB3.DBD76", "备用")]
         public int Standby21 { get; set; }
-        [PlcComm("DB3.DBD80", "备用")]
+        [VarComm("DB3.DBD80", "备用")]
         public int Standby22 { get; set; }
-        [PlcComm("DB3.DBD84", "备用")]
+        [VarComm("DB3.DBD84", "备用")]
         public int Standby23 { get; set; }
-        [PlcComm("DB3.DBD88", "备用")]
+        [VarComm("DB3.DBD88", "备用")]
         public int Standby24 { get; set; }
-        [PlcComm("DB3.DBD92", "备用")]
+        [VarComm("DB3.DBD92", "备用")]
         public int Standby25 { get; set; }
-        [PlcComm("DB3.DBD96", "备用")]
+        [VarComm("DB3.DBD96", "备用")]
         public int Standby26 { get; set; }
 
-        [PlcComm("DB3.DBX100.0", "机器人运行模式")]
+        [VarComm("DB3.DBX100.0", "机器人运行模式")]
         public bool RobotRunMode { get; set; }
-        [PlcComm("DB3.DBX100.1", "机器人自动运行")]
+        [VarComm("DB3.DBX100.1", "机器人自动运行")]
         public bool RobotAutoRun { get; set; }
-        [PlcComm("DB3.DBX100.2", "机器人停止")]
+        [VarComm("DB3.DBX100.2", "机器人停止")]
         public bool RobotStop { get; set; }
-        [PlcComm("DB3.DBX100.3", "机器人运行")]
+        [VarComm("DB3.DBX100.3", "机器人运行")]
         public bool RobotRun { get; set; }
-        [PlcComm("DB3.DBX100.4", "机器人运行报警")]
+        [VarComm("DB3.DBX100.4", "机器人运行报警")]
         public bool RobotRunAlarm { get; set; }
-        [PlcComm("DB3.DBX100.5", "机器人在原点")]
+        [VarComm("DB3.DBX100.5", "机器人在原点")]
         public bool RobotInHomed { get; set; }
-        [PlcComm("DB3.DBX100.6", "机器人备用")]
+        [VarComm("DB3.DBX100.6", "机器人备用")]
         public bool Standby30 { get; set; }
-        [PlcComm("DB3.DBX100.7", "机器人取空桶完成")]
+        [VarComm("DB3.DBX100.7", "机器人取空桶完成")]
         public bool RobotGetEmptyBarrelComplete { get; set; }
 
-        [PlcComm("DB3.DBX101.0", "机器人放空桶完成")]
+        [VarComm("DB3.DBX101.0", "机器人放空桶完成")]
         public bool RobotPutEmptyBarrelComplete { get; set; }
-        [PlcComm("DB3.DBX101.1", "机器人取满桶完成")]
+        [VarComm("DB3.DBX101.1", "机器人取满桶完成")]
         public bool RobotGetFullBarrelComplete { get; set; }
-        [PlcComm("DB3.DBX101.2", "机器人放满桶完成")]
+        [VarComm("DB3.DBX101.2", "机器人放满桶完成")]
         public bool RobotPutFullBarrelComplete { get; set; }
-        [PlcComm("DB3.DBX101.3", "备用")]
+        [VarComm("DB3.DBX101.3", "备用")]
         public bool Standby31 { get; set; }
-        [PlcComm("DB3.DBX101.4", "备用")]
+        [VarComm("DB3.DBX101.4", "备用")]
         public bool Standby32 { get; set; }
-        [PlcComm("DB3.DBX101.5", "备用")]
+        [VarComm("DB3.DBX101.5", "备用")]
         public bool Standby33 { get; set; }
-        [PlcComm("DB3.DBX101.6", "备用")]
+        [VarComm("DB3.DBX101.6", "备用")]
         public bool Standby34 { get; set; }
-        [PlcComm("DB3.DBX101.7", "备用")]
+        [VarComm("DB3.DBX101.7", "备用")]
         public bool Standby35 { get; set; }
 
-        [PlcComm("DB3.DBB102", "机器人运行的程序号")]
+        [VarComm("DB3.DBB102", "机器人运行的程序号")]
         public byte RobotProgramNum { get; set; }
-        [PlcComm("DB3.DBB103", "备用")]
+        [VarComm("DB3.DBB103", "备用")]
         public byte Standby36 { get; set; }
-        [PlcComm("DB3.DBB104", "备用")]
+        [VarComm("DB3.DBB104", "备用")]
         public byte Standby37 { get; set; }
-        [PlcComm("DB3.DBB105", "备用")]
+        [VarComm("DB3.DBB105", "备用")]
         public byte Standby38 { get; set; }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index ae5dbfd4..ae6dc6ef 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -38,11 +38,17 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// 配方队列
         /// </summary>
         public ConcurrentQueue<string> RecipeQueueTray1 = new ConcurrentQueue<string>();
+
         public ConcurrentQueue<string> RecipeQueueTray2 = new ConcurrentQueue<string>();
 
+
+
         public SiemensDeviceStatus SiemensDevice = new SiemensDeviceStatus();
         public HKDeviceStatus HKDevice = new HKDeviceStatus();
         public WindSendDeviceStatus WindSendDevice = new WindSendDeviceStatus();
+
+        public ObservableCollection<PlcInfos> CommData { get; set; } = new ObservableCollection<PlcInfos>();
+        public ObservableCollection<PlcInfos> ProcessVar { get; set; } = new ObservableCollection<PlcInfos>();
         XL_Finish_DB RecipeFinishInfo = new XL_Finish_DB();
         /// <summary>
         /// 风送PLC的DB块
@@ -52,6 +58,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// 接收原料数据
         /// </summary>
         public RecipeRawMaterial RawMaterial;
+        public DateTime StockBinAlarmTime = DateTime.Now;
 
         public string? HK_PLC_IP = ConfigurationManager.AppSettings["HKPlc_IP"];
         public string? Siemens_PLC_IP = ConfigurationManager.AppSettings["Siemens_IP"];
@@ -59,8 +66,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
 
         public void Init()
         {
-            plcVarMonitor();
+            PlcVarMonitor();
             StockBinNameWithPos();
+            RawMaterialNameWithCode();
             RegisterInit();
             DeviceConnect();
             //Json<RemoteRecipeDataColl>.Data.Recipes = TestData.GetInstance.Recipes;//添加测试数据
@@ -71,14 +79,24 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     GVL_SmallStation.GetInstance.HeartBeatToPlc = !GVL_SmallStation.GetInstance.HeartBeatToPlc;
                     HKDevice.HK_PLC_S7.Write("DB4.DBX0.0", GVL_SmallStation.GetInstance.HeartBeatToPlc);
                     GVL_SmallStation.GetInstance.HeartBeatFromPlc = HKDevice.HK_PLC_S7.Read<bool>("DB45.DBX0.0");
+                    if (DeviceInquire.GetInstance.devices.Count < 15 && HKDevice.IsConnected && Json<RemoteRecipeDataColl>.Data.Recipes.Count > 0 && GVL_SmallStation.GetInstance.DisEnableStockBinAlarm == false && DateTime.Now.Subtract(StockBinAlarmTime).TotalSeconds >= 60) 
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
+                        App.Current.Dispatcher.Invoke(() =>
+                        {
+                            MessageNotify.GetInstance.ShowDialog($"未读取到15个柔性味魔方料仓", DialogType.Error);
+                            StockBinAlarmTime = DateTime.Now;
+                        });
+                        HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
+                    }
                 }
                 Thread.Sleep(200);
             }), "海科plc通信心跳", true);
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                if (GVL_SmallStation.Order_Cancel)
+                if (GVL_SmallStation.GetInstance.Order_Cancel)
                 {
-                    CancelOrder();//订单取消
+                    CancelOrder();//订单取消,不执行配方流程
                 }
                 else
                 {
@@ -89,20 +107,30 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             }), "小料站流程控制", true);
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                Real_Time_Data();
+                RealTimeData();
+                foreach (var item in Json<DevicePar>.Data.windSendRawMaterial)
+                {
+                    if (GVL_SmallStation.GetInstance.RawMaterialsNameCode.ContainsKey(item.RawMaterialName))
+                    {
+                        item.RawMaterialChineseName = GVL_SmallStation.GetInstance.RawMaterialsNameCode[item.RawMaterialName];
+                    }
+                    else
+                    {
+                        item.RawMaterialChineseName = "";
+                    }
+                }
                 Thread.Sleep(10);
-            }), "西门子PLC和小料站PLC的实时数据", true);
+            }), "西门子PLC和小料站PLC的实时数据交互流程", true);
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                if (HKDevice.IsConnected)
-                {
-                    ManualOpen();
-                    ManualClose();
-                    HKPlcRead();
-                }
+                HKPlcRead();
+                GetStatus();
                 Thread.Sleep(10);
-            }), "手动操作", true);
+            }), "海科PLC实时数据", true);
         }
+        /// <summary>
+        /// 气缸的传感器值
+        /// </summary>
         private void GetStatus()
         {
             for (int i = 0; i < 8; i++)
@@ -111,199 +139,61 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             }
             for (int i = 0; i < 7; i++)
             {
-                GVL_SmallStation.GetInstance.Cylinder_JackInfo[i + 8] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX0." + i);
+                GVL_SmallStation.GetInstance.Cylinder_JackInfo[i + 8] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX1." + i);
             }
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[20] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX3.6");//进料桶气缸
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[21] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX3.7");//出料筒气缸1
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[22] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.0");//出料筒气缸2
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[23] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.1");//出料筒气缸3
+
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[24] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.2");//托盘1_1气缸
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[25] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.3");//托盘1_2气缸
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[26] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.4");//托盘2_1气缸
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[27] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.5");//托盘2_2气缸
         }
-        private void ManualOpen()
-        {
-            ActionManage.GetInstance.Register(new Action<object>((o) =>
-            {
-                if (o != null)
-                {
-                    if (o.ToString().Contains("升降气缸"))
-                    {
-                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
-                        if (index >= 1 && index <= 15)
-                        {
-                            string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
-                            if (index == 8) address = "DB5.DBX0.7";
-                            HKDevice.HK_PLC_S7.Write<bool>(address, true);
-                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：true");
-                        }
-                    }
-                    else if (o.ToString().Contains("阻挡气缸"))
-                    {
-                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
-                        if (index >= 1 && index <= 15)
-                        {
-                            string address = "";
-                            if (index == 1) address = "DB5.DBX1.7";
-                            if (index == 2) address = "DB5.DBX2.0";
-                            if (index == 3) address = "DB5.DBX2.1";
-                            if (index == 4) address = "DB5.DBX2.2";
-                            if (index == 5) address = "DB5.DBX2.3";
-                            if (index == 6) address = "DB5.DBX2.4";
-                            if (index == 7) address = "DB5.DBX2.5";
-                            if (index == 8) address = "DB5.DBX2.6";
-                            if (index == 9) address = "DB5.DBX2.7";
-                            if (index == 10) address = "DB5.DBX3.0";
-                            if (index == 11) address = "DB5.DBX3.1";
-                            if (index == 12) address = "DB5.DBX3.2";
-                            if (index == 13) address = "DB5.DBX3.3";
-                            if (index == 14) address = "DB5.DBX3.4";
-                            if (index == 15) address = "DB5.DBX3.5";
-                            HKDevice.HK_PLC_S7.Write<bool>(address, true);
-                        }
-                    }
-                    else if (o.ToString().Contains("进料桶顶升气缸"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.6", false);//默认顶升
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：false");
-                    }
-                    else if (o.ToString().Contains("出料桶顶升气缸1"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.7", true);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：true");
-                    }
-                    else if (o.ToString().Contains("出料桶顶升气缸2"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.0", true);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：true");
-                    }
-                    else if (o.ToString().Contains("出料桶顶升气缸3"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.1", true);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：true");
-                    }
-                    else if (o.ToString().Contains("托盘气缸1_1"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.2", false);//默认伸出
-                    }
-                    else if (o.ToString().Contains("托盘气缸1_2"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.3", false);
-                    }
-                    else if (o.ToString().Contains("托盘气缸2_1"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.4", false);
-                    }
-                    else if (o.ToString().Contains("托盘气缸2_2"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.5", false);
-                    }
-                }
-            }), "ManualOpen", true);//根据下发的配方ID将 托盘的位置信息添加到配方中
-        }
-        private void ManualClose()
+        /// <summary>
+        /// DB块的变量实时值
+        /// </summary>
+        private void HKPlcRead()
         {
-            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            if (HKDevice.IsConnected)
             {
-                if (o != null)
+                foreach (PropertyInfo item in typeof(PlcReadAddressDB3).GetProperties())
                 {
-                    if (o.ToString().Contains("升降气缸"))
-                    {
-                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
-                        if (index >= 1 && index <= 15)
-                        {
-                            string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
-                            if (index == 8) address = "DB5.DBX0.7";
-                            HKDevice.HK_PLC_S7.Write<bool>(address, false);
-                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：false");
-                        }
-                    }
-                    else if (o.ToString().Contains("阻挡气缸"))
-                    {
-                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
-                        if (index >= 1 && index <= 15)
-                        {
-                            string address = "";
-                            if (index == 1) address = "DB5.DBX1.7";
-                            if (index == 2) address = "DB5.DBX2.0";
-                            if (index == 3) address = "DB5.DBX2.1";
-                            if (index == 4) address = "DB5.DBX2.2";
-                            if (index == 5) address = "DB5.DBX2.3";
-                            if (index == 6) address = "DB5.DBX2.4";
-                            if (index == 7) address = "DB5.DBX2.5";
-                            if (index == 8) address = "DB5.DBX2.6";
-                            if (index == 9) address = "DB5.DBX2.7";
-                            if (index == 10) address = "DB5.DBX3.0";
-                            if (index == 11) address = "DB5.DBX3.1";
-                            if (index == 12) address = "DB5.DBX3.2";
-                            if (index == 13) address = "DB5.DBX3.3";
-                            if (index == 14) address = "DB5.DBX3.4";
-                            if (index == 15) address = "DB5.DBX3.5";
-                            HKDevice.HK_PLC_S7.Write<bool>(address, false);
-                        }
-                    }
-                    else if (o.ToString().Contains("进料桶顶升气缸"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.6", true);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：true");
-                    }
-                    else if (o.ToString().Contains("出料桶顶升气缸1"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.7", false);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：false");
-                    }
-                    else if (o.ToString().Contains("出料桶顶升气缸2"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.0", false);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：false");
-                    }
-                    else if (o.ToString().Contains("出料桶顶升气缸3"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.1", false);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：false");
-                    }
-                    else if (o.ToString().Contains("托盘气缸1_1"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.2", true);
-                    }
-                    else if (o.ToString().Contains("托盘气缸1_2"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.3", true);
-                    }
-                    else if (o.ToString().Contains("托盘气缸2_1"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.4", true);
-                    }
-                    else if (o.ToString().Contains("托盘气缸2_2"))
+                    int index = Array.FindIndex(CommData.ToArray(), p => p.Name == item.Name);
+                    if (index >= 0)
                     {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.5", true);
+                        CommData.ElementAt(index).Value = GVL_SmallStation.GetInstance.plcReadDataDB3.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.GetInstance.plcReadDataDB3, null).ToString();
                     }
                 }
-            }), "ManualClose", true);//根据下发的配方ID将 托盘的位置信息添加到配方中
-        }
-        public ObservableCollection<PlcInfos> CommData = new ObservableCollection<PlcInfos>();
-        private void HKPlcRead()
-        {
-            foreach (PropertyInfo item in typeof(PlcReadAddressDB3).GetProperties())
+            }
+            foreach (PropertyInfo item in typeof(GVL_SmallStation).GetProperties())
             {
-                int index = Array.FindIndex(CommData.ToArray(), p => p.Name == item.Name);
+                int index = Array.FindIndex(ProcessVar.ToArray(), p => p.Name == item.Name);
                 if (index >= 0)
                 {
-                    CommData.ElementAt(index).Value = GVL_SmallStation.plcReadDataDB3.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.plcReadDataDB3, null).ToString();
+                    ProcessVar.ElementAt(index).Value = GVL_SmallStation.GetInstance.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.GetInstance, null).ToString();
                 }
             }
         }
         /// <summary>
         /// 小料站和西门子PLC之间的实时数据
         /// </summary>
-        private void Real_Time_Data()
+        private void RealTimeData()
         {
             if (HKDevice.IsConnected)
             {
                 //获取系统状态
-                GVL_SmallStation.SystemStatus = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.0");//系统启停
-                GVL_SmallStation.SystemMode = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.1");//系统模式
-                GVL_SmallStation.SystemRunStatus = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.2");//系统暂停
+                GVL_SmallStation.GetInstance.PlcSystemIsAutoRun = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.0");//系统启停
+                GVL_SmallStation.GetInstance.PlcSystemMode = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.1");//系统模式
+                GVL_SmallStation.GetInstance.PlcSystemIsPause = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.2");//系统暂停
 
-                GVL_SmallStation.Station1HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX0.7");//工站1 有货架
-                GVL_SmallStation.Station2HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.0");//工站2 有货架
-                if (GVL_SmallStation.WindSendDosingComple)
+                GVL_SmallStation.GetInstance.Station1HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX0.7");//工站1 有货架
+                GVL_SmallStation.GetInstance.Station2HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.0");//工站2 有货架
+                if (GVL_SmallStation.GetInstance.WindSendDosingComple)
                 {
                     HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.7", true);
-                    GVL_SmallStation.WindSendDosingComple = false;
+                    GVL_SmallStation.GetInstance.WindSendDosingComple = false;
                     MessageNotify.GetInstance.ShowRunLog("风送配料完成信号，发给产线plc信号");
                 }
                 if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1"))
@@ -312,21 +202,20 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
                 if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.7"))//允许下配方1或者允许下配方2
                 {
-                    GVL_SmallStation.IsAllowSiemensSendRecipe = true;
+                    GVL_SmallStation.GetInstance.IsAllowSiemensSendRecipe = true;
                 }
-                GVL_SmallStation.Station1Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.1");
-                GVL_SmallStation.Station2Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.2");
-                GVL_SmallStation.Station1Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.3");
-                GVL_SmallStation.Station2Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.4");
-                GVL_SmallStation.RobotStatus = HKDevice.HK_PLC_S7.Read<ushort>("DB3.DBW100");
-                GVL_SmallStation.RobotProgramNum = HKDevice.HK_PLC_S7.Read<byte>("DB3.DBB102");
-
+                GVL_SmallStation.GetInstance.Station1Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.1");
+                GVL_SmallStation.GetInstance.Station2Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.2");
+                GVL_SmallStation.GetInstance.Station1Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.3");
+                GVL_SmallStation.GetInstance.Station2Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.4");
+                GVL_SmallStation.GetInstance.RobotStatus = HKDevice.HK_PLC_S7.Read<ushort>("DB3.DBW100");
+                GVL_SmallStation.GetInstance.RobotProgramNum = HKDevice.HK_PLC_S7.Read<byte>("DB3.DBB102");
             }
             if (SiemensDevice.IsConnected)
             {
                 ushort TrayCylinder = 0;
                 ushort TraySensor = 0;
-                if (GVL_SmallStation.Station1Sensor)
+                if (GVL_SmallStation.GetInstance.Station1Sensor)
                 {
                     TraySensor = TraySensor.SetBitValue(1, true);
                 }
@@ -334,7 +223,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     TraySensor = TraySensor.SetBitValue(0, false);
                 }
-                if (!GVL_SmallStation.Station1Cylinder)
+                if (!GVL_SmallStation.GetInstance.Station1Cylinder)
                 {
                     TrayCylinder = TrayCylinder.SetBitValue(1, true);
                 }
@@ -342,63 +231,59 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     TrayCylinder = TrayCylinder.SetBitValue(0, false);
                 }
-                this.SiemensDevice.Siemens_PLC_S7.Write<bool>("DB2231.DBX28.4", GVL_SmallStation.WindSendAllowAGVPutGet);
+                this.SiemensDevice.Siemens_PLC_S7.Write<bool>("DB2231.DBX28.4", GVL_SmallStation.GetInstance.WindSendAllowAGVPutGet);
                 this.SiemensDevice.Siemens_PLC_S7.Write<ushort>("DB2231.DBW190", TraySensor);//添加工位传感器的信号
                 this.SiemensDevice.Siemens_PLC_S7.Write<ushort>("DB2231.DBW192", TrayCylinder);//添加工位气缸的信号
                 ushort AGV_Put = (ushort)SiemensDevice.XL_Status.AgvFinishPut;
                 if (AGV_Put.Get16bitValue(1))
                 {
-                    GVL_SmallStation.AGV_PutTray1Finish = true;
+                    GVL_SmallStation.GetInstance.AGV_PutTray1Finish = true;
                 }
                 else
                 {
-                    GVL_SmallStation.AGV_PutTray1Finish = false;
+                    GVL_SmallStation.GetInstance.AGV_PutTray1Finish = false;
                 }
-
-
                 ushort AGV_Get = (ushort)SiemensDevice.XL_Status.AgvFinishGet;
-
-                if (AGV_Get.Get16bitValue(1))
+                if (AGV_Get.Get16bitValue(1)) 
                 {
-                    GVL_SmallStation.AGV_GetTray1Finish = true;
+                    GVL_SmallStation.GetInstance.AGV_GetTray1Finish = true; 
                 }
-                else
+                else 
                 {
-                    GVL_SmallStation.AGV_GetTray1Finish = false;
+                    GVL_SmallStation.GetInstance.AGV_GetTray1Finish = false;
                 }
             }
         }
 
         public void CancelOrder()
         {
-            if (GVL_SmallStation.Order_Cancel) //订单取消
+            if (GVL_SmallStation.GetInstance.Order_Cancel) //订单取消
             {
-                if (!string.IsNullOrEmpty(GVL_SmallStation.Order_CancelRecipeCode))
+                if (!string.IsNullOrEmpty(GVL_SmallStation.GetInstance.Order_CancelRecipeCode))
                 {
-                    string code = GVL_SmallStation.Order_CancelRecipeCode;
+                    string code = GVL_SmallStation.GetInstance.Order_CancelRecipeCode;
                     int index = Array.FindIndex(Json<RemoteRecipeDataColl>.Data.Recipes.ToArray(), p => p.RecipeCode == code);
-
-                    switch (GVL_SmallStation.OrderCancelStep)
+                    switch (GVL_SmallStation.GetInstance.OrderCancelStep)
                     {
                         case 0://前提条件判断
                             if (index == -1)
                             {
-                                GVL_SmallStation.OrderCancelStep = 30;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 30;
                                 MessageNotify.GetInstance.ShowRunLog($"配方中并未找到订单{code}");
                             }
                             else
                             {
-                                if (RecipeQueueTray1.Contains(GVL_SmallStation.Order_CancelRecipeCode))
+                                if (RecipeQueueTray1.Contains(GVL_SmallStation.GetInstance.Order_CancelRecipeCode))
                                 {
-                                    GVL_SmallStation.OrderCancelStep = 1;
+                                    GVL_SmallStation.GetInstance.OrderCancelStep = 1;
                                 }
-                                else if (RecipeQueueTray2.Contains(GVL_SmallStation.Order_CancelRecipeCode))
+                                else if (RecipeQueueTray2.Contains(GVL_SmallStation.GetInstance.Order_CancelRecipeCode))
                                 {
-                                    GVL_SmallStation.OrderCancelStep = 10;
+                                    GVL_SmallStation.GetInstance.OrderCancelStep = 10;
                                 }
                                 else
                                 {
-                                    GVL_SmallStation.OrderCancelStep = 20;
+                                    GVL_SmallStation.GetInstance.OrderCancelStep = 20;
                                 }
                             }
                             break;
@@ -410,34 +295,34 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
                                 HKDevice.HK_PLC_S7.Write("DB4.DBX2.1", true);
                                 MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，正在取消订单：{code}");
-                                GVL_SmallStation.OrderCancelStep = 2;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 2;
                             }
                             else
                             {
                                 MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
-                                GVL_SmallStation.OrderCancelStep = 3;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 3;
                             }
                             break;
                         case 2:
                             if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.5"))
                             {
-                                if (GVL_SmallStation.Station1Cylinder == false) 
+                                if (GVL_SmallStation.GetInstance.Station1Cylinder == false) 
                                 {
                                     GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
-                                    GVL_SmallStation.OrderCancelStep = 3;
+                                    GVL_SmallStation.GetInstance.OrderCancelStep = 3;
                                     MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
                                 }
                             }
                             break;
                         case 3:
                             SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
-                            GVL_SmallStation.OrderCancelStep = 4;
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 4;
                             break;
                         case 4:
                             if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
                             {
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
-                                GVL_SmallStation.OrderCancelStep = 9;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 9;
                                 MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
                             }
                             break;
@@ -447,34 +332,32 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
                             });
                             RecipeQueueTray1.TryDequeue(out code);
-                            GVL_SmallStation.Tray1LogicFinish = 0;
-                            GVL_SmallStation.Order_Cancel = false;
-                            GVL_SmallStation.Order_CancelRecipeCode = "";
-                            GVL_SmallStation.OrderCancelStep = 0;
+                            GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
+                            GVL_SmallStation.GetInstance.Order_Cancel = false;
+                            GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 0;
                             break;
-
-
                         case 10:
                             if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 != 0)
                             {
                                 GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
                                 HKDevice.HK_PLC_S7.Write("DB4.DBX2.2", true);
                                 MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，正在取消订单：{code}");
-                                GVL_SmallStation.OrderCancelStep = 11;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 11;
                             }
                             else
                             {
                                 MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
-                                GVL_SmallStation.OrderCancelStep = 12;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 12;
                             }
                             break;
                         case 11:
                             if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.6"))
                             {
-                                if (GVL_SmallStation.Station2Cylinder == false)
+                                if (GVL_SmallStation.GetInstance.Station2Cylinder == false)
                                 {
                                     GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
-                                    GVL_SmallStation.OrderCancelStep = 12;
+                                    GVL_SmallStation.GetInstance.OrderCancelStep = 12;
                                     MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
                                 }
                             }
@@ -482,13 +365,13 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
 
                         case 12:
                             SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
-                            GVL_SmallStation.OrderCancelStep = 13;
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 13;
                             break;
                         case 13:
                             if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
                             {
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
-                                GVL_SmallStation.OrderCancelStep = 14;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 14;
                                 MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
                             }
                             break;
@@ -498,22 +381,22 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
                             });
                             RecipeQueueTray2.TryDequeue(out code);
-                            GVL_SmallStation.Order_Cancel = false;
-                            GVL_SmallStation.Tray2LogicFinish = 0;
-                            GVL_SmallStation.Order_CancelRecipeCode = "";
-                            GVL_SmallStation.OrderCancelStep = 0;
+                            GVL_SmallStation.GetInstance.Order_Cancel = false;
+                            GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;
+                            GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 0;
                             break;
 
                         //20-29为订单还未下发至PLC
                         case 20:
                             SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
-                            GVL_SmallStation.OrderCancelStep = 21;
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 21;
                             break;
                         case 21:
                             if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
                             {
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
-                                GVL_SmallStation.OrderCancelStep = 29;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 29;
                                 MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
                             }
                             break;
@@ -522,29 +405,29 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             {
                                 Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
                             });
-                            GVL_SmallStation.Order_Cancel = false;
-                            GVL_SmallStation.Order_CancelRecipeCode = "";
-                            GVL_SmallStation.SiemensSendRecipeStatus = 0;
-                            GVL_SmallStation.OrderCancelStep = 0;
+                            GVL_SmallStation.GetInstance.Order_Cancel = false;
+                            GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 0;
                             break;
 
                         //30-39为订单还未下发至上位机
                         case 30:
                             SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
-                            GVL_SmallStation.OrderCancelStep = 31;
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 31;
                             break;
                         case 31:
                             if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
                             {
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
-                                GVL_SmallStation.OrderCancelStep = 39;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 39;
                                 MessageNotify.GetInstance.ShowRunLog($"西门子取消订单完成，订单号：{code}");
                             }
                             break;
                         case 39:
-                            GVL_SmallStation.Order_Cancel = false;
-                            GVL_SmallStation.Order_CancelRecipeCode = "";
-                            GVL_SmallStation.OrderCancelStep = 0;
+                            GVL_SmallStation.GetInstance.Order_Cancel = false;
+                            GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 0;
                             break;
                     }
                 }
@@ -568,12 +451,12 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             {
                                 if (SiemensDevice.XL_Status is XL_Status_DB status)
                                 {
-                                    switch (GVL_SmallStation.SiemensSendRecipeStatus)
+                                    switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus)
                                     {
                                         case 3:
                                             SiemensDevice.Siemens_PLC_S7.WriteString(2231, data.RecipeCode, 10);
                                             SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", true);
-                                            GVL_SmallStation.SiemensSendRecipeStatus = 4;
+                                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 4;
                                             MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，请求配料");
                                             break;
                                         case 4:
@@ -581,20 +464,20 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                             {
                                                 SiemensDevice.Siemens_PLC_S7.WriteString(2231, "", 10);//复位字符串
                                                 SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", false);
-                                                GVL_SmallStation.SiemensSendRecipeStatus = 5;
+                                                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 5;
                                                 MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料");
                                             }
                                             break;
                                         case 5:
                                             if (SiemensDevice.XL_Status.Dosing_Confirm == false)
                                             {
-                                                GVL_SmallStation.SiemensSendRecipeStatus = 6;
+                                                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 6;
                                                 MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料信号复位完成");
                                             }
                                             break;
                                         case 6:
                                             RecipeQueueTray1.Enqueue(data.RecipeCode);
-                                            GVL_SmallStation.SiemensSendRecipeStatus = 0;
+                                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
                                             MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，加入队列");
                                             break;
                                         default:
@@ -609,12 +492,12 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             {
                                 if (SiemensDevice.XL_Status is XL_Status_DB status)
                                 {
-                                    switch (GVL_SmallStation.SiemensSendRecipeStatus)
+                                    switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus)
                                     {
                                         case 3:
                                             SiemensDevice.Siemens_PLC_S7.WriteString(2231, data.RecipeCode, 10);
                                             SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", true);
-                                            GVL_SmallStation.SiemensSendRecipeStatus = 4;
+                                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 4;
                                             MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，请求配料");
                                             break;
                                         case 4:
@@ -622,20 +505,20 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                             {
                                                 SiemensDevice.Siemens_PLC_S7.WriteString(2231, "", 10);//复位字符串
                                                 SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", false);
-                                                GVL_SmallStation.SiemensSendRecipeStatus = 5;
+                                                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 5;
                                                 MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料");
                                             }
                                             break;
                                         case 5:
                                             if (SiemensDevice.XL_Status.Dosing_Confirm == false)
                                             {
-                                                GVL_SmallStation.SiemensSendRecipeStatus = 6;
+                                                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 6;
                                                 MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料信号复位完成");
                                             }
                                             break;
                                         case 6:
                                             RecipeQueueTray2.Enqueue(data.RecipeCode);
-                                            GVL_SmallStation.SiemensSendRecipeStatus = 0;
+                                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
                                             MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，加入队列");
                                             break;
                                         default:
@@ -650,8 +533,8 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     RecipeQueueTray1.Clear();
                     RecipeQueueTray2.Clear();
-                    /*GVL_SmallStation.Tray1LogicFinish = 0;
-                    GVL_SmallStation.Tray2LogicFinish = 0;*/
+                    /*GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
+                    GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;*/
                     GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
                     GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
                 }
@@ -683,14 +566,8 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     RecipeQueueTray1.Clear();
                     RecipeQueueTray2.Clear();
-                    /*GVL_SmallStation.Tray1LogicFinish = 0;
-                    GVL_SmallStation.Tray2LogicFinish = 0;*/
-
-                    GVL_SmallStation.GetInstance.DosingTray1 = false;
-                    GVL_SmallStation.GetInstance.DosingTray1Loc = 0;
-
-                    GVL_SmallStation.GetInstance.DosingTray2 = false;
-                    GVL_SmallStation.GetInstance.DosingTray2Loc = 0;
+                    /*GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
+                    GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;*/
 
                     GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
                     GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
@@ -702,29 +579,29 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         private void RecipeInfoToHKPLC()
         {
-            switch (GVL_SmallStation.Tray1LogicFinish)
+            switch (GVL_SmallStation.GetInstance.Tray1LogicFinish)
             {
                 case 0:
-                    if (GVL_SmallStation.AGV_PutTray1Finish && RecipeQueueTray1.Count > 0)
+                    if (GVL_SmallStation.GetInstance.AGV_PutTray1Finish && RecipeQueueTray1.Count > 0)
                     {
                         HKDevice.HK_PLC_S7.Write("DB4.DBX0.7", true);
-                        GVL_SmallStation.AGV_PutTray1Finish = false;
-                        GVL_SmallStation.Tray1LogicFinish = 1;
+                        GVL_SmallStation.GetInstance.AGV_PutTray1Finish = false;
+                        GVL_SmallStation.GetInstance.Tray1LogicFinish = 1;
                         MessageNotify.GetInstance.ShowRunLog("AGV到位 发送到位信号给plc");
                     }
                     break;
                 case 1:
-                    if (GVL_SmallStation.Station1HaveTray)
+                    if (GVL_SmallStation.GetInstance.Station1HaveTray)
                     {
                         HKDevice.HK_PLC_S7.Write("DB4.DBX0.7", false);
-                        GVL_SmallStation.Tray1LogicFinish = 2;
+                        GVL_SmallStation.GetInstance.Tray1LogicFinish = 2;
                         MessageNotify.GetInstance.ShowRunLog("托盘1有货架");
                     }
                     else
                     {
                         if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.5") == true)
                         {
-                            if (GVL_SmallStation.CylinderReset)
+                            if (GVL_SmallStation.GetInstance.CylinderReset)
                             {
                                 HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.5", true);
                             }
@@ -732,54 +609,55 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         }
                         else
                         {
-                            GVL_SmallStation.Tray1LogicFinish = 1;
+                            GVL_SmallStation.GetInstance.Tray1LogicFinish = 1;
                             HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.5", false);
                         }
                     }
                     break;
                 case 2:
-                    if (GVL_SmallStation.AGV_GetTray1Finish && GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 0)
+                    if (GVL_SmallStation.GetInstance.AGV_GetTray1Finish && GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 0)
                     {
                         HKDevice.HK_PLC_S7.Write("DB4.DBX1.1", true);
-                        GVL_SmallStation.Tray1LogicFinish = 3;
-                        MessageNotify.GetInstance.ShowRunLog("AGV取托盘完成");
+                        GVL_SmallStation.GetInstance.Tray1LogicFinish = 3;
+                        MessageNotify.GetInstance.ShowRunLog("AGV取托盘1完成,发送给海科信号后1s后复位");
                     }
                     break;
                 case 3:
-                    if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.7") == true)
+                    if (HKDevice.HK_PLC_S7.Read<bool>("DB4.DBX1.1") == true)
                     {
+                        Thread.Sleep(1000);
                         HKDevice.HK_PLC_S7.Write("DB4.DBX1.1", false);
-                        GVL_SmallStation.Tray1LogicFinish = 0;
-                        GVL_SmallStation.AGV_GetTray1Finish = false;
-                        MessageNotify.GetInstance.ShowRunLog("plc允许下配方，复位取托盘完成信号");
+                        GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
+                        GVL_SmallStation.GetInstance.AGV_GetTray1Finish = false;
+                        MessageNotify.GetInstance.ShowRunLog("AGV取托盘1完成，信号复位");
                     }
                     break;
                 default:
                     break;
             }
-            switch (GVL_SmallStation.Tray2LogicFinish)
+            switch (GVL_SmallStation.GetInstance.Tray2LogicFinish)
             {
                 case 0:
-                    if (GVL_SmallStation.AGV_PutTray2Finish)
+                    if (GVL_SmallStation.GetInstance.AGV_PutTray2Finish)
                     {
                         HKDevice.HK_PLC_S7.Write("DB4.DBX1.0", true);
-                        GVL_SmallStation.AGV_PutTray2Finish = false;
-                        GVL_SmallStation.Tray2LogicFinish = 1;
+                        GVL_SmallStation.GetInstance.AGV_PutTray2Finish = false;
+                        GVL_SmallStation.GetInstance.Tray2LogicFinish = 1;
                         MessageNotify.GetInstance.ShowRunLog("AGV到位 发送到位信号给plc");
                     }
                     break;
                 case 1:
-                    if (GVL_SmallStation.Station2HaveTray)
+                    if (GVL_SmallStation.GetInstance.Station2HaveTray)
                     {
                         HKDevice.HK_PLC_S7.Write("DB4.DBX1.0", false);
-                        GVL_SmallStation.Tray2LogicFinish = 2;
+                        GVL_SmallStation.GetInstance.Tray2LogicFinish = 2;
                         MessageNotify.GetInstance.ShowRunLog("托盘1有货架");
                     }
                     else
                     {
                         if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.6") == true)
                         {
-                            if (GVL_SmallStation.CylinderReset)
+                            if (GVL_SmallStation.GetInstance.CylinderReset)
                             {
                                 HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.6", true);
                             }
@@ -787,30 +665,32 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         }
                         else
                         {
-                            GVL_SmallStation.Tray2LogicFinish = 1;
+                            GVL_SmallStation.GetInstance.Tray2LogicFinish = 1;
                             HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.6", false);
                         }
                     }
                     break;
                 case 2:
-                    if (GVL_SmallStation.AGV_GetTray2Finish && GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 0)
+                    if (GVL_SmallStation.GetInstance.AGV_GetTray2Finish && GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 0)
                     {
                         HKDevice.HK_PLC_S7.Write("DB4.DBX1.2", true);
-                        GVL_SmallStation.Tray2LogicFinish = 3;
+                        GVL_SmallStation.GetInstance.Tray2LogicFinish = 3;
                     }
                     break;
                 case 3:
-                    if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.7") == true)
+                    if (HKDevice.HK_PLC_S7.Read<bool>("DB4.DBX1.2") == true)
                     {
+                        Thread.Sleep(1000);
                         HKDevice.HK_PLC_S7.Write("DB4.DBX1.2", false);
-                        GVL_SmallStation.Tray2LogicFinish = 0;
-                        GVL_SmallStation.AGV_GetTray2Finish = false;
+                        GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;
+                        GVL_SmallStation.GetInstance.AGV_GetTray2Finish = false;
                     }
                     break;
                 default:
                     break;
             }
-            if (RecipeQueueTray1.Count > 0 && GVL_SmallStation.Tray1LogicFinish == 2)
+            #region 托盘1配料
+            if (RecipeQueueTray1.Count > 0) /*&& GVL_SmallStation.GetInstance.Tray1LogicFinish == 2*/   //不需要等待AGV到位，就给PLC下发配方
             {
                 int index = Array.FindIndex(RemoteRecipes.ToArray(), p => p.RecipeCode == RecipeQueueTray1.ElementAt(0));
                 if (index >= 0 && index < RemoteRecipes.Count)
@@ -821,49 +701,53 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     string windSend = RemoteRecipes.ElementAt(index).ToString();
                     if (trayCode == 1)
                     {
-                        if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 0)
+                        //粉料仓下发配方
+                        if (GVL_SmallStation.GetInstance.IsUseWindSend && GVL_SmallStation.GetInstance.Tray1LogicFinish == 2 && GVL_SmallStation.GetInstance.WindSendDosing==false)
                         {
-                            StockBinInit();
-                            if (GVL_SmallStation.GetInstance.IsUseWindSend)
+                            GVL_SmallStation.GetInstance.WindSendDosing = true;
+                            WindSendData.TargetRecipeCode = code;
+                            WindSendData.IsAllowDosing = true;
+                            foreach (var item in RemoteRecipes.ElementAt(index).WindSend)
                             {
-                                WindSendData.TargetRecipeCode = code;
-                                WindSendData.IsAllowDosing = true;
-                                foreach (var item in RemoteRecipes.ElementAt(index).WindSend)
+                                if (item.RawMaterialName == "0037" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(0).RawMaterialName)
                                 {
-                                    if (item.RawMaterialName == "0037" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(0).RawMaterialName)
-                                    {
-                                        WindSendData.RawMaterial1_SetWeight = item.RawMaterialWeight;
-                                    }
-                                    if (item.RawMaterialName == "0038" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(1).RawMaterialName)
-                                    {
-                                        WindSendData.RawMaterial2_SetWeight = item.RawMaterialWeight;
-                                    }
-                                    if (item.RawMaterialName == "0039" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(2).RawMaterialName)
-                                    {
-                                        WindSendData.RawMaterial3_SetWeight = item.RawMaterialWeight;
-                                    }
-                                    if (item.RawMaterialName == "0045" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(3).RawMaterialName)
-                                    {
-                                        WindSendData.RawMaterial4_SetWeight = item.RawMaterialWeight;
-                                    }
-                                    if (item.RawMaterialName == "0046" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(4).RawMaterialName)
-                                    {
-                                        WindSendData.RawMaterial5_SetWeight = item.RawMaterialWeight;
-                                    }
+                                    WindSendData.RawMaterial1_SetWeight = item.RawMaterialWeight;
+                                }
+                                if (item.RawMaterialName == "0038" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(1).RawMaterialName)
+                                {
+                                    WindSendData.RawMaterial2_SetWeight = item.RawMaterialWeight;
+                                }
+                                if (item.RawMaterialName == "0039" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(2).RawMaterialName)
+                                {
+                                    WindSendData.RawMaterial3_SetWeight = item.RawMaterialWeight;
+                                }
+                                if (item.RawMaterialName == "0045" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(3).RawMaterialName)
+                                {
+                                    WindSendData.RawMaterial4_SetWeight = item.RawMaterialWeight;
+                                }
+                                if (item.RawMaterialName == "0046" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(4).RawMaterialName)
+                                {
+                                    WindSendData.RawMaterial5_SetWeight = item.RawMaterialWeight;
                                 }
-                                WindSendDevice.Siemens_PLC_S7.WriteClass<WindSend_Write>(WindSendData, 95);
                             }
+                            WindSendDevice.Siemens_PLC_S7.WriteClass<WindSend_Write>(WindSendData, 95);
+                        }
+                        if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 0)
+                        {
+                            StockBinInit();
+                            GVL_SmallStation.GetInstance.StockBinDosing = 0;
                             foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
                             {
                                 HKDevice.StockBinPar((uint)item.RawMaterialBarrelNum, (ushort)item.RawMaterialLocation);
+                                GVL_SmallStation.GetInstance.StockBinDosing= GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)item.RawMaterialLocation,true);//哪些仓位需要配料写入
                             }
                             HKDevice.HK_PLC_S7.Write("DB4.DBX1.3", true);
                             GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 1;
                             MessageNotify.GetInstance.ShowRunLog($"托盘1,配方：{recipeName}，下发完成");
                             GVL_SmallStation.GetInstance.time1 = DateTime.Now;
                         }
-
-                        if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.3") && GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 1)
+                        bool recipeReceviceFinish = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.3");
+                        if ( recipeReceviceFinish && GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 1)
                         {
                             HKDevice.HK_PLC_S7.Write("DB4.DBX1.3", false);
                             GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 2;
@@ -879,17 +763,33 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 {
                                     int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
                                     float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;//单位g转换kg
-                                    if (loc_index >= 0)
+                                    if (weight <= 0)
                                     {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//根据料仓编号 启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                        int i = (int)loc;
+                                        if (i >= 1 && i <= 8)
+                                        {
+                                            string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+                                            MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                        }
+                                        else if (i >= 9 && i <= 15)
+                                        {
+                                            string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+                                            MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                        }
+                                        GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
                                     }
                                     else
                                     {
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，错误没有找到{(int)loc}号仓的配方");
+                                        if (loc_index >= 0)
+                                        {
+                                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//根据料仓编号 启动并写入每个原料重量
+                                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                        }
+                                        else
+                                        {
+                                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，错误没有找到{(int)loc}号仓的配方");
+                                        }
                                     }
-                                    GVL_SmallStation.GetInstance.DosingTray1 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
                                     MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{(int)loc}号仓，正在配料");
                                 }
                             }
@@ -901,17 +801,33 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 {
                                     int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
                                     float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
-                                    if (loc_index >= 0)
+                                    if (weight <= 0)
                                     {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                        int i = (int)loc;
+                                        if (i >= 1 && i <= 8)
+                                        {
+                                            string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+                                            MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                        }
+                                        else if (i >= 9 && i <= 15)
+                                        {
+                                            string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+                                            MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                        }
+                                        GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
                                     }
                                     else
                                     {
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，错误没有找到{(int)loc}号仓的配方");
+                                        if (loc_index >= 0)
+                                        {
+                                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+                                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                        }
+                                        else
+                                        {
+                                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，错误没有找到{(int)loc}号仓的配方");
+                                        }
                                     }
-                                    GVL_SmallStation.GetInstance.DosingTray1 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
                                     MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{(int)loc}号仓，正在配料");
                                 }
                             }
@@ -923,17 +839,33 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 {
                                     int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
                                     float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
-                                    if (loc_index >= 0)
+                                    if (weight <= 0)
                                     {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                        int i = (int)loc;
+                                        if (i >= 1 && i <= 8)
+                                        {
+                                            string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+                                            MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                        }
+                                        else if (i >= 9 && i <= 15)
+                                        {
+                                            string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+                                            MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                        }
+                                        GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
                                     }
                                     else
                                     {
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，错误没有找到{(int)loc}号仓的配方");
-                                    }
-                                    GVL_SmallStation.GetInstance.DosingTray1 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
+                                        if (loc_index >= 0)
+                                        {
+                                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+                                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                        }
+                                        else
+                                        {
+                                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，错误没有找到{(int)loc}号仓的配方");
+                                        }
+                                    }
                                     MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{(int)loc}号仓，正在配料");
                                 }
                             }
@@ -945,35 +877,47 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 {
                                     int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
                                     float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
-                                    if (loc_index >= 0)
+                                    if (weight <= 0)
                                     {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                        int i = (int)loc;
+                                        if (i >= 1 && i <= 8)
+                                        {
+                                            string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+                                            MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                        }
+                                        else if (i >= 9 && i <= 15)
+                                        {
+                                            string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+                                            MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                        }
+                                        GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
                                     }
                                     else
                                     {
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，错误没有找到{(int)loc}号仓的配方");
+                                        if (loc_index >= 0)
+                                        {
+                                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+                                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                        }
+                                        else
+                                        {
+                                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，错误没有找到{(int)loc}号仓的配方");
+                                        }
                                     }
-                                    GVL_SmallStation.GetInstance.DosingTray1 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
                                     MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{(int)loc}号仓，正在配料");
                                 }
                             }
-                            /* if (GVL_SmallStation.GetInstance.DosingTray1 && GVL_SmallStation.GetInstance.DosingTray1Loc > 0 && GVL_SmallStation.GetInstance.DosingTray1Loc < 16)
-                             {
-                                 int i = GVL_SmallStation.GetInstance.DosingTray1Loc;*/
                             for (int i = 1; i < 16; i++)
                             {
-                                if (DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3)
+                                if ((DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3) && GVL_SmallStation.GetInstance.StockBinDosing.Get16bitValue((byte)i))
                                 {
                                     int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
                                     if (res >= 0)
                                     {
-                                        Thread.Sleep(GVL_SmallStation.Time);
-                                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成");
+                                        Thread.Sleep(GVL_SmallStation.GetInstance.Time);
                                         RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
                                         bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
-                                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，下料完成重量：{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}");
+                                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成,下料完成重量：{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}");
                                         float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000);
                                         int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
                                         if (iIndex >= 0)
@@ -988,14 +932,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                                 });
                                             }
                                         }
-                                        /*if (info)
-                                        {
-                                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送成功");
-                                        }
-                                        else
-                                        {
-                                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送失败");
-                                        }*/
                                         if (i >= 1 && i <= 8)
                                         {
                                             string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
@@ -1006,20 +942,28 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                             string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
                                             MessageNotify.GetInstance.ShowRunLog(commInfo1);
                                         }
-                                        GVL_SmallStation.GetInstance.DosingTray1 = false;
-                                        GVL_SmallStation.GetInstance.DosingTray1Loc = 0;
                                     }
+                                    GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
                                 }
                             }
                             if ((RTrig.GetInstance("配方配料完成").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1"))))
                             {
+                                if (GVL_SmallStation.GetInstance.StockBinDosing > 0) 
+                                {
+                                    for (int i = 1; i < 17; i++) 
+                                    {
+                                        if (GVL_SmallStation.GetInstance.StockBinDosing.Get16bitValue((byte)i)) 
+                                        {
+                                            MessageNotify.GetInstance.ShowRunLog($"料仓配料完成，但存在料仓未配料:{i}号仓");
+                                        }
+                                    }
+                                }
                                 var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
-                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成");
                                 foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
                                 {
                                     MessageNotify.GetInstance.ShowRunLog($"{item.RawMaterialName},下料重量：{item.Laying_Off_Weight}g");
                                 }
-                                if (SiemensDevice.IsConnected)
+                                if (SiemensDevice.IsConnected && !GVL_SmallStation.GetInstance.IsUseLocalRecipe)
                                 {
                                     RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
                                     RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
@@ -1046,7 +990,14 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     RecipeFinishInfo.Ask_For_Finish = true;
                                     RecipeFinishInfo.DosingTime = Convert.ToInt16(a);
                                     SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
+
+                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据反馈给西门子");
                                 }
+                                else 
+                                {
+                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据无法反馈给西门子，西门子设备未连接或处于本地配方");
+                                }
+                                GVL_SmallStation.GetInstance.WindSendDosing = false;
                                 App.Current.Dispatcher.Invoke(() =>
                                 {
                                     Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
@@ -1059,182 +1010,825 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     }
                 }
             }
-            if (RecipeQueueTray2.Count > 0 && GVL_SmallStation.Tray2LogicFinish == 2)
-            {
-                int index = Array.FindIndex(RemoteRecipes.ToArray(), p => p.RecipeCode == RecipeQueueTray2.ElementAt(0));
-                if (index >= 0 && index < RemoteRecipes.Count)
-                {
-                    string code = RemoteRecipes.ElementAt(index).RecipeCode;
-                    int trayCode = RemoteRecipes.ElementAt(index).TrayCode;
-                    string recipeName = RemoteRecipes.ElementAt(index).RecipeName;
-                    if (trayCode == 2)
-                    {
-                        if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 0)
-                        {
-                            StockBinInit();
-                            MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，初始化");
-                            foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
-                            {
-                                HKDevice.StockBinPar((uint)item.RawMaterialBarrelNum, (ushort)item.RawMaterialLocation, 2);
-                            }
-                            HKDevice.HK_PLC_S7.Write("DB4.DBX1.4", true);
-                            GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 1;
-                            MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，下发完成");
-                        }
+            //if (RecipeQueueTray1.Count > 0) /*&& GVL_SmallStation.GetInstance.Tray1LogicFinish == 2*/   //不需要等待AGV到位，就给PLC下发配方
+            //{
+            //    foreach (var queue in RecipeQueueTray1)
+            //    {
+            //        int index = Array.FindIndex(RemoteRecipes.ToArray(), p => p.RecipeCode == queue.ToString());
+            //        if (index >= 0 && index < RemoteRecipes.Count)
+            //        {
+            //            int trayCode = RemoteRecipes.ElementAt(index).TrayCode;
+            //            string code = RemoteRecipes.ElementAt(index).RecipeCode;
+            //            string recipeName = RemoteRecipes.ElementAt(index).RecipeName;
+            //            string windSend = RemoteRecipes.ElementAt(index).ToString();
+            //            if (trayCode == 1)
+            //            {
+            //                //粉料仓下发配方
+            //                if (GVL_SmallStation.GetInstance.IsUseWindSend && GVL_SmallStation.GetInstance.Tray1LogicFinish == 2 && GVL_SmallStation.GetInstance.WindSendDosing == false)
+            //                {
+            //                    GVL_SmallStation.GetInstance.WindSendDosing = true;
+            //                    WindSendData.TargetRecipeCode = code;
+            //                    WindSendData.IsAllowDosing = true;
+            //                    foreach (var item in RemoteRecipes.ElementAt(index).WindSend)
+            //                    {
+            //                        if (item.RawMaterialName == "0037" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(0).RawMaterialName)
+            //                        {
+            //                            WindSendData.RawMaterial1_SetWeight = item.RawMaterialWeight;
+            //                        }
+            //                        if (item.RawMaterialName == "0038" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(1).RawMaterialName)
+            //                        {
+            //                            WindSendData.RawMaterial2_SetWeight = item.RawMaterialWeight;
+            //                        }
+            //                        if (item.RawMaterialName == "0039" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(2).RawMaterialName)
+            //                        {
+            //                            WindSendData.RawMaterial3_SetWeight = item.RawMaterialWeight;
+            //                        }
+            //                        if (item.RawMaterialName == "0045" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(3).RawMaterialName)
+            //                        {
+            //                            WindSendData.RawMaterial4_SetWeight = item.RawMaterialWeight;
+            //                        }
+            //                        if (item.RawMaterialName == "0046" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(4).RawMaterialName)
+            //                        {
+            //                            WindSendData.RawMaterial5_SetWeight = item.RawMaterialWeight;
+            //                        }
+            //                    }
+            //                    WindSendDevice.Siemens_PLC_S7.WriteClass<WindSend_Write>(WindSendData, 95);
+            //                }
+            //                if (GVL_SmallStation.GetInstance.RecipeProcessStatus[0] == 0)
+            //                {
+            //                    StockBinInit();
+            //                    GVL_SmallStation.GetInstance.StockBinDosing = 0;
+            //                    HKDevice.IssueRecipeToPlc(RemoteRecipes.ElementAt(index).RawMaterial, 1);
+            //                    HKDevice.HK_PLC_S7.Write("DB4.DBX1.3", true);
+            //                    GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 1;
+            //                    MessageNotify.GetInstance.ShowRunLog($"托盘1,配方：{recipeName}，下发完成");
+            //                    GVL_SmallStation.GetInstance.time1 = DateTime.Now;
+            //                }
+            //                bool recipeReceviceFinish = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.3");
+            //                if (recipeReceviceFinish && GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 1)
+            //                {
+            //                    HKDevice.HK_PLC_S7.Write("DB4.DBX1.3", false);
+            //                    GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 2;
+            //                    MessageNotify.GetInstance.ShowRunLog($"托盘1,{ recipeName}plc端 配方接收完成");
+            //                }
+            //                if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 2)
+            //                {
+            //                    if (RTrig.GetInstance("DB3.DBX50.0").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.0")))
+            //                    {
+            //                        var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD10");
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{res}料仓，允许配料");
+            //                        if (res > 0 && res is float loc)
+            //                        {
+            //                            int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                            float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;//单位g转换kg
+            //                            if (weight <= 0)
+            //                            {
+            //                                int i = (int)loc;
+            //                                if (i >= 1 && i <= 8)
+            //                                {
+            //                                    string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo);
+            //                                }
+            //                                else if (i >= 9 && i <= 15)
+            //                                {
+            //                                    string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo1);
+            //                                }
+            //                                GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
+            //                            }
+            //                            else
+            //                            {
+            //                                if (loc_index >= 0)
+            //                                {
+            //                                    DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//根据料仓编号 启动并写入每个原料重量
+            //                                    GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                                }
+            //                                else
+            //                                {
+            //                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，错误没有找到{(int)loc}号仓的配方");
+            //                                }
+            //                            }
+            //                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{(int)loc}号仓，正在配料");
+            //                        }
+            //                    }
+            //                    else if (RTrig.GetInstance("DB3.DBX50.1").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.1")))
+            //                    {
+            //                        var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD14");
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{res}料仓，允许配料");
+            //                        if (res > 0 && res is float loc)
+            //                        {
+            //                            int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                            float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
+            //                            if (weight <= 0)
+            //                            {
+            //                                int i = (int)loc;
+            //                                if (i >= 1 && i <= 8)
+            //                                {
+            //                                    string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo);
+            //                                }
+            //                                else if (i >= 9 && i <= 15)
+            //                                {
+            //                                    string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo1);
+            //                                }
+            //                                GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
+            //                            }
+            //                            else
+            //                            {
+            //                                if (loc_index >= 0)
+            //                                {
+            //                                    DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+            //                                    GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                                }
+            //                                else
+            //                                {
+            //                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，错误没有找到{(int)loc}号仓的配方");
+            //                                }
+            //                            }
+            //                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{(int)loc}号仓，正在配料");
+            //                        }
+            //                    }
+            //                    else if (RTrig.GetInstance("DB3.DBX50.2").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.2")))
+            //                    {
+            //                        var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD18");
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{res}料仓，允许配料");
+            //                        if (res > 0 && res is float loc)
+            //                        {
+            //                            int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                            float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
+            //                            if (weight <= 0)
+            //                            {
+            //                                int i = (int)loc;
+            //                                if (i >= 1 && i <= 8)
+            //                                {
+            //                                    string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo);
+            //                                }
+            //                                else if (i >= 9 && i <= 15)
+            //                                {
+            //                                    string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo1);
+            //                                }
+            //                                GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
+            //                            }
+            //                            else
+            //                            {
+            //                                if (loc_index >= 0)
+            //                                {
+            //                                    DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+            //                                    GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                                }
+            //                                else
+            //                                {
+            //                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，错误没有找到{(int)loc}号仓的配方");
+            //                                }
+            //                            }
+            //                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{(int)loc}号仓，正在配料");
+            //                        }
+            //                    }
+            //                    else if (RTrig.GetInstance("DB3.DBX50.3").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.3")))
+            //                    {
+            //                        var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD22");
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{res}料仓，允许配料");
+            //                        if (res > 0 && res is float loc)
+            //                        {
+            //                            int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                            float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
+            //                            if (weight <= 0)
+            //                            {
+            //                                int i = (int)loc;
+            //                                if (i >= 1 && i <= 8)
+            //                                {
+            //                                    string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo);
+            //                                }
+            //                                else if (i >= 9 && i <= 15)
+            //                                {
+            //                                    string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo1);
+            //                                }
+            //                                GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
+            //                            }
+            //                            else
+            //                            {
+            //                                if (loc_index >= 0)
+            //                                {
+            //                                    DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+            //                                    GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                                }
+            //                                else
+            //                                {
+            //                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，错误没有找到{(int)loc}号仓的配方");
+            //                                }
+            //                            }
+            //                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{(int)loc}号仓，正在配料");
+            //                        }
+            //                    }
+            //                    for (int i = 1; i < 16; i++)
+            //                    {
+            //                        if ((DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3) && GVL_SmallStation.GetInstance.StockBinDosing.Get16bitValue((byte)i))
+            //                        {
+            //                            int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
+            //                            if (res >= 0)
+            //                            {
+            //                                Thread.Sleep(GVL_SmallStation.GetInstance.Time);
+            //                                RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
+            //                                bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
+            //                                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成,下料完成重量：{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}");
+            //                                float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000);
+            //                                int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
+            //                                if (iIndex >= 0)
+            //                                {
+            //                                    if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
+            //                                    {
+            //                                        HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
+            //                                        App.Current.Dispatcher.Invoke(() =>
+            //                                        {
+            //                                            MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
+            //                                            HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
+            //                                        });
+            //                                    }
+            //                                }
+            //                                if (i >= 1 && i <= 8)
+            //                                {
+            //                                    string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo);
+            //                                }
+            //                                else if (i >= 9 && i <= 15)
+            //                                {
+            //                                    string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo1);
+            //                                }
+            //                            }
+            //                            GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
+            //                        }
+            //                    }
+            //                    if ((RTrig.GetInstance("配方配料完成").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1"))))
+            //                    {
+            //                        if (GVL_SmallStation.GetInstance.StockBinDosing > 0)
+            //                        {
+            //                            for (int i = 1; i < 17; i++)
+            //                            {
+            //                                if (GVL_SmallStation.GetInstance.StockBinDosing.Get16bitValue((byte)i))
+            //                                {
+            //                                    MessageNotify.GetInstance.ShowRunLog($"料仓配料完成，但存在料仓未配料:{i}号仓");
+            //                                }
+            //                            }
+            //                        }
+            //                        var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
+            //                        foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
+            //                        {
+            //                            MessageNotify.GetInstance.ShowRunLog($"{item.RawMaterialName},下料重量：{item.Laying_Off_Weight}g");
+            //                        }
+            //                        if (SiemensDevice.IsConnected && !GVL_SmallStation.GetInstance.IsUseLocalRecipe)
+            //                        {
+            //                            RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
+            //                            RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
+            //                            RecipeFinishInfo.Job_No = (short)trayCode;
+            //                            for (int i = 0; i < 20; i++)
+            //                            {
+            //                                RecipeFinishInfo.Material[i] = new UDT1();
+            //                            }
+            //                            for (int i = 0; i < 10; i++)
+            //                            {
+            //                                RecipeFinishInfo.Powder[i] = new UDT2();
+            //                            }
+            //                            for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
+            //                            {
+            //                                RecipeFinishInfo.Material[i].Material_Name = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
+            //                                RecipeFinishInfo.Material[i].Material_BarrelNum = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
+            //                                RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight * (float)0.001;
+            //                            }
+            //                            for (int i = 0; i < RemoteRecipes.ElementAt(index).WindSend.Count; i++)
+            //                            {
+            //                                RecipeFinishInfo.Powder[i].Powder_Weight = RemoteRecipes.ElementAt(index).WindSend.ElementAt(i).DosingCompleWeight;
+            //                            }
+            //                            double a = DateTime.Now.Subtract(GVL_SmallStation.GetInstance.time1).TotalSeconds;
+            //                            RecipeFinishInfo.Ask_For_Finish = true;
+            //                            RecipeFinishInfo.DosingTime = Convert.ToInt16(a);
+            //                            SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
 
-                        if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.4") && GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 1)
-                        {
-                            HKDevice.HK_PLC_S7.Write("DB3.DBX1.4", false);
-                            GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 2;
-                            MessageNotify.GetInstance.ShowRunLog($"配方：{recipeName}，plc端 配方接收完成");
-                        }
-                        if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 2)
-                        {
-                            if (RTrig.GetInstance("DB3.DBX50.4").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.4")))
-                            {
-                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD26");
-                                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，1号桶，{res}料仓，允许配料");
-                                if (res > 0 && res is float loc)
-                                {
-                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                    double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
-                                    if (loc_index >= 0)
-                                    {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//根据料仓编号 启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-                                    }
-                                    GVL_SmallStation.GetInstance.DosingTray2 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，1号桶，{(int)loc}号仓，配料完成");
-                                }
-                            }
-                            else if (RTrig.GetInstance("DB3.DBX50.5").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.5")))
-                            {
-                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD30");
-                                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，2号桶，{res}料仓，允许配料");
-                                if (res > 0 && res is float loc)
-                                {
-                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                    double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
-                                    if (loc_index >= 0)
-                                    {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-                                    }
-                                    GVL_SmallStation.GetInstance.DosingTray2 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，2号桶，{(int)loc}号仓，配料完成");
-                                }
-                            }
-                            else if (RTrig.GetInstance("DB3.DBX50.6").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.6")))
-                            {
-                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD34");
-                                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，3号桶，{res}料仓，允许配料");
-                                if (res > 0 && res is float loc)
-                                {
-                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                    double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
-                                    if (loc_index >= 0)
-                                    {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-                                    }
-                                    GVL_SmallStation.GetInstance.DosingTray2 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，3号桶，{(int)loc}号仓，配料完成");
-                                }
-                            }
-                            else if (RTrig.GetInstance("DB3.DBX50.7").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.7")))
-                            {
-                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD38");
-                                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，4号桶，{res}料仓，允许配料");
-                                if (res > 0 && res is float loc)
-                                {
-                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                    double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
-                                    if (loc_index >= 0)
-                                    {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-                                    }
-                                    GVL_SmallStation.GetInstance.DosingTray2 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，4号桶，{(int)loc}号仓，配料完成");
-                                }
-                            }
-                            if (GVL_SmallStation.GetInstance.DosingTray2 == true && GVL_SmallStation.GetInstance.DosingTray1 == false && GVL_SmallStation.GetInstance.DosingTray2Loc > 0 && GVL_SmallStation.GetInstance.DosingTray2Loc < 16)
-                            {
-                                Thread.Sleep(GVL_SmallStation.Time);
-                                int i = GVL_SmallStation.GetInstance.DosingTray2Loc;
-                                if (RTrig.GetInstance("Tray2StatusDevice" + i).Start(DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3))
-                                {
-                                    MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘2,配方：{recipeName},{i}号仓，配料完成");
-                                    int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
-                                    RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
-                                    bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
-                                    float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight);
-                                    int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
-                                    if (iIndex >= 0)
-                                    {
-                                        if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
-                                        {
-                                            HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
-                                            MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
-                                            HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
-                                        }
-                                    }
-                                    if (info)
-                                    {
-                                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送成功");
-                                    }
-                                    else
-                                    {
-                                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送失败");
-                                    }
-                                    if (i >= 1 && i <= 8)
-                                    {
-                                        string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
-                                        MessageNotify.GetInstance.ShowRunLog(commInfo);
-                                    }
-                                    else if (i >= 9 && i <= 15)
-                                    {
-                                        string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
-                                        MessageNotify.GetInstance.ShowRunLog(commInfo1);
-                                    }
-                                    GVL_SmallStation.GetInstance.DosingTray2 = false;
-                                    GVL_SmallStation.GetInstance.DosingTray2Loc = 0;
-                                }
-                            }
-                            if (RTrig.GetInstance("DB3.DBX1.2").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.2")))
-                            {
-                                var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
-                                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方{res.RecipeName},配料完成");
-                                RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
-                                RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
-                                for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
-                                {
-                                    RecipeFinishInfo.Material[i] = new UDT1();
-                                    RecipeFinishInfo.Material[i].Material_Name = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
-                                    RecipeFinishInfo.Material[i].Material_BarrelNum = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
-                                    RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight;
-                                }
-                                if (SiemensDevice.IsConnected)
-                                {
-                                    RecipeFinishInfo.Ask_For_Finish = true;
-                                    SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
-                                }
-                                App.Current.Dispatcher.Invoke(() =>
-                                {
-                                    Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
-                                });
-                                RecipeQueueTray2.TryDequeue(out code);
-                                HKDevice.HK_PLC_S7.Write("DB3.DBX1.2", false);
-                                GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
-                            }
-                        }
-                    }
-                }
-            }
+            //                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据反馈给西门子");
+            //                        }
+            //                        else
+            //                        {
+            //                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据无法反馈给西门子，西门子设备未连接或处于本地配方");
+            //                        }
+            //                        GVL_SmallStation.GetInstance.WindSendDosing = false;
+            //                        App.Current.Dispatcher.Invoke(() =>
+            //                        {
+            //                            Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
+            //                        });
+            //                        RecipeQueueTray1.TryDequeue(out code);
+            //                        HKDevice.HK_PLC_S7.Write("DB3.DBX1.1", false);
+            //                        GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
+            //                    }
+            //                }
+            //            }
+            //        }
+            //    }
+            //}            //if (RecipeQueueTray1.Count > 0) /*&& GVL_SmallStation.GetInstance.Tray1LogicFinish == 2*/   //不需要等待AGV到位，就给PLC下发配方
+            //{
+            //    foreach (var queue in RecipeQueueTray1)
+            //    {
+            //        int index = Array.FindIndex(RemoteRecipes.ToArray(), p => p.RecipeCode == queue.ToString());
+            //        if (index >= 0 && index < RemoteRecipes.Count)
+            //        {
+            //            int trayCode = RemoteRecipes.ElementAt(index).TrayCode;
+            //            string code = RemoteRecipes.ElementAt(index).RecipeCode;
+            //            string recipeName = RemoteRecipes.ElementAt(index).RecipeName;
+            //            string windSend = RemoteRecipes.ElementAt(index).ToString();
+            //            if (trayCode == 1)
+            //            {
+            //                //粉料仓下发配方
+            //                if (GVL_SmallStation.GetInstance.IsUseWindSend && GVL_SmallStation.GetInstance.Tray1LogicFinish == 2 && GVL_SmallStation.GetInstance.WindSendDosing == false)
+            //                {
+            //                    GVL_SmallStation.GetInstance.WindSendDosing = true;
+            //                    WindSendData.TargetRecipeCode = code;
+            //                    WindSendData.IsAllowDosing = true;
+            //                    foreach (var item in RemoteRecipes.ElementAt(index).WindSend)
+            //                    {
+            //                        if (item.RawMaterialName == "0037" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(0).RawMaterialName)
+            //                        {
+            //                            WindSendData.RawMaterial1_SetWeight = item.RawMaterialWeight;
+            //                        }
+            //                        if (item.RawMaterialName == "0038" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(1).RawMaterialName)
+            //                        {
+            //                            WindSendData.RawMaterial2_SetWeight = item.RawMaterialWeight;
+            //                        }
+            //                        if (item.RawMaterialName == "0039" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(2).RawMaterialName)
+            //                        {
+            //                            WindSendData.RawMaterial3_SetWeight = item.RawMaterialWeight;
+            //                        }
+            //                        if (item.RawMaterialName == "0045" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(3).RawMaterialName)
+            //                        {
+            //                            WindSendData.RawMaterial4_SetWeight = item.RawMaterialWeight;
+            //                        }
+            //                        if (item.RawMaterialName == "0046" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(4).RawMaterialName)
+            //                        {
+            //                            WindSendData.RawMaterial5_SetWeight = item.RawMaterialWeight;
+            //                        }
+            //                    }
+            //                    WindSendDevice.Siemens_PLC_S7.WriteClass<WindSend_Write>(WindSendData, 95);
+            //                }
+            //                if (GVL_SmallStation.GetInstance.RecipeProcessStatus[0] == 0)
+            //                {
+            //                    StockBinInit();
+            //                    GVL_SmallStation.GetInstance.StockBinDosing = 0;
+            //                    HKDevice.IssueRecipeToPlc(RemoteRecipes.ElementAt(index).RawMaterial, 1);
+            //                    HKDevice.HK_PLC_S7.Write("DB4.DBX1.3", true);
+            //                    GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 1;
+            //                    MessageNotify.GetInstance.ShowRunLog($"托盘1,配方：{recipeName}，下发完成");
+            //                    GVL_SmallStation.GetInstance.time1 = DateTime.Now;
+            //                }
+            //                bool recipeReceviceFinish = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.3");
+            //                if (recipeReceviceFinish && GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 1)
+            //                {
+            //                    HKDevice.HK_PLC_S7.Write("DB4.DBX1.3", false);
+            //                    GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 2;
+            //                    MessageNotify.GetInstance.ShowRunLog($"托盘1,{ recipeName}plc端 配方接收完成");
+            //                }
+            //                if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 2)
+            //                {
+            //                    if (RTrig.GetInstance("DB3.DBX50.0").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.0")))
+            //                    {
+            //                        var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD10");
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{res}料仓，允许配料");
+            //                        if (res > 0 && res is float loc)
+            //                        {
+            //                            int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                            float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;//单位g转换kg
+            //                            if (weight <= 0)
+            //                            {
+            //                                int i = (int)loc;
+            //                                if (i >= 1 && i <= 8)
+            //                                {
+            //                                    string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo);
+            //                                }
+            //                                else if (i >= 9 && i <= 15)
+            //                                {
+            //                                    string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo1);
+            //                                }
+            //                                GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
+            //                            }
+            //                            else
+            //                            {
+            //                                if (loc_index >= 0)
+            //                                {
+            //                                    DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//根据料仓编号 启动并写入每个原料重量
+            //                                    GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                                }
+            //                                else
+            //                                {
+            //                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，错误没有找到{(int)loc}号仓的配方");
+            //                                }
+            //                            }
+            //                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{(int)loc}号仓，正在配料");
+            //                        }
+            //                    }
+            //                    else if (RTrig.GetInstance("DB3.DBX50.1").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.1")))
+            //                    {
+            //                        var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD14");
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{res}料仓，允许配料");
+            //                        if (res > 0 && res is float loc)
+            //                        {
+            //                            int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                            float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
+            //                            if (weight <= 0)
+            //                            {
+            //                                int i = (int)loc;
+            //                                if (i >= 1 && i <= 8)
+            //                                {
+            //                                    string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo);
+            //                                }
+            //                                else if (i >= 9 && i <= 15)
+            //                                {
+            //                                    string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo1);
+            //                                }
+            //                                GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
+            //                            }
+            //                            else
+            //                            {
+            //                                if (loc_index >= 0)
+            //                                {
+            //                                    DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+            //                                    GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                                }
+            //                                else
+            //                                {
+            //                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，错误没有找到{(int)loc}号仓的配方");
+            //                                }
+            //                            }
+            //                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{(int)loc}号仓，正在配料");
+            //                        }
+            //                    }
+            //                    else if (RTrig.GetInstance("DB3.DBX50.2").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.2")))
+            //                    {
+            //                        var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD18");
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{res}料仓，允许配料");
+            //                        if (res > 0 && res is float loc)
+            //                        {
+            //                            int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                            float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
+            //                            if (weight <= 0)
+            //                            {
+            //                                int i = (int)loc;
+            //                                if (i >= 1 && i <= 8)
+            //                                {
+            //                                    string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo);
+            //                                }
+            //                                else if (i >= 9 && i <= 15)
+            //                                {
+            //                                    string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo1);
+            //                                }
+            //                                GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
+            //                            }
+            //                            else
+            //                            {
+            //                                if (loc_index >= 0)
+            //                                {
+            //                                    DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+            //                                    GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                                }
+            //                                else
+            //                                {
+            //                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，错误没有找到{(int)loc}号仓的配方");
+            //                                }
+            //                            }
+            //                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{(int)loc}号仓，正在配料");
+            //                        }
+            //                    }
+            //                    else if (RTrig.GetInstance("DB3.DBX50.3").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.3")))
+            //                    {
+            //                        var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD22");
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{res}料仓，允许配料");
+            //                        if (res > 0 && res is float loc)
+            //                        {
+            //                            int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                            float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
+            //                            if (weight <= 0)
+            //                            {
+            //                                int i = (int)loc;
+            //                                if (i >= 1 && i <= 8)
+            //                                {
+            //                                    string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo);
+            //                                }
+            //                                else if (i >= 9 && i <= 15)
+            //                                {
+            //                                    string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo1);
+            //                                }
+            //                                GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
+            //                            }
+            //                            else
+            //                            {
+            //                                if (loc_index >= 0)
+            //                                {
+            //                                    DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+            //                                    GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                                }
+            //                                else
+            //                                {
+            //                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，错误没有找到{(int)loc}号仓的配方");
+            //                                }
+            //                            }
+            //                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{(int)loc}号仓，正在配料");
+            //                        }
+            //                    }
+            //                    for (int i = 1; i < 16; i++)
+            //                    {
+            //                        if ((DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3) && GVL_SmallStation.GetInstance.StockBinDosing.Get16bitValue((byte)i))
+            //                        {
+            //                            int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
+            //                            if (res >= 0)
+            //                            {
+            //                                Thread.Sleep(GVL_SmallStation.GetInstance.Time);
+            //                                RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
+            //                                bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
+            //                                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成,下料完成重量：{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}");
+            //                                float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000);
+            //                                int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
+            //                                if (iIndex >= 0)
+            //                                {
+            //                                    if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
+            //                                    {
+            //                                        HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
+            //                                        App.Current.Dispatcher.Invoke(() =>
+            //                                        {
+            //                                            MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
+            //                                            HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
+            //                                        });
+            //                                    }
+            //                                }
+            //                                if (i >= 1 && i <= 8)
+            //                                {
+            //                                    string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo);
+            //                                }
+            //                                else if (i >= 9 && i <= 15)
+            //                                {
+            //                                    string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+            //                                    MessageNotify.GetInstance.ShowRunLog(commInfo1);
+            //                                }
+            //                            }
+            //                            GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
+            //                        }
+            //                    }
+            //                    if ((RTrig.GetInstance("配方配料完成").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1"))))
+            //                    {
+            //                        if (GVL_SmallStation.GetInstance.StockBinDosing > 0)
+            //                        {
+            //                            for (int i = 1; i < 17; i++)
+            //                            {
+            //                                if (GVL_SmallStation.GetInstance.StockBinDosing.Get16bitValue((byte)i))
+            //                                {
+            //                                    MessageNotify.GetInstance.ShowRunLog($"料仓配料完成，但存在料仓未配料:{i}号仓");
+            //                                }
+            //                            }
+            //                        }
+            //                        var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
+            //                        foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
+            //                        {
+            //                            MessageNotify.GetInstance.ShowRunLog($"{item.RawMaterialName},下料重量：{item.Laying_Off_Weight}g");
+            //                        }
+            //                        if (SiemensDevice.IsConnected && !GVL_SmallStation.GetInstance.IsUseLocalRecipe)
+            //                        {
+            //                            RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
+            //                            RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
+            //                            RecipeFinishInfo.Job_No = (short)trayCode;
+            //                            for (int i = 0; i < 20; i++)
+            //                            {
+            //                                RecipeFinishInfo.Material[i] = new UDT1();
+            //                            }
+            //                            for (int i = 0; i < 10; i++)
+            //                            {
+            //                                RecipeFinishInfo.Powder[i] = new UDT2();
+            //                            }
+            //                            for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
+            //                            {
+            //                                RecipeFinishInfo.Material[i].Material_Name = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
+            //                                RecipeFinishInfo.Material[i].Material_BarrelNum = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
+            //                                RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight * (float)0.001;
+            //                            }
+            //                            for (int i = 0; i < RemoteRecipes.ElementAt(index).WindSend.Count; i++)
+            //                            {
+            //                                RecipeFinishInfo.Powder[i].Powder_Weight = RemoteRecipes.ElementAt(index).WindSend.ElementAt(i).DosingCompleWeight;
+            //                            }
+            //                            double a = DateTime.Now.Subtract(GVL_SmallStation.GetInstance.time1).TotalSeconds;
+            //                            RecipeFinishInfo.Ask_For_Finish = true;
+            //                            RecipeFinishInfo.DosingTime = Convert.ToInt16(a);
+            //                            SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
+
+            //                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据反馈给西门子");
+            //                        }
+            //                        else
+            //                        {
+            //                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据无法反馈给西门子，西门子设备未连接或处于本地配方");
+            //                        }
+            //                        GVL_SmallStation.GetInstance.WindSendDosing = false;
+            //                        App.Current.Dispatcher.Invoke(() =>
+            //                        {
+            //                            Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
+            //                        });
+            //                        RecipeQueueTray1.TryDequeue(out code);
+            //                        HKDevice.HK_PLC_S7.Write("DB3.DBX1.1", false);
+            //                        GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
+            //                    }
+            //                }
+            //            }
+            //        }
+            //    }
+            //}
+            #endregion
+            #region 托盘2配料 ---硬件不具备条件，不使用
+            //if (RecipeQueueTray2.Count > 0 && GVL_SmallStation.GetInstance.Tray2LogicFinish == 2)
+            //{
+            //    int index = Array.FindIndex(RemoteRecipes.ToArray(), p => p.RecipeCode == RecipeQueueTray2.ElementAt(0));
+            //    if (index >= 0 && index < RemoteRecipes.Count)
+            //    {
+            //        string code = RemoteRecipes.ElementAt(index).RecipeCode;
+            //        int trayCode = RemoteRecipes.ElementAt(index).TrayCode;
+            //        string recipeName = RemoteRecipes.ElementAt(index).RecipeName;
+            //        if (trayCode == 2)
+            //        {
+            //            if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 0)
+            //            {
+            //                StockBinInit();
+            //                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，初始化");
+            //                foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
+            //                {
+            //                    HKDevice.StockBinPar((uint)item.RawMaterialBarrelNum, (ushort)item.RawMaterialLocation, 2);
+            //                }
+            //                HKDevice.HK_PLC_S7.Write("DB4.DBX1.4", true);
+            //                GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 1;
+            //                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，下发完成");
+            //            }
+
+            //            if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.4") && GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 1)
+            //            {
+            //                HKDevice.HK_PLC_S7.Write("DB3.DBX1.4", false);
+            //                GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 2;
+            //                MessageNotify.GetInstance.ShowRunLog($"配方：{recipeName}，plc端 配方接收完成");
+            //            }
+            //            if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 2)
+            //            {
+            //                if (RTrig.GetInstance("DB3.DBX50.4").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.4")))
+            //                {
+            //                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD26");
+            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，1号桶，{res}料仓，允许配料");
+            //                    if (res > 0 && res is float loc)
+            //                    {
+            //                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                        double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
+            //                        if (loc_index >= 0)
+            //                        {
+            //                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//根据料仓编号 启动并写入每个原料重量
+            //                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                        }
+            //                        GVL_SmallStation.GetInstance.DosingTray2 = true;
+            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，1号桶，{(int)loc}号仓，配料完成");
+            //                    }
+            //                }
+            //                else if (RTrig.GetInstance("DB3.DBX50.5").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.5")))
+            //                {
+            //                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD30");
+            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，2号桶，{res}料仓，允许配料");
+            //                    if (res > 0 && res is float loc)
+            //                    {
+            //                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                        double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
+            //                        if (loc_index >= 0)
+            //                        {
+            //                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
+            //                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                        }
+            //                        GVL_SmallStation.GetInstance.DosingTray2 = true;
+            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，2号桶，{(int)loc}号仓，配料完成");
+            //                    }
+            //                }
+            //                else if (RTrig.GetInstance("DB3.DBX50.6").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.6")))
+            //                {
+            //                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD34");
+            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，3号桶，{res}料仓，允许配料");
+            //                    if (res > 0 && res is float loc)
+            //                    {
+            //                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                        double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
+            //                        if (loc_index >= 0)
+            //                        {
+            //                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
+            //                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                        }
+            //                        GVL_SmallStation.GetInstance.DosingTray2 = true;
+            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，3号桶，{(int)loc}号仓，配料完成");
+            //                    }
+            //                }
+            //                else if (RTrig.GetInstance("DB3.DBX50.7").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.7")))
+            //                {
+            //                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD38");
+            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，4号桶，{res}料仓，允许配料");
+            //                    if (res > 0 && res is float loc)
+            //                    {
+            //                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                        double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
+            //                        if (loc_index >= 0)
+            //                        {
+            //                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
+            //                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                        }
+            //                        GVL_SmallStation.GetInstance.DosingTray2 = true;
+            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，4号桶，{(int)loc}号仓，配料完成");
+            //                    }
+            //                }
+            //                if (GVL_SmallStation.GetInstance.DosingTray2 == true && GVL_SmallStation.GetInstance.DosingTray1 == false && GVL_SmallStation.GetInstance.DosingTray2Loc > 0 && GVL_SmallStation.GetInstance.DosingTray2Loc < 16)
+            //                {
+            //                    Thread.Sleep(GVL_SmallStation.GetInstance.Time);
+            //                    int i = GVL_SmallStation.GetInstance.DosingTray2Loc;
+            //                    if (RTrig.GetInstance("Tray2StatusDevice" + i).Start(DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3))
+            //                    {
+            //                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘2,配方：{recipeName},{i}号仓，配料完成");
+            //                        int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
+            //                        RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
+            //                        bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
+            //                        float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight);
+            //                        int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
+            //                        if (iIndex >= 0)
+            //                        {
+            //                            if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
+            //                            {
+            //                                HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
+            //                                App.Current.Dispatcher.Invoke(() =>
+            //                                {
+            //                                    MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
+            //                                    HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
+            //                                });
+            //                            }
+            //                        }
+            //                        if (info)
+            //                        {
+            //                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送成功");
+            //                        }
+            //                        else
+            //                        {
+            //                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送失败");
+            //                        }
+            //                        if (i >= 1 && i <= 8)
+            //                        {
+            //                            string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+            //                            MessageNotify.GetInstance.ShowRunLog(commInfo);
+            //                        }
+            //                        else if (i >= 9 && i <= 15)
+            //                        {
+            //                            string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+            //                            MessageNotify.GetInstance.ShowRunLog(commInfo1);
+            //                        }
+            //                        GVL_SmallStation.GetInstance.DosingTray2 = false;
+            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = 0;
+            //                    }
+            //                }
+            //                if (RTrig.GetInstance("DB3.DBX1.2").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.2")))
+            //                {
+            //                    var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
+            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方{res.RecipeName},配料完成");
+            //                    RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
+            //                    RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
+            //                    for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
+            //                    {
+            //                        RecipeFinishInfo.Material[i] = new UDT1();
+            //                        RecipeFinishInfo.Material[i].Material_Name = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
+            //                        RecipeFinishInfo.Material[i].Material_BarrelNum = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
+            //                        RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight;
+            //                    }
+            //                    if (SiemensDevice.IsConnected)
+            //                    {
+            //                        RecipeFinishInfo.Ask_For_Finish = true;
+            //                        SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
+            //                    }
+            //                    App.Current.Dispatcher.Invoke(() =>
+            //                    {
+            //                        Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
+            //                    });
+            //                    RecipeQueueTray2.TryDequeue(out code);
+            //                    HKDevice.HK_PLC_S7.Write("DB3.DBX1.2", false);
+            //                    GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
+            //                }
+            //            }
+            //        }
+            //    }
+            //}
+            #endregion
         }
         private void StockBinInit()
         {
@@ -1246,24 +1840,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }
         }
-        private void DosingDevice(int Index, int DeviceID)
-        {
-            if (RTrig.GetInstance("Tray2StatusDevice" + DeviceID).Start(DeviceInquire.GetInstance.GetDevice(DeviceID).deviceStatus.RunStatus == 3))
-            {
-                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘2,配方：{RemoteRecipes.ElementAt(Index).RecipeName},{DeviceID}号仓，配料完成");
-                int res = Array.FindIndex(RemoteRecipes.ElementAt(Index).RawMaterial.ToArray(), p => p.RawMaterialLocation == DeviceID);
-                RemoteRecipes.ElementAt(Index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(DeviceID).deviceStatus.CutWeightFeedback;
-                DeviceInquire.GetInstance.GetDevice(DeviceID).StatusReset();
-                if (DeviceID >= 1 && DeviceID <= 8)
-                {
-                    HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (DeviceID - 1), true);
-                }
-                else if (DeviceID >= 9 && DeviceID <= 15)
-                {
-                    HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (DeviceID - 9), true);
-                }
-            }
-        }
         /// <summary>
         /// 料仓的位置和原料名称的对应
         /// </summary>
@@ -1281,23 +1857,212 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }
         }
-        public void plcVarMonitor() 
+        /// <summary>
+        /// PLC的DB3变量列表
+        /// </summary>
+        public void PlcVarMonitor()
         {
             foreach (PropertyInfo item in typeof(PlcReadAddressDB3).GetProperties())
             {
-                CommData.Add(new PlcInfos()
+                if (Attribute.IsDefined(item, typeof(VarCommAttribute)))
                 {
-                    Count = CommData.Count + 1,
-                    Name = item.Name,
-                    Address = GVL_SmallStation.plcReadDataDB3.GetType().GetProperty(item.Name).GetCustomAttribute<PlcCommAttribute>().Address,
-                    Type = item.PropertyType.ToString(),
-                    Describe = GVL_SmallStation.plcReadDataDB3.GetType().GetProperty(item.Name).GetCustomAttribute<PlcCommAttribute>().Describe,
-                    Value = GVL_SmallStation.plcReadDataDB3.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.plcReadDataDB3, null).ToString()
-                });
+                    CommData.Add(new PlcInfos()
+                    {
+                        Count = CommData.Count + 1,
+                        Name = item.Name,
+                        Address = item.GetCustomAttribute<VarCommAttribute>().Address,
+                        Type = item.PropertyType.ToString(),
+                        Describe = item.GetCustomAttribute<VarCommAttribute>().Describe,
+                        Value = item.GetValue(GVL_SmallStation.GetInstance.plcReadDataDB3).ToString(),
+                    });
+                }
+            }
+
+            foreach (PropertyInfo item in typeof(GVL_SmallStation).GetProperties())
+            {
+                if (Attribute.IsDefined(item, typeof(VarCommAttribute)))
+                {
+                    ProcessVar.Add(new PlcInfos()
+                    {
+                        Count = ProcessVar.Count + 1,
+                        Name = item.Name,
+                        Type = item.PropertyType.ToString(),
+                        Address = item.GetCustomAttribute<VarCommAttribute>().Address,
+                        Describe = item.GetCustomAttribute<VarCommAttribute>().Describe,
+                        Value = item.GetValue(GVL_SmallStation.GetInstance).ToString()
+                    });
+                }
             }
         }
         public void RegisterInit() 
         {
+            //手动控制气缸 DB5.DBX0.0~DB5.DBX4.5
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null)
+                {
+                    if (o.ToString().Contains("升降气缸"))
+                    {
+                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
+                        if (index >= 1 && index <= 15)
+                        {
+                            string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
+                            if (index == 8) address = "DB5.DBX0.7";
+                            HKDevice.HK_PLC_S7.Write<bool>(address, true);
+                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：true");
+                        }
+                    }
+                    else if (o.ToString().Contains("阻挡气缸"))
+                    {
+                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
+                        if (index >= 1 && index <= 15)
+                        {
+                            string address = "";
+                            if (index == 1) address = "DB5.DBX1.7";
+                            if (index == 2) address = "DB5.DBX2.0";
+                            if (index == 3) address = "DB5.DBX2.1";
+                            if (index == 4) address = "DB5.DBX2.2";
+                            if (index == 5) address = "DB5.DBX2.3";
+                            if (index == 6) address = "DB5.DBX2.4";
+                            if (index == 7) address = "DB5.DBX2.5";
+                            if (index == 8) address = "DB5.DBX2.6";
+                            if (index == 9) address = "DB5.DBX2.7";
+                            if (index == 10) address = "DB5.DBX3.0";
+                            if (index == 11) address = "DB5.DBX3.1";
+                            if (index == 12) address = "DB5.DBX3.2";
+                            if (index == 13) address = "DB5.DBX3.3";
+                            if (index == 14) address = "DB5.DBX3.4";
+                            if (index == 15) address = "DB5.DBX3.5";
+                            HKDevice.HK_PLC_S7.Write<bool>(address, true);
+                        }
+                    }
+                    else if (o.ToString().Contains("进料桶顶升气缸"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.6", false);//默认顶升
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：false");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.7", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：true");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.0", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：true");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸3"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.1", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：true");
+                    }
+                    else if (o.ToString().Contains("托盘气缸1_1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.2", false);//默认伸出
+                    }
+                    else if (o.ToString().Contains("托盘气缸1_2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.3", false);
+                    }
+                    else if (o.ToString().Contains("托盘气缸2_1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.4", false);
+                    }
+                    else if (o.ToString().Contains("托盘气缸2_2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.5", false);
+                    }
+                }
+            }), "ManualOpen", true);//根据下发的配方ID将 托盘的位置信息添加到配方中
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null)
+                {
+                    if (o.ToString().Contains("升降气缸"))
+                    {
+                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
+                        if (index >= 1 && index <= 15)
+                        {
+                            string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
+                            if (index == 8) address = "DB5.DBX0.7";
+                            HKDevice.HK_PLC_S7.Write<bool>(address, false);
+                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：false");
+                        }
+                    }
+                    else if (o.ToString().Contains("阻挡气缸"))
+                    {
+                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
+                        if (index >= 1 && index <= 15)
+                        {
+                            string address = "";
+                            if (index == 1) address = "DB5.DBX1.7";
+                            if (index == 2) address = "DB5.DBX2.0";
+                            if (index == 3) address = "DB5.DBX2.1";
+                            if (index == 4) address = "DB5.DBX2.2";
+                            if (index == 5) address = "DB5.DBX2.3";
+                            if (index == 6) address = "DB5.DBX2.4";
+                            if (index == 7) address = "DB5.DBX2.5";
+                            if (index == 8) address = "DB5.DBX2.6";
+                            if (index == 9) address = "DB5.DBX2.7";
+                            if (index == 10) address = "DB5.DBX3.0";
+                            if (index == 11) address = "DB5.DBX3.1";
+                            if (index == 12) address = "DB5.DBX3.2";
+                            if (index == 13) address = "DB5.DBX3.3";
+                            if (index == 14) address = "DB5.DBX3.4";
+                            if (index == 15) address = "DB5.DBX3.5";
+                            HKDevice.HK_PLC_S7.Write<bool>(address, false);
+                        }
+                    }
+                    else if (o.ToString().Contains("进料桶顶升气缸"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.6", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：true");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.7", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：false");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.0", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：false");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸3"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.1", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：false");
+                    }
+                    else if (o.ToString().Contains("托盘气缸1_1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.2", true);
+                    }
+                    else if (o.ToString().Contains("托盘气缸1_2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.3", true);
+                    }
+                    else if (o.ToString().Contains("托盘气缸2_1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.4", true);
+                    }
+                    else if (o.ToString().Contains("托盘气缸2_2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.5", true);
+                    }
+                }
+            }), "ManualClose", true);//根据下发的配方ID将 托盘的位置信息添加到配方中
+            //手动控制电机轴 DB5.DBX4.6~DB5.DBX5.2
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", true); }), "StartAxisLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", false); }), "StopAxisLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", true); }), "StartAxisMidCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", false); }), "StopAxisMidCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", true); }), "StartAxisUnLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", false); }), "StopAxisUnLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", true); }), "StartAxis1Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", false); }), "StopAxis1Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", true); }), "StartAxis2Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", false); }), "StopAxis2Command", true);
+
             //西门子配方处理
             ActionManage.GetInstance.Register(new Action<object>((res) =>
             {
@@ -1385,15 +2150,17 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             //                RecipeFinishInfo.Powder[i].Powder_Name = recipe.RawMaterial.ElementAt(i).RawMaterialName;
             //                RecipeFinishInfo.Powder[i].Powder_Weight = recipe.RawMaterial.ElementAt(i).Laying_Off_Weight;
             //            }
-            //            if (GVL_SmallStation.SiemensSendRecipeStatus == 6)
+            //            if (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus == 6)
             //            {
-            //                GVL_SmallStation.SiemensSendRecipeStatus = 7;
+            //                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 7;
             //                RecipeFinishInfo.Ask_For_Finish = true;
             //                SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
             //            }
             //        }
             //    }
             }), "SiemensRecipeFinish", true);
+
+            //将本地配方发送到西门子配方里，执行配料
             ActionManage.GetInstance.Register(new Action<Object>((res) =>
             {
                 if (res != null && res is RemoteRecipeData recipe)
@@ -1401,12 +2168,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     Json<RemoteRecipeDataColl>.Data.Recipes.Add(recipe);
                 }
             }), "LocalSimulationRecipeIssue", true);
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
-                GVL_SmallStation.SiemensSendRecipeStatus = 0;
-                MessageNotify.GetInstance.ShowRunLog("系统流程复位，等待西门子重新下发订单");
-            }), "BPASystemReset", true);
+            
             //手动控制系统模式
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", true); }), "SystemStart", true);
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", false); }), "SystemStop", true);
@@ -1418,37 +2180,78 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.3", true); }), "ManualSystemReset", true);
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.4", true); }), "CLearRecipeInfo", true);
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX0.7", true); }), "AGVPutTrayFinish", true);
-            //手动控制电机轴
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", true); }), "StartAxisLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", false); }), "StopAxisLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", true); }), "StartAxisMidCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", false); }), "StopAxisMidCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", true); }), "StartAxisUnLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", false); }), "StopAxisUnLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", true); }), "StartAxis1Command", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", false); }), "StopAxis1Command", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", true); }), "StartAxis2Command", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", false); }), "StopAxis2Command", true);
+            ActionManage.GetInstance.Register(new Action(() =>
+            {
+                Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
+                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
+
+                GVL_SmallStation.GetInstance.Order_Cancel = false;
+                GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
+                GVL_SmallStation.GetInstance.OrderCancelStep = 0;
+
+                RecipeQueueTray1.Clear();
+                RecipeQueueTray2.Clear();
+                GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
+                GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
+                GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
+                GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;
+                StockBinInit(); 
+                MessageNotify.GetInstance.ShowRunLog("系统流程复位，等待西门子重新下发订单");
+            }), "BPASystemReset", true);
+
+            //往海科PLC写值
+            ActionManage.GetInstance.Register(new Action<Object>((o) => 
+            {
+                if (o != null && o is HKDeviceWrite data) 
+                {
+                    if (data.PlcVarType == PlcVarType.Bool) 
+                    {
+                        bool value = (bool)data.Value;
+                        HKDevice.HK_PLC_S7.Write<bool>(data.Address , value);
+                    }
+                    else if (data.PlcVarType == PlcVarType.Byte)
+                    {
+                        byte value = (byte)data.Value;
+                        HKDevice.HK_PLC_S7.Write<byte>(data.Address, value);
+                    }
+                    else if (data.PlcVarType == PlcVarType.Int)
+                    {
+                        short value = (short)data.Value;
+                        HKDevice.HK_PLC_S7.Write<short>(data.Address, value);
+                    }
+                    else if (data.PlcVarType == PlcVarType.Dint)
+                    {
+                        int value = (int)data.Value;
+                        HKDevice.HK_PLC_S7.Write<int>(data.Address, value);
+                    }
+                    else if (data.PlcVarType == PlcVarType.Real)
+                    {
+                        float value = (float)data.Value;
+                        HKDevice.HK_PLC_S7.Write<float>(data.Address, value);
+                    }
+                }
+            }), "PLCWrite", true);
+
             //电机速度
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
                 if (o != null && o is short value)
                 {
-                    HKDevice.HK_PLC_S7.Write("DB47.DBD8", value);
+                    HKDevice.HK_PLC_S7.Write("DB47.DBW8", value);
                 }
             }), "AxisLoadSpeedSet", true);
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
                 if (o != null && o is short value)
                 {
-                    HKDevice.HK_PLC_S7.Write("DB47.DBD10", value);
+                    HKDevice.HK_PLC_S7.Write("DB47.DBW10", value);
                 }
             }), "AxisMidSpeedSet", true);
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
                 if (o != null && o is short value)
                 {
-                    HKDevice.HK_PLC_S7.Write("DB47.DBD12", value);
+                    HKDevice.HK_PLC_S7.Write("DB47.DBW12", value);
                 }
             }), "AxisUnLoadSpeedSet", true);
             ActionManage.GetInstance.Register(new Action<object>((o) =>
@@ -1466,7 +2269,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }), "Axis2SpeedSet", true);
 
-
+            //机器人的操作
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
                 if (o != null && o is string address)
@@ -1581,5 +2384,88 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 Thread.Sleep(50);
             }), "设备连接", true);
         }
+
+        private void DosingDevice(int Index, int DeviceID)
+        {
+            if (RTrig.GetInstance("Tray2StatusDevice" + DeviceID).Start(DeviceInquire.GetInstance.GetDevice(DeviceID).deviceStatus.RunStatus == 3))
+            {
+                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘2,配方：{RemoteRecipes.ElementAt(Index).RecipeName},{DeviceID}号仓，配料完成");
+                int res = Array.FindIndex(RemoteRecipes.ElementAt(Index).RawMaterial.ToArray(), p => p.RawMaterialLocation == DeviceID);
+                RemoteRecipes.ElementAt(Index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(DeviceID).deviceStatus.CutWeightFeedback;
+                DeviceInquire.GetInstance.GetDevice(DeviceID).StatusReset();
+                if (DeviceID >= 1 && DeviceID <= 8)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (DeviceID - 1), true);
+                }
+                else if (DeviceID >= 9 && DeviceID <= 15)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (DeviceID - 9), true);
+                }
+            }
+        }
+        public void RawMaterialNameWithCode()
+        {
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.Clear();
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0001", "色拉油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0002", "一级菜油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0003", "菜籽油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0004", "青花椒油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0005", "卤牛肉丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0006", "冻鸡肉丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0007", "香菇丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0008", "高水分糍粑海椒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0009", "低水分糍粑海椒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0010", "辣豆瓣");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0011", "整豆豉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0012", "豆豉细粒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0013", "卤黄豆");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0014", "野山椒粒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0015", "竹笋丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0016", "香辣酱辣椒酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0017", "芽菜粒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0018", "榨菜丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0019", "盐菜");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0020", "洋葱丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0021", "番茄酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0022", "甜豆瓣");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0023", "甜面酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0024", "芝麻酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0025", "炸花生");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0026", "盐渍青椒丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0027", "备料剁红椒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0028", "萝卜丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0029", "油芝麻");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0030", "生姜");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0031", "大蒜");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0032", "榨菜酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0033", "炸碗豆");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0034", "大头菜丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0035", "酱油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0036", "I+G");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0037", "味精");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0038", "白糖");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0039", "食盐");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0040", "花椒酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0041", "调味膏2");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0042", "调味膏5");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0043", "十三香调味膏");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0044", "酱香膏");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0045", "芽菜香料粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0046", "香料Ａ");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0047", "香料Ｄ");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0048", "猪肉精膏");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0049", "调味膏3");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0050", "柠檬酸粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0051", "辣椒红");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0052", "辣椒油树脂");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0053", "水态混和酸");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0054", "加水稀释后防腐剂");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0055", "异维Ｃ钠粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0056", "琼脂粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0057", "香葱油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0058", "水态甜味剂");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0059", "孜然粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0060", "孜然油");
+        }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
index 382c3ef4..22963a6b 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
@@ -52,7 +52,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         BottomDeviceCurrentStatuses.ElementAt(BottomIndex).DeviceNum = DeviceLists.ElementAt(i).Value.deviceStatus.DeviceNum;
                         BottomDeviceCurrentStatuses.ElementAt(BottomIndex).RunStatus = DeviceLists.ElementAt(i).Value.deviceStatus.RunStatus;
                     }
-
                     int deviceIndex = Array.FindIndex(devices.ToArray(), p => p.IpAddress == DeviceLists.ElementAt(i).Key && p.DeviceName != DeviceLists.ElementAt(i).Value.DeviceName);
                     if (deviceIndex >= 0 && deviceIndex < devices.Count)
                     {
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs
index ad7a8237..c8facaf5 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs
@@ -7,6 +7,7 @@ using Microsoft.Toolkit.Mvvm.ComponentModel;
 using System.Collections.ObjectModel;
 using BPASmartClient.JXJFoodSmallStation.Model.Par;
 using BPASmartClient.JXJFoodSmallStation.Model.RawMaterial;
+using BPASmartClient.JXJFoodSmallStation.Model.Bom;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model
 {
@@ -17,6 +18,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         private ConnectParMode _mdeviceConnectPar = new ConnectParMode();
         public ObservableCollection<RawMaterialStockBin> rawMaterialStockBin { get; set; } = new ObservableCollection<RawMaterialStockBin>();
         public ObservableCollection<WindSendRawMaterial> windSendRawMaterial { get; set; } = new ObservableCollection<WindSendRawMaterial>();
+        public ObservableCollection<BomMaterial> BomMaterial { get; set; } = new ObservableCollection<BomMaterial>();
 
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs
index 825041db..5c2c6cea 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs
@@ -29,13 +29,13 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.Siemens
                     //var DataColl = this.Siemens_PLC_S7.ReadClass<XL_DataColl_DB>(2291);
                     if (Start != null && Start is XL_Start_DB st)
                     {
-                        switch (GVL_SmallStation.SiemensSendRecipeStatus) 
+                        switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus) 
                         {
                             case 0:
-                                if (GVL_SmallStation.IsAllowSiemensSendRecipe)
+                                if (GVL_SmallStation.GetInstance.IsAllowSiemensSendRecipe)
                                 {
                                     this.Siemens_PLC_S7.Write("DB2201.DBX450.0", true);
-                                    GVL_SmallStation.SiemensSendRecipeStatus = 1;
+                                    GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 1;
                                 }
                                 break;
                             case 1:
@@ -43,7 +43,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.Siemens
                                 {
                                     if (!string.IsNullOrEmpty(st.RecipeCode))
                                     {
-                                        GVL_SmallStation.SiemensSendRecipeStatus = 2;
+                                        GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 2;
                                         ActionManage.GetInstance.Send("SiemensRecipeRecive", st);
                                         this.Siemens_PLC_S7.Write("DB2201.DBX450.0", false);
                                     }
@@ -52,23 +52,23 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.Siemens
                             case 2:
                                 if (Start.Order_Request_ACK == false)
                                 {
-                                    GVL_SmallStation.IsAllowSiemensSendRecipe = false;
-                                    GVL_SmallStation.SiemensSendRecipeStatus = 3;
+                                    GVL_SmallStation.GetInstance.IsAllowSiemensSendRecipe = false;
+                                    GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 3;
                                 }
                                 break;
                         }
                         if (RTrig.GetInstance("Order_Cancel").Start(st.Order_Cancel)) //订单取消
                         {
-                            if (GVL_SmallStation.Order_Cancel == false)
+                            if (GVL_SmallStation.GetInstance.Order_Cancel == false)
                             {
-                                GVL_SmallStation.Order_Cancel = true;
-                                GVL_SmallStation.Order_CancelRecipeCode = st.RecipeCode;
-                                GVL_SmallStation.OrderCancelStep = 0;
+                                GVL_SmallStation.GetInstance.Order_Cancel = true;
+                                GVL_SmallStation.GetInstance.Order_CancelRecipeCode = st.RecipeCode;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 0;
                                 MessageNotify.GetInstance.ShowRunLog($"西门子下发取消工单指令:{st.RecipeName}");
                             }
                             else 
                             {
-                                MessageNotify.GetInstance.ShowRunLog($"订单正在取消,请等待订单{ GVL_SmallStation.Order_CancelRecipeCode}取消完成，再取消订单:{st.RecipeName}");
+                                MessageNotify.GetInstance.ShowRunLog($"订单正在取消,请等待订单{ GVL_SmallStation.GetInstance.Order_CancelRecipeCode}取消完成，再取消订单:{st.RecipeName}");
                             }
                         }
                     }
@@ -101,6 +101,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.Siemens
                         XL_Status = state;
                     }
 
+                    //从海科plc的数采 发送给西门子plc
                     var res = ProcessControl.GetInstance.HKDevice.DeviceStatus;
                     if (res != null)
                     {
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
index ce06670e..2d24260c 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
@@ -27,15 +27,15 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     var res1 = this.Siemens_PLC_S7.ReadClass<WindSend_Read>(94);
                     if (res1 != null && res1 is WindSend_Read readData)
                     {
-                        GVL_SmallStation.WindSendAllowAGVPutGet = readData.HoodLiftInPlace;
-                        Siemens_PLC_S7.Write<bool>("DB95.DBX38.2", GVL_SmallStation.Station1HaveTray);//工站1有托盘
+                        GVL_SmallStation.GetInstance.WindSendAllowAGVPutGet = readData.HoodLiftInPlace;
+                        Siemens_PLC_S7.Write<bool>("DB95.DBX38.2", GVL_SmallStation.GetInstance.Station1HaveTray);//工站1有托盘
                         if (res1.RecipeReceiveFinish)
                         {
                             Siemens_PLC_S7.Write<bool>("DB95.DBX38.0", false);
                         }
                         if (RTrig.GetInstance("CurrentCompleteSign").Start(readData.CurrentCompleteSign))
                         {
-                            GVL_SmallStation.WindSendDosingComple = true;
+                            GVL_SmallStation.GetInstance.WindSendDosingComple = true;
                             Siemens_PLC_S7.Write("DB95.DBX38.1", true);
                         }
                         if (TTrig.GetInstance("CurrentCompleteSign").Start(readData.CurrentCompleteSign))
@@ -108,6 +108,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     }
                     Thread.Sleep(10);*/
                 }
+                Thread.Sleep(10);
             }),"监听粉料数据",true);
             
         }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs
index 8878fd96..7d48cee8 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs
@@ -16,10 +16,10 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         private int _mLocation;
 
         public string RawMaterialChineseName { get { return _mRawMaterialChineseName; } set { _mRawMaterialChineseName = value; OnPropertyChanged(); } }
-        private string _mRawMaterialChineseName;
+        private string _mRawMaterialChineseName = "";
 
         public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } }
-        private string _mRawMaterialName;
+        private string _mRawMaterialName = "";
         /// <summary>
         /// 需要原料重量
         /// </summary>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml b/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml
new file mode 100644
index 00000000..a3b512d6
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml
@@ -0,0 +1,250 @@
+<UserControl x:Class="BPASmartClient.JXJFoodSmallStation.View.BomOfMaterialView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+            xmlns:con="clr-namespace:BPASmartClient.JXJFoodSmallStation.Converter"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920">
+    <UserControl.DataContext>
+        <vm:BomOfMaterialViewModel />
+    </UserControl.DataContext>
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="tabColor" Color="#FF2AB2E7" />
+        <!--<SolidColorBrush x:Key="bordColor" Color="#33ffffff" />-->
+        <SolidColorBrush x:Key="bordColor" Color="#332AB2E7" />
+        <con:DataTableRedundantConverter x:Key="tabConvert" />
+
+        <Style x:Key="RowRadioButtonStyle" TargetType="{x:Type RadioButton}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type RadioButton}">
+                        <Border
+                            x:Name="NvaBor"
+                            Background="Transparent"
+                            BorderBrush="#FF2AB2E7"
+                            BorderThickness="0">
+                            <ContentControl
+                                Margin="10,4"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Content="{TemplateBinding Content}"
+                                FontSize="16" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
+                                <Setter TargetName="NvaBor" Property="BorderThickness" Value="0" />
+                            </Trigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsChecked" Value="false" />
+                                    <Condition Property="IsMouseOver" Value="True" />
+                                </MultiTrigger.Conditions>
+                                <MultiTrigger.Setters>
+                                    <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
+                                </MultiTrigger.Setters>
+                            </MultiTrigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="InputTextboxStyle" TargetType="TextBox">
+            <Setter Property="Margin" Value="5,0,0,0" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="Width" Value="150" />
+            <Setter Property="Height" Value="40" />
+            <Setter Property="CaretBrush" Value="{StaticResource TitleBorderColor}" />
+            <Setter Property="Foreground" Value="{StaticResource TitleBorderColor}" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="14" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+
+        <Style x:Key="ControlButtonStyle" TargetType="Button">
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="Foreground" Value="#FFF53F62" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+            <Setter Property="FontFamily" Value="楷体" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border
+                            Name="TitleBarBr"
+                            BorderBrush="#00c2f4"
+                            BorderThickness="0"
+                            CornerRadius="0"
+                            Opacity="0.8">
+
+                            <ContentPresenter
+                                Margin="{TemplateBinding Margin}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                            <Border.Background>
+                                <ImageBrush
+                                    ImageSource="/BPASmartClient.CustomResource;component/Image/组合边框1.1.png"
+                                    Opacity="0.8"
+                                    Stretch="Fill" />
+                            </Border.Background>
+
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="TitleBarBr" Property="Opacity" Value="1" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="TitleTextblockStyle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="16" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Foreground" Value="{StaticResource tabColor}" />
+            <Setter Property="FontFamily" Value="楷体" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+        </Style>
+
+    </UserControl.Resources>
+    
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="60" />
+            <RowDefinition Height="40" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <!--#region 表格标题栏设置-->
+        <Grid>
+            <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                <Button
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding GetBomMaterialData}"
+                    Content="拉取本地数据"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource ImageButtonStyle}" />
+                <Button
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding DeleteAllMaterial}"
+                    Content="删除所有数据"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource ImageButtonStyle}" />
+                <Button
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding AddMaterial}"
+                    Content="新增数据"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource ImageButtonStyle}" />
+                <Button
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding SaveMaterials}"
+                    Content="保存参数"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource ImageButtonStyle}" />
+            </StackPanel>
+            
+        </Grid>
+        <Grid
+            Grid.Row="1"
+            Margin="0,10,0,0"
+            Background="#ff0C255F">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid Grid.Column="0">
+                <TextBlock  Text="序号" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"/>
+                <!--<Border BorderThickness="1,1,1,1" Cursor="SizeWE" 
+                    BorderBrush="{StaticResource bordColor}"  />-->
+            </Grid>
+            <TextBlock  Grid.Column="1" FontSize="24" Text="原料编号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <TextBlock  Grid.Column="2" FontSize="24" Text="原料名称" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <TextBlock  Grid.Column="3" FontSize="24" Text="操作" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+        </Grid>
+        <Grid Grid.Row="2">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Visible"  >
+                <ItemsControl ItemsSource="{Binding RawMaterialInfo}" Foreground="Aqua">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid Name="gr" >
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Grid Grid.Column="0" Margin="5">
+                                    <TextBlock
+                                        FontSize="16"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding Count}" />
+                                </Grid>
+                                <Grid Grid.Column="1" Margin="5">
+                                    <TextBox
+                                        Width="50"
+                                        FontSize="16"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center" 
+                                        Text="{Binding MaterialCode}" />
+                                </Grid>
+                                <Grid Grid.Column="2" Margin="5">
+                                    <TextBox
+                                        Width="200"
+                                        FontSize="16"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center" 
+                                        Text="{Binding MaterialName}" />
+                                </Grid>
+                                <Grid Grid.Column="3" Margin="5">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                        <pry:IcoButton
+                                            Margin="3,4,4,0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Background="#11F53F62"
+                                            BorderThickness="0"
+                                            Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                            CommandParameter="{Binding Count}"
+                                            Content="删除"
+                                            EnterBackground="#22F53F62"
+                                            Foreground="#FFF53F62"
+                                            IcoText="&#xe68e;"
+                                            Style="{StaticResource IcoButtonStyle}" />
+                                    </StackPanel>
+                                </Grid>
+                            </Grid>
+                            
+                            <DataTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                </Trigger>
+                            </DataTemplate.Triggers>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml.cs
new file mode 100644
index 00000000..a36f05ed
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.JXJFoodSmallStation.View
+{
+    /// <summary>
+    /// HKPlcCommMonitor.xaml 的交互逻辑
+    /// </summary>
+    public partial class BomOfMaterialView : UserControl
+    {
+        public BomOfMaterialView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
index 2c2a6d12..45257ee7 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
@@ -9,8 +9,9 @@
              d:DesignHeight="1080" d:DesignWidth="1920">
     <UserControl.DataContext>
         <vm:ManualFlowViewModel />
+
     </UserControl.DataContext>
-    
+
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="100" />
@@ -23,7 +24,7 @@
                 <Button
                     Width="200"
                     Height="40"
-                    Margin="5,0,5,0"
+                    Margin="5"
                     Command="{Binding Test1Command}"
                     Content="AGV送托盘完成"
                     FontSize="20"
@@ -32,7 +33,7 @@
                 <Button
                     Width="200"
                     Height="40"
-                    Margin="5,0,5,0"
+                    Margin="5"
                     Command="{Binding Test2Command}"
                     Content="粉料仓配料完成"
                     FontSize="20"
@@ -41,7 +42,7 @@
                 <Button
                     Width="200"
                     Height="40"
-                    Margin="5,0,5,0"
+                    Margin="5"
                     Command="{Binding Test3Command}"
                     Content="AGV取托盘完成"
                     FontSize="20"
@@ -50,7 +51,7 @@
                 <Button
                     Width="200"
                     Height="40"
-                    Margin="5,0,5,0"
+                    Margin="5"
                     Command="{Binding Test4Command}"
                     Content="气缸收紧错位复位"
                     FontSize="20"
@@ -59,7 +60,7 @@
                 <Button
                     Width="200"
                     Height="40"
-                    Margin="5,0,5,0"
+                    Margin="5"
                     Command="{Binding Test5Command}"
                     Content="粉料仓提升到位"
                     FontSize="20"
@@ -68,7 +69,7 @@
                 <Button
                     Width="200"
                     Height="40"
-                    Margin="5,0,5,0"
+                    Margin="5"
                     Command="{Binding Test6Command}"
                     Content="AGV放货架流程完成"
                     FontSize="20"
@@ -77,15 +78,12 @@
                 <Button
                     Width="200"
                     Height="40"
-                    Margin="50,0,50,0"
+                    Margin="5"
                     Command="{Binding BPAResetCommand}"
                     Content="上位机初始化"
                     FontSize="20"
-                    Panel.ZIndex="0"
                     Style="{StaticResource ImageButtonStyle}"></Button>
             </StackPanel>
-            
-           
         </Grid>
         <Grid Grid.Row="1">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center">
@@ -103,7 +101,7 @@
                     Height="40"
                     Margin="5,0,5,0"
                     Command="{Binding CLearRecipeInfo}"
-                    Content="配方清零"
+                    Content="PLC配方清零"
                     FontSize="20"
                     Panel.ZIndex="0"
                     Style="{StaticResource ImageButtonStyle}"></Button>
@@ -114,10 +112,10 @@
         <Grid Grid.Row="2">
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition></RowDefinition>
@@ -127,17 +125,25 @@
                     <RowDefinition></RowDefinition>
                 </Grid.RowDefinitions>
 
-                <WrapPanel>
-                    <TextBlock Text="心跳：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                <WrapPanel Grid.Column="1">
+                    <TextBlock Text="海科plc心跳：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
                     <TextBlock Text="{Binding Heartbeat}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
                 </WrapPanel>
-                <WrapPanel Grid.Row="1">
+                <WrapPanel Grid.Row="0">
+                    <TextBlock Text="西门子 连接状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding SiemensIsConnect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="海科plc连接状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding HKPlcIsConnect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="风送plc连接状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding WindSendIsConnect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel Grid.Row="2">
                     <TextBlock Text="当前下发配方状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
                     <TextBlock Text="{Binding OrderStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
                     <TextBlock Text="当前配料状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
                     <TextBlock Text="{Binding OrderDosingStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
                 </WrapPanel>
-                <WrapPanel Grid.Row="2">
+                <WrapPanel Grid.Row="4">
                     <TextBlock Text="柔性味魔方配料完成，延迟复位时间：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
                     <TextBox Text="{Binding time}" Width="150"  HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBox>
                     <TextBlock Text="ms" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
@@ -151,6 +157,11 @@
                         Panel.ZIndex="0"
                         Style="{StaticResource ImageButtonStyle}"></Button>
                 </WrapPanel>
+
+                <WrapPanel Grid.Column="1" Grid.Row="2">
+                    <TextBlock Text="配料情况：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding DosingComplete}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
             </Grid>
         </Grid>
     </Grid>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml.cs
index ad990fd8..3ea0ccf0 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml.cs
@@ -24,5 +24,10 @@ namespace BPASmartClient.JXJFoodSmallStation.View
         {
             InitializeComponent();
         }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml b/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
index f5cb142b..767e68be 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
@@ -55,7 +55,7 @@
                     <ItemsControl ItemsSource="{Binding plcInfos}" Foreground="Aqua">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
-                                <Grid>
+                                <Grid Name="gr">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="3*"></ColumnDefinition>
                                         <ColumnDefinition Width="8*"></ColumnDefinition>
@@ -89,6 +89,11 @@
                                         <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
                                     </Grid>
                                 </Grid>
+                                <DataTemplate.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="true">
+                                        <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                    </Trigger>
+                                </DataTemplate.Triggers>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml
new file mode 100644
index 00000000..b671f871
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml
@@ -0,0 +1,90 @@
+<UserControl x:Class="BPASmartClient.JXJFoodSmallStation.View.ProcessMonitorView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:BPASmartClient.JXJFoodSmallStation.View"
+             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920">
+    <UserControl.DataContext>
+        <vm:ProcessMonitorViewModel />
+    </UserControl.DataContext>
+    <Border BorderThickness="0" BorderBrush="{StaticResource bordColor}">
+        <Grid Margin="0,10">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="60"></RowDefinition>
+                <RowDefinition></RowDefinition>
+            </Grid.RowDefinitions>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*"></ColumnDefinition>
+                    <ColumnDefinition Width="4*"></ColumnDefinition>
+                    <ColumnDefinition Width="4*"></ColumnDefinition>
+                    <ColumnDefinition Width="14*"></ColumnDefinition>
+                    <ColumnDefinition Width="4*"></ColumnDefinition>
+                    <ColumnDefinition Width="17"></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid>
+                    <TextBlock Text="序号" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+                <Grid Grid.Column="1">
+                    <TextBlock Text="名称" FontSize="32"  HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+                <Grid Grid.Column="2">
+                    <TextBlock Text="类型" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+                <Grid Grid.Column="3">
+                    <TextBlock Text="描述" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+                <Grid Grid.Column="4">
+                    <TextBlock Text="当前值" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+            </Grid>
+            <Grid Grid.Row="1">
+                <ScrollViewer>
+                    <ItemsControl ItemsSource="{Binding plcInfos}" Foreground="Aqua">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="2*"></ColumnDefinition>
+                                        <ColumnDefinition Width="4*"></ColumnDefinition>
+                                        <ColumnDefinition Width="4*"></ColumnDefinition>
+                                        <ColumnDefinition Width="14*"></ColumnDefinition>
+                                        <ColumnDefinition Width="4*"></ColumnDefinition>
+                                    </Grid.ColumnDefinitions>
+                                    <Grid>
+                                        <TextBlock  Margin="5" Text="{Binding Count}" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                    <Grid Grid.Column="1">
+                                        <TextBlock  Margin="5" Text="{Binding Name}" FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                    <Grid Grid.Column="2">
+                                        <TextBlock Margin="5"  Text="{Binding Type}" FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                    <Grid Grid.Column="3">
+                                        <TextBlock  Margin="5" Text="{Binding Describe}" FontSize="14" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                    <Grid Grid.Column="4">
+                                        <TextBlock Margin="5" Text="{Binding Value}" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                </Grid>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </ScrollViewer>
+            </Grid>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml.cs
new file mode 100644
index 00000000..f9bf69f3
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.JXJFoodSmallStation.View
+{
+    /// <summary>
+    /// ProcessMonitorView.xaml 的交互逻辑
+    /// </summary>
+    public partial class ProcessMonitorView : UserControl
+    {
+        public ProcessMonitorView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
index 37d65ea5..febe57b5 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
@@ -52,14 +52,14 @@
             <CheckBox
                 x:Name="IsUseWindSend"
                 Margin="0,0,10,0"
-                Content="使用粉料仓配料模拟"
+                Content="使用粉料仓配料"
                 FontFamily="楷体"
                 VerticalAlignment="Center"
                 Foreground="Aqua"
                 IsChecked="{Binding IsUseWindSendDosing}" />
             <CheckBox
                 x:Name="IsUseStockBin"
-                Content="本地小料仓配方模拟"
+                Content="本地小料仓配方配料"
                 FontFamily="楷体"
                 VerticalAlignment="Center"
                 Foreground="Aqua"
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
index 2916d04d..3f88eec8 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
@@ -180,11 +180,9 @@
                 </Grid>
                 <Button
                     Grid.Row="2"
-                    Grid.ColumnSpan="2"
-                    Margin="20,15"
+                    Margin="20,5"
                     Command="{Binding TestRobotRun}"
                     Content="测试抓桶程序"
-                    Width="300"
                     FontSize="32"
                     Style="{StaticResource ImageButtonStyle}"></Button>
             </Grid>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml b/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml
index 87c2680a..6da027df 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml
@@ -20,20 +20,22 @@
         <!--#region 表格标题栏设置-->
         <Grid>
             <StackPanel HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
-                <pry:IcoButton
-                    Margin="10"
+                <Button
+                    Height="50"
+                    Margin="5"
                     Command="{Binding UpdateRawMaterial}"
                     Content="新增数据"
                     FontSize="28"
                     Foreground="Aqua"
-                    Style="{StaticResource IcoButtonStyle}" />
-                <pry:IcoButton
-                    Margin="10"
+                    Style="{StaticResource ImageButtonStyle}"  />
+                <Button
+                    Height="50"
+                    Margin="5"
                     Command="{Binding SaveRawMaterialPara}"
                     Content="保存参数"
                     FontSize="28"
                     Foreground="Aqua"
-                    Style="{StaticResource IcoButtonStyle}" />
+                    Style="{StaticResource ImageButtonStyle}"/>
             </StackPanel>
             
         </Grid>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml b/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml
index 4937284d..85e2a6f7 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml
@@ -101,18 +101,18 @@
                                 </Grid>
                                 <Grid Grid.Column="2" Margin="5">
                                     <TextBox
+                                        Name="name"
                                         Width="50"
                                         FontSize="16"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center" 
-                                        Text="{Binding  RawMaterialName}" />
+                                        Text="{Binding  RawMaterialName}"/>
                                     <Border
                                         BorderThickness="1,0,1,0"
                                         Cursor="SizeWE"  />
                                 </Grid>
                                 <Grid Grid.Column="3" Margin="5">
-                                    <TextBox
-                                        Width="50"
+                                    <TextBlock
                                         FontSize="16"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center" 
diff --git a/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml.cs
index df3cdaa9..72705aca 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.JXJFoodSmallStation.Model;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs
new file mode 100644
index 00000000..6d957daf
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs
@@ -0,0 +1,85 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.Helper;
+using BPASmartClient.JXJFoodSmallStation.Model;
+using BPASmartClient.JXJFoodSmallStation.Model.Bom;
+using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.ViewModel
+{
+    public class BomOfMaterialViewModel : ObservableObject
+    {
+        public BomOfMaterialViewModel()
+        {
+            RawMaterialInfo = Json<DevicePar>.Data.BomMaterial;
+            AddMaterial = new RelayCommand(() => 
+            {
+                RawMaterialInfo.Add(new BomMaterial() 
+                {
+                    Count = Json<DevicePar>.Data.BomMaterial.Count +1 ,
+                });
+            });
+            SaveMaterials = new RelayCommand(() =>
+            {
+                if (MessageNotify.GetInstance.ShowDialog("请确认是否保存！") == true)
+                {
+                    Json<DevicePar>.Save();
+                    MessageNotify.GetInstance.ShowUserLog($"西门子物料清单保存成功");
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"原料与料仓对应关系保存成功");
+                }
+            });
+            GetBomMaterialData = new RelayCommand(() => 
+            {
+                Json<DevicePar>.Data.BomMaterial.Clear();
+                ProcessControl.GetInstance.RawMaterialNameWithCode();//原料的名称和编码对应 ：西门子mes定义的物料编码
+                foreach (var item in GVL_SmallStation.GetInstance.RawMaterialsNameCode)
+                {
+                    Json<DevicePar>.Data.BomMaterial.Add(new BomMaterial() { Count = Json<DevicePar>.Data.BomMaterial.Count + 1, MaterialCode = item.Key, MaterialName = item.Value });
+                }
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"读取程序的Bom清单");
+            });
+            DeleteAllMaterial = new RelayCommand(() =>
+            {
+                if (MessageNotify.GetInstance.ShowDialog("请确认是否删除所有原料数据！") == true)
+                {
+                    Json<DevicePar>.Data.BomMaterial.Clear();
+                    MessageNotify.GetInstance.ShowUserLog($"西门子物料清单删除完成");
+                }
+            });
+            RemoveCommand = new RelayCommand<int>((Count) =>
+            {
+                if (Count is int cnt)
+                {
+                    var res = RawMaterialInfo.FirstOrDefault(p => p.Count == cnt);
+                    if (res != null)
+                    {
+                        if (MessageNotify.GetInstance.ShowDialog($"请确认是否删除[{res.MaterialCode}]，[{res.MaterialName}]！") == true)
+                        {
+                            RawMaterialInfo.Remove(res);
+                            NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"删除成功");
+                        }
+                    }
+                }
+            });
+        }
+        public ObservableCollection<BomMaterial> RawMaterialInfo { get; set; } = new ObservableCollection<BomMaterial>();
+        public RelayCommand AddMaterial { get; set; }
+        public RelayCommand SaveMaterials { get; set; }
+        public RelayCommand<int> RemoveCommand { get; set; }
+        public RelayCommand GetBomMaterialData { get; set; }
+        public RelayCommand DeleteAllMaterial { get; set; }
+        
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/HardwareStatusViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/HardwareStatusViewModel.cs
index 11b897d5..f3d59291 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/HardwareStatusViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/HardwareStatusViewModel.cs
@@ -21,9 +21,9 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 
             BottomDeviceCurrentStatuses = DeviceInquire.GetInstance.BottomDeviceCurrentStatuses;
 
-            TopDeviceCurrentStatuses = new ObservableCollection<DeviceCurrentStatus>(TopDeviceCurrentStatuses.OrderByDescending(item => item.DeviceNum));
+            /*TopDeviceCurrentStatuses = new ObservableCollection<DeviceCurrentStatus>(TopDeviceCurrentStatuses.OrderByDescending(item => item.DeviceNum));
 
-            BottomDeviceCurrentStatuses = new ObservableCollection<DeviceCurrentStatus>(BottomDeviceCurrentStatuses.OrderBy(item => item.DeviceNum));
+            BottomDeviceCurrentStatuses = new ObservableCollection<DeviceCurrentStatus>(BottomDeviceCurrentStatuses.OrderBy(item => item.DeviceNum));*/
         }
 
         public ObservableCollection<DeviceCurrentStatus> TopDeviceCurrentStatuses { get; set; }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
index ad281348..c72321b9 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
@@ -11,6 +11,8 @@ using BPASmartClient.JXJFoodSmallStation.Model;
 using System.Threading;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.CustomResource.UserControls;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -20,10 +22,10 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         {
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                SystemMode = GVL_SmallStation.SystemMode ? "手动" : "自动";
-                if (GVL_SmallStation.SystemStatus)
+                SystemMode = GVL_SmallStation.GetInstance.PlcSystemMode ? "手动" : "自动";
+                if (GVL_SmallStation.GetInstance.PlcSystemIsAutoRun)
                 {
-                    if (GVL_SmallStation.SystemRunStatus)
+                    if (GVL_SmallStation.GetInstance.PlcSystemIsPause)
                     {
                         SystemStatus = "暂停";
                     }
@@ -36,56 +38,182 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 {
                     SystemStatus = "停止";
                 }
+                for (int i = 0; i < 15; i++)
+                {
+                    if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[i])
+                    {
+                        cylinderModels.ElementAt(i).LeftTog = true;
+                        cylinderModels.ElementAt(i).RightTog = false;
+                    }
+                    else
+                    {
+                        cylinderModels.ElementAt(i).LeftTog = false;
+                        cylinderModels.ElementAt(i).RightTog = true;
+                    }
+                }
+                foreach (var item in PalletCylinders)
+                {
+                    if (item.Name == "进料桶顶升气缸")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[20])
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                        else
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                    }
+                    if (item.Name == "出料桶顶升气缸1")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[21])
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                        else
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                    }
+                    if (item.Name == "出料桶顶升气缸2")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[22])
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                        else
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                    }
+                    if (item.Name == "出料桶顶升气缸3")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[23])
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                        else
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                    }
+                    if (item.Name == "托盘气缸1_1")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[24])
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                        else
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                    }
+                    if (item.Name == "托盘气缸1_2")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[25])
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                        else
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                    }
+                    if (item.Name == "托盘气缸2_1")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[26])
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                        else
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                    }
+                    if (item.Name == "托盘气缸2_2")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[27])
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                        else
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                    }
+                }
                 Thread.Sleep(200);
             }), "获取系统状态", true);
-            for (int i = 0; i < 15; i++)
+            if (cylinderModels.Count < 15)
             {
-                cylinderModels.Add(new CylinderModel()
+                for (int i = 0; i < 15; i++)
                 {
-                    Name = $"升降气缸 {i + 1}",
-                    LeftTog = false,
-                    RightTog = false,
-                });
+                    cylinderModels.Add(new CylinderModel()
+                    {
+                        Name = $"升降气缸 {i + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
 
-                BlockCylinders.Add(new CylinderModel()
-                {
-                    Name = $"阻挡气缸 {i + 1}",
-                    LeftTog = false,
-                    RightTog = false,
-                });
+                    BlockCylinders.Add(new CylinderModel()
+                    {
+                        Name = $"阻挡气缸 {i + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
+                }
             }
-            for (int i = 1; i < 3; i++)
+            if (PalletCylinders.Count < 8)
             {
-                PalletCylinders.Add(new CylinderModel()
+                for (int i = 1; i < 3; i++)
                 {
-                    Name = $"托盘气缸1_{(i + 1)%2 +1}",
-                    LeftTog = false,
-                    RightTog = false,
-                });
-            }
-            for (int i = 1; i < 3; i++)
-            {
-                PalletCylinders.Add(new CylinderModel()
+                    PalletCylinders.Add(new CylinderModel()
+                    {
+                        Name = $"托盘气缸1_{(i + 1) % 2 + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
+                }
+                for (int i = 1; i < 3; i++)
                 {
-                    Name = $"托盘气缸2_{(i + 1) % 2 + 1}",
-                    LeftTog = false,
-                    RightTog = false,
-                });
-            }
-            PalletCylinders.Add(new CylinderModel()
-            {
-                Name = $"进料桶顶升气缸",
-                LeftTog = false,
-                RightTog = false,
-            });
-            for (int i = 0; i < 3; i++)
-            {
+                    PalletCylinders.Add(new CylinderModel()
+                    {
+                        Name = $"托盘气缸2_{(i + 1) % 2 + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
+                }
                 PalletCylinders.Add(new CylinderModel()
                 {
-                    Name = $"出料桶顶升气缸{i+1}",
+                    Name = $"进料桶顶升气缸",
                     LeftTog = false,
                     RightTog = false,
                 });
+                for (int i = 0; i < 3; i++)
+                {
+                    PalletCylinders.Add(new CylinderModel()
+                    {
+                        Name = $"出料桶顶升气缸{i + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
+                }
             }
             Open = new RelayCommand<object>((o) =>
             {
@@ -139,18 +267,22 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             SystemStartCommand = new RelayCommand(() => 
             {
                 ActionManage.GetInstance.Send("SystemStart");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"系统启动!");
             });
             SystemStopCommand = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("SystemStop");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"系统停止!");
             });
             SystemPauseCommand = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("SystemPause");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"系统暂停!");
             });
             SystemResetCommand = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("SystemReset");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"系统暂停后复位!");
             });
             DebugMode = new RelayCommand(() =>
             {
@@ -165,17 +297,17 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         /// <summary>
         /// 升降气缸
         /// </summary>
-        public ObservableCollection<CylinderModel> cylinderModels { get; set; } = new ObservableCollection<CylinderModel>();
+        public static ObservableCollection<CylinderModel> cylinderModels { get; set; } = new ObservableCollection<CylinderModel>();
 
         /// <summary>
         /// 阻挡气缸
         /// </summary>
-        public ObservableCollection<CylinderModel> BlockCylinders { get; set; } = new ObservableCollection<CylinderModel>();
+        public static ObservableCollection<CylinderModel> BlockCylinders { get; set; } = new ObservableCollection<CylinderModel>();
 
         /// <summary>
         /// 托盘气缸
         /// </summary>
-        public ObservableCollection<CylinderModel> PalletCylinders { get; set; } = new ObservableCollection<CylinderModel>();
+        public static ObservableCollection<CylinderModel> PalletCylinders { get; set; } = new ObservableCollection<CylinderModel>();
         public static string SystemMode { get { return _mSystemMode; } set { _mSystemMode = value; OnStaticPropertyChanged(); } }
         private static string _mSystemMode =String.Empty;
 
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
index f367620c..596292e7 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
@@ -24,30 +24,38 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
     {
         public ManualFlowViewModel()
         {
-            time = GVL_SmallStation.Time;
+            time = GVL_SmallStation.GetInstance.Time;
             Test1Command = new RelayCommand(() =>
             {
-                GVL_SmallStation.AGV_PutTray1Finish = true;
-                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV送托盘完成");
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX0.7", PlcVarType = PlcVarType.Bool, Value = true });
+                //GVL_SmallStation.GetInstance.AGV_PutTray1Finish = true;
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV送托盘完成"); 
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV送托盘完成");
             });
             Test2Command = new RelayCommand(() =>
             {
-                GVL_SmallStation.WindSendDosingComple = true;
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX1.7", PlcVarType = PlcVarType.Bool, Value = true });
+                //GVL_SmallStation.GetInstance.WindSendDosingComple = true;
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，粉料仓配料完成");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，粉料仓配料完成");
             });
             Test3Command = new RelayCommand(() =>
             {
-                GVL_SmallStation.AGV_GetTray1Finish = true;
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX1.1", PlcVarType = PlcVarType.Bool, Value = true });
+                //GVL_SmallStation.GetInstance.AGV_GetTray1Finish = true;
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV取托盘完成");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV取托盘完成");
             });
             Test4Command = new RelayCommand(() =>
             {
-                GVL_SmallStation.CylinderReset = true;
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX1.5", PlcVarType = PlcVarType.Bool, Value = true });
+                //GVL_SmallStation.GetInstance.CylinderReset = true;
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，气缸收紧错位复位");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，气缸收紧错位复位");
             });
             Test5Command = new RelayCommand(() =>
             {
-                GVL_SmallStation.WindSendAllowAGVPutGet = true;
+                GVL_SmallStation.GetInstance.WindSendAllowAGVPutGet = true;
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，粉料仓提升到位");
             });
             Test6Command = new RelayCommand(() =>
@@ -72,8 +80,9 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             });
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
+                DosingComplete = GVL_SmallStation.GetInstance.StockBinDosing.ToBinString();
                 Heartbeat = GVL_SmallStation.GetInstance.HeartBeatFromPlc;
-                switch (GVL_SmallStation.SiemensSendRecipeStatus) 
+                switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus) 
                 {
                     case 0:
                         OrderStatus = IssueRecipeCondition.等待小料站PLC允许下配方.ToString();
@@ -118,10 +127,13 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             }), "流程手动设备状态读取",true);
             TimeSet = new RelayCommand(() =>
             {
-                GVL_SmallStation.Time = time;
+                GVL_SmallStation.GetInstance.Time = time;
                 MessageNotify.GetInstance.ShowUserLog($"设置柔性味魔方复位时间：{time}s");
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{time.ToString()}：设置成功!");
             });
+            SiemensIsConnect = ProcessControl.GetInstance.SiemensDevice.IsConnected;
+            HKPlcIsConnect = ProcessControl.GetInstance.HKDevice.IsConnected;
+            WindSendIsConnect = ProcessControl.GetInstance.WindSendDevice.IsConnected;
         }
         public RelayCommand Test1Command { get; set; }
         public RelayCommand Test2Command { get; set; }
@@ -132,7 +144,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public RelayCommand TimeSet { get; set; }
         public static bool Heartbeat { get { return _mHeartbeat; } set { _mHeartbeat = value; OnStaticPropertyChanged(); } }
         private static bool _mHeartbeat;
-
+        
         public int time { get { return _mtime; } set { _mtime = value; OnStaticPropertyChanged(); } }
         private int _mtime;
         public static string OrderStatus { get { return _mOrderStatus; } set { _mOrderStatus = value; OnStaticPropertyChanged(); } }
@@ -147,5 +159,14 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public RelayCommand CLearRecipeInfo { get; set; }
         public RelayCommand SystemReset { get; set; }
         public RelayCommand BPAResetCommand { get; set; }
+        private bool _SiemensIsConnect { get; set; } 
+        public bool SiemensIsConnect { get { return _SiemensIsConnect; } set { _SiemensIsConnect = value; OnPropertyChanged(); } } 
+        private bool _HKPlcIsConnect { get; set; }
+        public bool HKPlcIsConnect { get { return _HKPlcIsConnect; } set { _HKPlcIsConnect = value; OnPropertyChanged(); } }
+        private bool _WindSendIsConnect { get; set; }
+        public bool WindSendIsConnect { get { return _WindSendIsConnect; } set { _WindSendIsConnect = value; OnPropertyChanged(); } }
+
+        private static string _DosingComplete { get; set; }
+        public static string DosingComplete { get { return _DosingComplete; } set { _DosingComplete = value; OnStaticPropertyChanged(); } }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ProcessMonitorViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ProcessMonitorViewModel.cs
new file mode 100644
index 00000000..5d49ee44
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ProcessMonitorViewModel.cs
@@ -0,0 +1,23 @@
+using BPASmartClient.JXJFoodSmallStation.Model;
+using BPASmartClient.JXJFoodSmallStation.Model.GVL;
+using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.ViewModel
+{
+    public class ProcessMonitorViewModel : ObservableObject
+    {
+        public ProcessMonitorViewModel() 
+        {
+            
+        }
+        public ObservableCollection<PlcInfos> plcInfos => ProcessControl.GetInstance.ProcessVar;
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs
index 7910aae8..0be4f19e 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs
@@ -25,17 +25,19 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         {
             ThreadManage.GetInstance().StartLong(() => 
             {
-                IsRunProgramNum = GVL_SmallStation.RobotProgramNum;
-                RobotIsAutoMode = GVL_SmallStation.RobotStatus.GetBitValue(1);
-                RobotIsAutoRun = GVL_SmallStation.RobotStatus.GetBitValue(2);
-                RobotIsStop = GVL_SmallStation.RobotStatus.GetBitValue(3);
-                RobotIsRun = GVL_SmallStation.RobotStatus.GetBitValue(4);
-                RobotIsAlarm = GVL_SmallStation.RobotStatus.GetBitValue(5);
-                RobotIsHomed = GVL_SmallStation.RobotStatus.GetBitValue(6);
-                RobotGetEmptyBarrelComplete = GVL_SmallStation.RobotStatus.GetBitValue(8);
-                RobotPutEmptyBarrelComplete = GVL_SmallStation.RobotStatus.GetBitValue(9);
-                RobotGetFullBarrelComplete = GVL_SmallStation.RobotStatus.GetBitValue(10);
-                RobotPutFullBarrelComplete = GVL_SmallStation.RobotStatus.GetBitValue(11);
+                IsRunProgramNum = GVL_SmallStation.GetInstance.RobotProgramNum;
+                RobotIsAutoMode = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(1);
+                RobotIsAutoRun = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(2);
+                RobotIsStop = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(3);
+                RobotIsRun = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(4);
+                RobotIsAlarm = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(5);
+                RobotIsHomed = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(6);
+                RobotGetEmptyBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(8);
+                RobotPutEmptyBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(9);
+                RobotGetFullBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(10);
+                RobotPutFullBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(11);
+
+                Thread.Sleep(10);
 
             },"机器人状态",true);
             SystemStart = new RelayCommand(() => {
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs
index 5c207fa2..530031de 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs
@@ -13,6 +13,7 @@ using BPASmartClient.CustomResource.UserControls;
 using System.Diagnostics;
 using BPASmartClient.JXJFoodSmallStation.Model.WindSend;
 using BPASmartClient.JXJFoodSmallStation.Model.Par;
+using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -45,11 +46,17 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             });
             SetParCommand = new RelayCommand(() =>
             {
-                ActionManage.GetInstance.Send("AxisLoadSpeedSet", AxisLoadSpeed);
-                ActionManage.GetInstance.Send("AxisMidSpeedSet", AxisMidSpeed);
-                ActionManage.GetInstance.Send("AxisUnLoadSpeedSet", AxisUnLoadSpeed);
-                ActionManage.GetInstance.Send("Axis1SpeedSet", Axis1Speed);
-                ActionManage.GetInstance.Send("Axis2SpeedSet", Axis2Speed);
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBD0", PlcVarType = PlcVarType.Real, Value = Axis1Speed });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBD4", PlcVarType = PlcVarType.Real, Value = Axis2Speed });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBW8", PlcVarType = PlcVarType.Int, Value = AxisLoadSpeed });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBW10", PlcVarType = PlcVarType.Int, Value = AxisMidSpeed });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBW12", PlcVarType = PlcVarType.Int, Value = AxisUnLoadSpeed });
+
+                //ActionManage.GetInstance.Send("AxisLoadSpeedSet", AxisLoadSpeed);
+                //ActionManage.GetInstance.Send("AxisMidSpeedSet", AxisMidSpeed);
+                //ActionManage.GetInstance.Send("AxisUnLoadSpeedSet", AxisUnLoadSpeed);
+                //ActionManage.GetInstance.Send("Axis1SpeedSet", Axis1Speed);
+                //ActionManage.GetInstance.Send("Axis2SpeedSet", Axis2Speed);
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"参数设置成功!");
             });
         }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs
index c9e38fd0..bcd9a7f0 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs
@@ -12,6 +12,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.CustomResource.UserControls;
 using System.Diagnostics;
 using BPASmartClient.JXJFoodSmallStation.Model.WindSend;
+using System.Threading;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -30,14 +31,14 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     });
                 }
             }
-            SaveCommand = new RelayCommand(() =>
+            SaveRawMaterialPara = new RelayCommand(() =>
             {
                 Json<DevicePar>.Save();
             });
         }
 
         public ObservableCollection<WindSendRawMaterial> WindSendRawMaterial => Json<DevicePar>.Data.windSendRawMaterial;
-        public RelayCommand SaveCommand { get; set; }
+        public RelayCommand SaveRawMaterialPara { get; set; }
 
     }
 }
diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index 69be784d..41e0aa39 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -316,7 +316,7 @@ namespace BPASmartClient.MorkS
         private void DataParse()
         {
             EventBus.EventBus.GetInstance().Subscribe<DoOrderEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBackHandle)
-             {
+            {
                  if (@event == null) return;
                  if (@event is DoOrderEvent order)
                  {
@@ -404,6 +404,10 @@ namespace BPASmartClient.MorkS
 
             WriteControl("M260.0", data.ToArray());
 
+            OrderChange(mORKS.OutMealId, ORDER_STATUS.COOKING);
+
+            OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_COOK);
+
         }
 
         private void BowlControl(OrderLocInfo orderLocInfo)
@@ -697,7 +701,8 @@ namespace BPASmartClient.MorkS
 
             mORKS.PriorityJudgment = Delay.GetInstance("取餐优先级判断").Start(mORKS.TurntableLocLists.Count > 0 && !mORKS.TurntableLowerLimit, 4);
             //mORKS.RobotTaskInterlock = OutMealRequstCount > 0 && mORKS.AllowFallNoodle && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
-            mORKS.RobotTaskInterlock = isok && mORKS.AllowFallNoodle && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
+            mORKS.InvertedNoodlesOpenBusy = Json<MorksPar>.Data.InvertedNoodles_OpenBusyNum;
+            mORKS.RobotTaskInterlock = isok && mORKS.AllowFallNoodle && (mlCount >= mORKS.InvertedNoodlesOpenBusy || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment) && !mORKS.TakeMealDetect;//加个取餐口检测判断是否去面
 
 
         }
diff --git a/BPASmartClient.MorkS/GVL_MORKS.cs b/BPASmartClient.MorkS/GVL_MORKS.cs
index 5a16dc8c..7270d656 100644
--- a/BPASmartClient.MorkS/GVL_MORKS.cs
+++ b/BPASmartClient.MorkS/GVL_MORKS.cs
@@ -324,6 +324,9 @@ namespace BPASmartClient.MorkS
         [VariableMonitor("制作完成标志")]
         public bool CookCompleteFlatBit { get; set; }
 
+        [VariableMonitor("到面条件,煮面口忙碌数量")]
+        public int InvertedNoodlesOpenBusy { get; set; } = 5;
+
 
         #region 订单ID记录
         /// <summary>
diff --git a/BPASmartClient.MorkS/Model/MorksPar.cs b/BPASmartClient.MorkS/Model/MorksPar.cs
index 77b6eb6d..a085e187 100644
--- a/BPASmartClient.MorkS/Model/MorksPar.cs
+++ b/BPASmartClient.MorkS/Model/MorksPar.cs
@@ -17,5 +17,9 @@ namespace BPASmartClient.MorkS.Model
         /// 加汤时间，单位秒
         /// </summary>
         public float AddSoupTime { get; set; } = 2;
+        /// <summary>
+        /// 倒面条件 煮面口忙碌数量
+        /// </summary>
+        public int InvertedNoodles_OpenBusyNum { get; set; } = 5;
     }
 }
diff --git a/BPASmartClient.MorkS/View/ParSet.xaml b/BPASmartClient.MorkS/View/ParSet.xaml
index 9f5734e7..8cfaca7b 100644
--- a/BPASmartClient.MorkS/View/ParSet.xaml
+++ b/BPASmartClient.MorkS/View/ParSet.xaml
@@ -78,7 +78,7 @@
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>
                 <RowDefinition />
-                <RowDefinition Height="50" />
+                <RowDefinition Height="150" />
             </Grid.RowDefinitions>
 
             <ItemsControl Grid.Row="0" ItemsSource="{Binding parSets}">
@@ -130,7 +130,7 @@
             <StackPanel Grid.Row="1" Orientation="Horizontal">
                 <TextBlock
                     FontSize="21"
-                     Margin="40 0 0 0"
+                        Margin="40 0 0 0"
                     Style="{StaticResource TextBlockStyle}"
                     Text="加汤时间:" />
                 <TextBox
@@ -151,7 +151,7 @@
                     Text="(秒)" />
                 <TextBlock
                     FontSize="21"
-                     Margin="40 0 0 0"
+                        Margin="40 0 0 0"
                     Style="{StaticResource TextBlockStyle}"
                     Text="清洗加汤管道时间:" />
                 <TextBox
@@ -172,6 +172,27 @@
                     Text="(秒)" />
                 <Button Content="启动"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5" Foreground="Aqua" 
                     Style="{StaticResource ButtonStyle}" Command="{Binding CommandStart}" />
+                <TextBlock
+                    FontSize="21"
+                        Margin="40 0 0 0"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="倒面条件，煮面口使用数量:" />
+                <TextBox
+                    Width="100"
+                    Margin="10,0,0,0"
+                    VerticalAlignment="Center"
+                    Background="Transparent"
+                    BorderBrush="#FF23CACA"
+                    CaretBrush="Aqua"
+                    FontFamily="楷体"
+                    FontSize="21"
+                    Foreground="#ff34f7f7"
+                    Text="{Binding OpenUseNumber}" />
+                <TextBlock
+                    FontSize="21"
+                    Margin="10 0 0 0"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="(个)" />
             </StackPanel>
         </Grid>
 
diff --git a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
index d4a7edbd..3de1399b 100644
--- a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
+++ b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
@@ -36,9 +36,13 @@ namespace BPASmartClient.MorkS.ViewModel
         /// 加汤时间设置
         /// </summary>
         public float AddSoup { get { return Json<MorksPar>.Data.AddSoupTime; } set { Json<MorksPar>.Data.AddSoupTime = value; OnPropertyChanged(); } }
+        public int OpenUseNumber { get { return Json<MorksPar>.Data.InvertedNoodles_OpenBusyNum; } set { Json<MorksPar>.Data.InvertedNoodles_OpenBusyNum = value; OnPropertyChanged(); } }
+        
         public float DelayTime { get { return _DelayTime; } set { _DelayTime = value; OnPropertyChanged(); } }
         private float _DelayTime;
 
+
+
         private void SaveSettingData()
         {
             List<ushort> values = new List<ushort>();
diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index 9c45fe12..618157de 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -7,9 +7,9 @@
     <add key="IsEnableTest" value="false"/>
 
     <!--测试环境-->
-    <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
+    <add key="apollouri" value="http://10.2.1.21:28080/"/>
     <add key="AppId" value="test1_HostComputer"/>
-    <add key ="Namespaces" value="DEV.test1.Config"/>-->
+    <add key ="Namespaces" value="DEV.test1.Config"/>
 
     <!--开发环境-->
     <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
@@ -17,9 +17,9 @@
     <add key ="Namespaces" value="DEV.Config"/>-->
 
     <!--正式环境-->
-    <add key="apollouri" value="http://47.108.65.220:28080/"/>
+    <!--<add key="apollouri" value="http://47.108.65.220:28080/"/>
     <add key="appid" value="hostcomputer"/>
-    <add key ="namespaces" value="test1.config"/>
+    <add key ="namespaces" value="test1.config"/>-->
 
     <!--阿里云上报启动方式:API 或者 LOCAL-->
     <!--API  :通过客户端ID,调用接口查询“设备连接信息”-->
diff --git a/DosingSystem/ViewModel/RecipeControlViewModel.cs b/DosingSystem/ViewModel/RecipeControlViewModel.cs
index f5667637..86cefcf6 100644
--- a/DosingSystem/ViewModel/RecipeControlViewModel.cs
+++ b/DosingSystem/ViewModel/RecipeControlViewModel.cs
@@ -308,273 +308,100 @@ namespace BPASmartClient.DosingSystem.ViewModel
                                 }
                                 for (int j = 0; j < GlobalDevice.PlcData.IsAllowIngredients.Length; j++)
                                 {
-                                    //if (GlobalDevice.PlcData.IsAllowIngredients[j])
-                                    //{
-                                    //    int barrel = j + 1;//桶号
-                                    //    int cnt = GlobalDevice.PlcData.LocationFeedback[j];//允许配料的位置 0~6
-                                    //    if (RTrig.GetInstance("a").Start(GlobalDevice.PlcData.IsAllowIngredients[j])) 
-                                    //    {
-                                    //        MessageNotify.GetInstance.ShowRunLog($"桶号：{barrel}，位置：{cnt}，允许配料");
-                                    //    }
-                                    //    int Location1 = 0;
-                                    //    int Location2 = 0;
-                                    //    if (cnt == -1)
-                                    //    {
-                                    //        MessageNotify.GetInstance.ShowRunLog("错误");
-                                    //        return;
-                                    //    }
-                                    //    else
-                                    //    {
-                                    //        switch (cnt)
-                                    //        {
-                                    //            case 1:
-                                    //                int a1 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 1);
-                                    //                int b1 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 2);
-                                    //                if (a1 >= 0)
-                                    //                {
-                                    //                    Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a1).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                if (b1 >= 0)
-                                    //                {
-                                    //                    Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b1).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                break;
-                                    //            case 2:
-                                    //                int a2 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 3);
-                                    //                int b2 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 4);
-                                    //                if (a2 >= 0)
-                                    //                {
-                                    //                    Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a2).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                if (b2 >= 0)
-                                    //                {
-                                    //                    Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b2).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                break;
-                                    //            case 3:
-                                    //                int a3 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 5);
-                                    //                int b3 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 6);
-                                    //                if (a3 >= 0)
-                                    //                {
-                                    //                    Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a3).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                if (b3 >= 0)
-                                    //                {
-                                    //                    Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b3).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                break;
-                                    //            case 4:
-                                    //                int a4 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 7);
-                                    //                int b4 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 8);
-                                    //                if (a4 >= 0)
-                                    //                {
-                                    //                    Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a4).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                if (b4 >= 0)
-                                    //                {
-                                    //                    Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b4).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                break;
-                                    //            case 5:
-                                    //                int a5 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 9);
-                                    //                int b5 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 10);
-                                    //                if (a5 >= 0)
-                                    //                {
-                                    //                    Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a5).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                if (b5 >= 0)
-                                    //                {
-                                    //                    Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b5).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                break;
-                                    //            case 6:
-                                    //                int a6 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 11);
-                                    //                int b6 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 12);
-                                    //                if (a6 >= 0)
-                                    //                {
-                                    //                    Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a6).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                if (b6 >= 0)
-                                    //                {
-                                    //                    Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b6).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                break;
-                                    //            default:
-                                    //                break;
-                                    //        }
-                                    //    }
-                                    //    if (Location1 >= 0)
-                                    //    {
-                                    //        string RawName = Recipes.ElementAt(i).RawMaterials.ElementAt(Location1).RawMaterialName;
-                                    //        int abc = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceName == RawName);
-                                    //        int DeviceNum = DeviceInquire.GetInstance.devices.ElementAt(abc).DeviceNum;
-                                    //        if (DeviceNum > 0)
-                                    //        {
-                                    //            float weight = Recipes.ElementAt(i).RawMaterials.ElementAt(Location1).RawMaterialWeight;
-                                    //            int loc = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == RawName);
-                                    //            if (loc >= 0 && RawName != null && weight >= 0)
-                                    //            {
-                                    //                int St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
-                                    //                if (St_index < 0)
-                                    //                {
-                                    //                    StockStatus.Add(new StockStatusModel()
-                                    //                    {
-                                    //                        MaterialName = RawName,
-                                    //                        IssueWeight = weight,
-                                    //                        IssueStatus = 0,
-                                    //                    });
-                                    //                }
-                                    //                St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
-                                    //                if (St_index >= 0)
-                                    //                {
-                                    //                    if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 1 && StockStatus.ElementAt(St_index).IssueStatus == 0)
-                                    //                    {
-                                    //                        StockStatus.ElementAt(St_index).IssueStatus = 1;
-                                    //                        DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).Start(weight);
-                                    //                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},开始出料");
-                                    //                    }
-                                    //                    if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 3 && StockStatus.ElementAt(St_index).IssueStatus == 1)
-                                    //                    {
-                                    //                        //GlobalDevice.PlcData.IsAllowIngredients[j] = false;//测试使用
-                                    //                        StockStatus.ElementAt(St_index).IssueStatus = 2;
-                                    //                        DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).StatusReset();
-                                    //                        int a = 0.SetBitValue((byte)(DeviceNum), true);
-                                    //                        byte[] test1 = a.ToBytes(BPA.Helper.DataFormat.ABCD);
-                                    //                        int item = test1.ToInt();
-                                    //                        string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item,2);
-                                    //                        MessageNotify.GetInstance.ShowRunLog($"{res}");
-                                    //                        MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");
-                                    //                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
-                                    //                    }
-                                    //                }
-                                    //            }
-                                    //        }
-                                    //    }
-                                    //    if (Location1 >= 0)
-                                    //    {
-
-                                    //        string RawName111 = Recipes.ElementAt(i).RawMaterials.ElementAt(Location1).RawMaterialName;
-                                    //        int St_index111 = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName111);
-                                    //        if (Location2 >= 0 && ((Location1 >= 0 && StockStatus.ElementAt(St_index111).IssueStatus == 2)))
-                                    //        {
-                                    //            string RawName = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialName;
-                                    //            int abc = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceName == RawName);
-                                    //            int DeviceNum = DeviceInquire.GetInstance.devices.ElementAt(abc).DeviceNum;
-                                    //            if (DeviceNum > 0)
-                                    //            {
-                                    //                float weight = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialWeight;
-                                    //                int loc = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == RawName);
-                                    //                if (loc >= 0 && RawName != null && weight >= 0)
-                                    //                {
-                                    //                    int St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
-                                    //                    if (St_index < 0)
-                                    //                    {
-                                    //                        StockStatus.Add(new StockStatusModel()
-                                    //                        {
-                                    //                            MaterialName = RawName,
-                                    //                            IssueWeight = weight,
-                                    //                            IssueStatus = 0,
-                                    //                        });
-                                    //                    }
-                                    //                    St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
-                                    //                    if (St_index >= 0)
-                                    //                    {
-                                    //                        if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 1 && StockStatus.ElementAt(St_index).IssueStatus == 0)
-                                    //                        {
-                                    //                            StockStatus.ElementAt(St_index).IssueStatus = 1;
-                                    //                            DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).Start(weight);
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},开始出料");
-                                    //                        }
-                                    //                        if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 3 && StockStatus.ElementAt(St_index).IssueStatus == 1)
-                                    //                        {
-                                    //                            //GlobalDevice.PlcData.IsAllowIngredients[j] = false;//测试使用
-                                    //                            StockStatus.ElementAt(St_index).IssueStatus = 2;
-                                    //                            DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).StatusReset();
-                                    //                            int a = 0.SetBitValue((byte)(DeviceNum), true);
-                                    //                            byte[] test1 = a.ToBytes(BPA.Helper.DataFormat.ABCD);
-                                    //                            int item = test1.ToInt();
-                                    //                            string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item, 5);
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"{res}");
-                                    //                            //MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item}");
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
-                                    //                        }
-                                    //                    }
-                                    //                }
-                                    //            }
-                                    //        }
-                                    //    }
-                                    //    else
-                                    //    {
-                                    //        if (Location2 >= 0)
-                                    //        {
-                                    //            string RawName = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialName;
-                                    //            int abc = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceName == RawName);
-                                    //            int DeviceNum = DeviceInquire.GetInstance.devices.ElementAt(abc).DeviceNum;
-                                    //            if (DeviceNum >= 0)
-                                    //            {
-                                    //                float weight = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialWeight;
-                                    //                int loc = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == RawName);
-                                    //                if (cnt > 0 && loc >= 0 && RawName != null && weight >= 0)
-                                    //                {
-                                    //                    int St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
-                                    //                    if (St_index < 0)
-                                    //                    {
-                                    //                        StockStatus.Add(new StockStatusModel()
-                                    //                        {
-                                    //                            MaterialName = RawName,
-                                    //                            IssueWeight = weight,
-                                    //                            IssueStatus = 0,
-                                    //                        });
-                                    //                    }
-                                    //                    St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
-                                    //                    if (St_index >= 0)
-                                    //                    {
-                                    //                        if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 1 && StockStatus.ElementAt(St_index).IssueStatus == 0)
-                                    //                        {
-                                    //                            StockStatus.ElementAt(St_index).IssueStatus = 1;
-                                    //                            DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).Start(weight);
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},开始出料");
-                                    //                        }
-                                    //                        if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 3 && StockStatus.ElementAt(St_index).IssueStatus == 1)
-                                    //                        {
-                                    //                            //GlobalDevice.PlcData.IsAllowIngredients[j] = false;//测试使用
-                                    //                            StockStatus.ElementAt(St_index).IssueStatus = 2;
-                                    //                            DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).StatusReset();
-                                    //                            int a = 0.SetBitValue((byte)(DeviceNum), true);
-                                    //                            byte[] test1 = a.ToBytes(BPA.Helper.DataFormat.ABCD);
-                                    //                            int item = test1.ToInt();
-                                    //                            string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item, 5);
-                                    //                            recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).UpLimtWeightFeedback = DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).deviceStatus.NowWeightFeedback;
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"{res}");
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
-                                    //                        }
-                                    //                    }
-                                    //                }
-                                    //            }
-                                    //        }
-                                    //    }
-                                    //}
-                                    //508配料项目代码
                                     if (GlobalDevice.PlcData.IsAllowIngredients[j])
                                     {
                                         int barrel = j + 1;//桶号
-                                        int cnt = GlobalDevice.PlcData.LocationFeedback[j];//允许配料的位置 1~10
+                                        int cnt = GlobalDevice.PlcData.LocationFeedback[j];//允许配料的位置 0~6
                                         if (RTrig.GetInstance("a").Start(GlobalDevice.PlcData.IsAllowIngredients[j]))
                                         {
                                             MessageNotify.GetInstance.ShowRunLog($"桶号：{barrel}，位置：{cnt}，允许配料");
                                         }
                                         int Location1 = 0;
+                                        int Location2 = 0;
                                         if (cnt == -1)
                                         {
-                                            MessageNotify.GetInstance.ShowRunLog("没有读取到配料的位置");
+                                            MessageNotify.GetInstance.ShowRunLog("错误");
                                             return;
                                         }
                                         else
                                         {
-                                            int a1 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == cnt);
-                                            Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a1).DeviceName && p.Loc == barrel);
+                                            switch (cnt)
+                                            {
+                                                case 1:
+                                                    int a1 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 1);
+                                                    int b1 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 2);
+                                                    if (a1 >= 0)
+                                                    {
+                                                        Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a1).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    if (b1 >= 0)
+                                                    {
+                                                        Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b1).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    break;
+                                                case 2:
+                                                    int a2 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 3);
+                                                    int b2 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 4);
+                                                    if (a2 >= 0)
+                                                    {
+                                                        Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a2).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    if (b2 >= 0)
+                                                    {
+                                                        Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b2).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    break;
+                                                case 3:
+                                                    int a3 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 5);
+                                                    int b3 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 6);
+                                                    if (a3 >= 0)
+                                                    {
+                                                        Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a3).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    if (b3 >= 0)
+                                                    {
+                                                        Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b3).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    break;
+                                                case 4:
+                                                    int a4 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 7);
+                                                    int b4 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 8);
+                                                    if (a4 >= 0)
+                                                    {
+                                                        Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a4).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    if (b4 >= 0)
+                                                    {
+                                                        Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b4).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    break;
+                                                case 5:
+                                                    int a5 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 9);
+                                                    int b5 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 10);
+                                                    if (a5 >= 0)
+                                                    {
+                                                        Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a5).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    if (b5 >= 0)
+                                                    {
+                                                        Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b5).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    break;
+                                                case 6:
+                                                    int a6 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 11);
+                                                    int b6 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 12);
+                                                    if (a6 >= 0)
+                                                    {
+                                                        Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a6).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    if (b6 >= 0)
+                                                    {
+                                                        Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b6).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    break;
+                                                default:
+                                                    break;
+                                            }
                                         }
                                         if (Location1 >= 0)
                                         {
@@ -611,34 +438,207 @@ namespace BPASmartClient.DosingSystem.ViewModel
                                                             //GlobalDevice.PlcData.IsAllowIngredients[j] = false;//测试使用
                                                             StockStatus.ElementAt(St_index).IssueStatus = 2;
                                                             DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).StatusReset();
-                                                            /*int a = 0.SetBitValue((byte)(DeviceNum), true);
+                                                            int a = 0.SetBitValue((byte)(DeviceNum), true);
                                                             byte[] test1 = a.ToBytes(BPA.Helper.DataFormat.ABCD);
-                                                            int item = test1.ToInt();*/
-                                                            if (DeviceNum >= 1 && DeviceNum <= 8) 
+                                                            int item = test1.ToInt();
+                                                            string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item, 2);
+                                                            MessageNotify.GetInstance.ShowRunLog($"{res}");
+                                                            MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");
+                                                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        if (Location1 >= 0)
+                                        {
+
+                                            string RawName111 = Recipes.ElementAt(i).RawMaterials.ElementAt(Location1).RawMaterialName;
+                                            int St_index111 = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName111);
+                                            if (Location2 >= 0 && ((Location1 >= 0 && StockStatus.ElementAt(St_index111).IssueStatus == 2)))
+                                            {
+                                                string RawName = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialName;
+                                                int abc = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceName == RawName);
+                                                int DeviceNum = DeviceInquire.GetInstance.devices.ElementAt(abc).DeviceNum;
+                                                if (DeviceNum > 0)
+                                                {
+                                                    float weight = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialWeight;
+                                                    int loc = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == RawName);
+                                                    if (loc >= 0 && RawName != null && weight >= 0)
+                                                    {
+                                                        int St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
+                                                        if (St_index < 0)
+                                                        {
+                                                            StockStatus.Add(new StockStatusModel()
                                                             {
-                                                                SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX130." + (DeviceNum - 1), true);
-                                                            }else if (DeviceNum >= 9 && DeviceNum <= 16)
+                                                                MaterialName = RawName,
+                                                                IssueWeight = weight,
+                                                                IssueStatus = 0,
+                                                            });
+                                                        }
+                                                        St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
+                                                        if (St_index >= 0)
+                                                        {
+                                                            if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 1 && StockStatus.ElementAt(St_index).IssueStatus == 0)
                                                             {
-                                                                SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX131." + (DeviceNum - 9), true);
+                                                                StockStatus.ElementAt(St_index).IssueStatus = 1;
+                                                                DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).Start(weight);
+                                                                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},开始出料");
                                                             }
-                                                            else if (DeviceNum >=17 && DeviceNum <= 24)
+                                                            if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 3 && StockStatus.ElementAt(St_index).IssueStatus == 1)
                                                             {
-                                                                SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX132." + (DeviceNum - 17), true);
-                                                            }else if (DeviceNum >= 25 && DeviceNum <= 32)
+                                                                //GlobalDevice.PlcData.IsAllowIngredients[j] = false;//测试使用
+                                                                StockStatus.ElementAt(St_index).IssueStatus = 2;
+                                                                DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).StatusReset();
+                                                                int a = 0.SetBitValue((byte)(DeviceNum), true);
+                                                                byte[] test1 = a.ToBytes(BPA.Helper.DataFormat.ABCD);
+                                                                int item = test1.ToInt();
+                                                                string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item, 5);
+                                                                MessageNotify.GetInstance.ShowRunLog($"{res}");
+                                                                //MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");
+                                                                MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item}");
+                                                                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        else
+                                        {
+                                            if (Location2 >= 0)
+                                            {
+                                                string RawName = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialName;
+                                                int abc = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceName == RawName);
+                                                int DeviceNum = DeviceInquire.GetInstance.devices.ElementAt(abc).DeviceNum;
+                                                if (DeviceNum >= 0)
+                                                {
+                                                    float weight = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialWeight;
+                                                    int loc = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == RawName);
+                                                    if (cnt > 0 && loc >= 0 && RawName != null && weight >= 0)
+                                                    {
+                                                        int St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
+                                                        if (St_index < 0)
+                                                        {
+                                                            StockStatus.Add(new StockStatusModel()
+                                                            {
+                                                                MaterialName = RawName,
+                                                                IssueWeight = weight,
+                                                                IssueStatus = 0,
+                                                            });
+                                                        }
+                                                        St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
+                                                        if (St_index >= 0)
+                                                        {
+                                                            if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 1 && StockStatus.ElementAt(St_index).IssueStatus == 0)
                                                             {
-                                                                SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX133." + (DeviceNum - 25), true);
+                                                                StockStatus.ElementAt(St_index).IssueStatus = 1;
+                                                                DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).Start(weight);
+                                                                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},开始出料");
+                                                            }
+                                                            if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 3 && StockStatus.ElementAt(St_index).IssueStatus == 1)
+                                                            {
+                                                                //GlobalDevice.PlcData.IsAllowIngredients[j] = false;//测试使用
+                                                                StockStatus.ElementAt(St_index).IssueStatus = 2;
+                                                                DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).StatusReset();
+                                                                int a = 0.SetBitValue((byte)(DeviceNum), true);
+                                                                byte[] test1 = a.ToBytes(BPA.Helper.DataFormat.ABCD);
+                                                                int item = test1.ToInt();
+                                                                string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item, 5);
+                                                                recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).UpLimtWeightFeedback = DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).deviceStatus.NowWeightFeedback;
+                                                                MessageNotify.GetInstance.ShowRunLog($"{res}");
+                                                                MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");
+                                                                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
                                                             }
-                                                            MessageNotify.GetInstance.ShowRunLog($"料仓：{DeviceNum}，配料完成");
-                                                            /*string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item, 2);
-                                                            MessageNotify.GetInstance.ShowRunLog($"{res}");
-                                                            MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");*/
-                                                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
                                                         }
                                                     }
                                                 }
                                             }
                                         }
                                     }
+                                    //508配料项目代码
+                                    //if (GlobalDevice.PlcData.IsAllowIngredients[j])
+                                    //{
+                                    //    int barrel = j + 1;//桶号
+                                    //    int cnt = GlobalDevice.PlcData.LocationFeedback[j];//允许配料的位置 1~10
+                                    //    if (RTrig.GetInstance("a").Start(GlobalDevice.PlcData.IsAllowIngredients[j]))
+                                    //    {
+                                    //        MessageNotify.GetInstance.ShowRunLog($"桶号：{barrel}，位置：{cnt}，允许配料");
+                                    //    }
+                                    //    int Location1 = 0;
+                                    //    if (cnt == -1)
+                                    //    {
+                                    //        MessageNotify.GetInstance.ShowRunLog("没有读取到配料的位置");
+                                    //        return;
+                                    //    }
+                                    //    else
+                                    //    {
+                                    //        int a1 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == cnt);
+                                    //        Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a1).DeviceName && p.Loc == barrel);
+                                    //    }
+                                    //    if (Location1 >= 0)
+                                    //    {
+                                    //        string RawName = Recipes.ElementAt(i).RawMaterials.ElementAt(Location1).RawMaterialName;
+                                    //        int abc = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceName == RawName);
+                                    //        int DeviceNum = DeviceInquire.GetInstance.devices.ElementAt(abc).DeviceNum;
+                                    //        if (DeviceNum > 0)
+                                    //        {
+                                    //            float weight = Recipes.ElementAt(i).RawMaterials.ElementAt(Location1).RawMaterialWeight;
+                                    //            int loc = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == RawName);
+                                    //            if (loc >= 0 && RawName != null && weight >= 0)
+                                    //            {
+                                    //                int St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
+                                    //                if (St_index < 0)
+                                    //                {
+                                    //                    StockStatus.Add(new StockStatusModel()
+                                    //                    {
+                                    //                        MaterialName = RawName,
+                                    //                        IssueWeight = weight,
+                                    //                        IssueStatus = 0,
+                                    //                    });
+                                    //                }
+                                    //                St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
+                                    //                if (St_index >= 0)
+                                    //                {
+                                    //                    if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 1 && StockStatus.ElementAt(St_index).IssueStatus == 0)
+                                    //                    {
+                                    //                        StockStatus.ElementAt(St_index).IssueStatus = 1;
+                                    //                        DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).Start(weight);
+                                    //                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},开始出料");
+                                    //                    }
+                                    //                    if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 3 && StockStatus.ElementAt(St_index).IssueStatus == 1)
+                                    //                    {
+                                    //                        //GlobalDevice.PlcData.IsAllowIngredients[j] = false;//测试使用
+                                    //                        StockStatus.ElementAt(St_index).IssueStatus = 2;
+                                    //                        DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).StatusReset();
+                                    //                        /*int a = 0.SetBitValue((byte)(DeviceNum), true);
+                                    //                        byte[] test1 = a.ToBytes(BPA.Helper.DataFormat.ABCD);
+                                    //                        int item = test1.ToInt();*/
+                                    //                        if (DeviceNum >= 1 && DeviceNum <= 8) 
+                                    //                        {
+                                    //                            SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX130." + (DeviceNum - 1), true);
+                                    //                        }else if (DeviceNum >= 9 && DeviceNum <= 16)
+                                    //                        {
+                                    //                            SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX131." + (DeviceNum - 9), true);
+                                    //                        }
+                                    //                        else if (DeviceNum >=17 && DeviceNum <= 24)
+                                    //                        {
+                                    //                            SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX132." + (DeviceNum - 17), true);
+                                    //                        }else if (DeviceNum >= 25 && DeviceNum <= 32)
+                                    //                        {
+                                    //                            SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX133." + (DeviceNum - 25), true);
+                                    //                        }
+                                    //                        MessageNotify.GetInstance.ShowRunLog($"料仓：{DeviceNum}，配料完成");
+                                    //                        /*string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item, 2);
+                                    //                        MessageNotify.GetInstance.ShowRunLog($"{res}");
+                                    //                        MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");*/
+                                    //                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
+                                    //                    }
+                                    //                }
+                                    //            }
+                                    //        }
+                                    //    }
+                                    //}
                                 }
                                 int Finish_Count = StockStatus.Where(s => s.IssueStatus == 2).Count();
                                 if (StockStatus.Count >= Recipes.ElementAt(i).RawMaterials.Count && Finish_Count >= Recipes.ElementAt(i).RawMaterials.Count) //配方配料完成

From 9a1f09697f4232f8bc47b79cdcd350c3fed0225b Mon Sep 17 00:00:00 2001
From: NXX <447201003@qq>
Date: Mon, 10 Apr 2023 09:36:29 +0800
Subject: [PATCH 16/96] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkF/Control_MorkF.cs         |  2 +-
 .../Convert/PotActionToVisibilityConvert.cs   | 35 +++++++++++++++++++
 BPASmartClient.MorkF/Model/FoodMenuModel.cs   | 21 +++++++++++
 BPASmartClient.MorkF/View/LocalMenu.xaml      | 25 +++++++++++++
 4 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 BPASmartClient.MorkF/Convert/PotActionToVisibilityConvert.cs
 create mode 100644 BPASmartClient.MorkF/Model/FoodMenuModel.cs

diff --git a/BPASmartClient.MorkF/Control_MorkF.cs b/BPASmartClient.MorkF/Control_MorkF.cs
index 0d1ee202..3e523895 100644
--- a/BPASmartClient.MorkF/Control_MorkF.cs
+++ b/BPASmartClient.MorkF/Control_MorkF.cs
@@ -1345,7 +1345,7 @@ namespace BPASmartClient.MorkF
 
             //MessageLog.GetInstance.Show("机械臂移动操作完成");
 
-            Thread.Sleep(500);
+            Thread.Sleep(300);
 
             return true;
         }
diff --git a/BPASmartClient.MorkF/Convert/PotActionToVisibilityConvert.cs b/BPASmartClient.MorkF/Convert/PotActionToVisibilityConvert.cs
new file mode 100644
index 00000000..f63a3b2d
--- /dev/null
+++ b/BPASmartClient.MorkF/Convert/PotActionToVisibilityConvert.cs
@@ -0,0 +1,35 @@
+using AlibabaCloud.SDK.Iot20180120.Models;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace BPASmartClient.MorkF.Convert
+{
+    internal class PotActionToVisibilityConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            Visibility vs = Visibility.Collapsed;
+            if(value is string action)
+            {
+                switch (action)
+                {
+                    case "":
+                    default:
+                        break;
+                }
+            }
+            return vs;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/BPASmartClient.MorkF/Model/FoodMenuModel.cs b/BPASmartClient.MorkF/Model/FoodMenuModel.cs
new file mode 100644
index 00000000..48d0f862
--- /dev/null
+++ b/BPASmartClient.MorkF/Model/FoodMenuModel.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkF.Model
+{
+    public class FoodMenuModel
+    {
+        public string ID { get; set; }
+        public string FoodName { get; set; }
+        public Dictionary<int,int> FoodHouseMaterials { get; set; } = new Dictionary<int,int>();
+   
+    }
+
+   
+
+
+        
+}
diff --git a/BPASmartClient.MorkF/View/LocalMenu.xaml b/BPASmartClient.MorkF/View/LocalMenu.xaml
index 1731d793..56e6dba7 100644
--- a/BPASmartClient.MorkF/View/LocalMenu.xaml
+++ b/BPASmartClient.MorkF/View/LocalMenu.xaml
@@ -18,6 +18,30 @@
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
+            <Style TargetType="ListBoxItem" x:Key="newFoodList" >
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                            <Border  BorderBrush="Black" BorderThickness="0" Background="Transparent" Margin="5">
+                                <StackPanel Orientation="Vertical">
+                                    <TextBlock Text="步骤:"/>
+                                    <TextBox  Text="{Binding FryTime}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <ComboBox  Width="120" ItemsSource="{Binding DataContext.strPotActions , RelativeSource={RelativeSource AncestorType=Window,Mode=FindAncestor}}"
+                                      SelectedValue="{Binding Actions}" Margin="10,0"/>
+                                    <TextBlock Text="时间"/>
+                                    <TextBox  Text="{Binding During}" Margin="10,0"/>
+                                    
+                                    <TextBox Text="{Binding SeasoningLists[0].Loc}" Margin="10,0"/>
+                                    <TextBox Text="{Binding SeasoningLists[0].Qty}" Margin="10,0"/>
+                                    <Button  Content="删除" Margin="10,0" HorizontalAlignment="Center"/>
+                                </StackPanel>
+                                
+                            </Border>
+
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
             <Style TargetType="ListBoxItem" >
                 <Setter Property="Template">
                     <Setter.Value>
@@ -96,6 +120,7 @@
         </Grid>
         <ListBox x:Name="listview1" Grid.Row="3"  BorderBrush="Black" BorderThickness="0" HorizontalAlignment="Center"  AllowDrop="True"
                   ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding PotActionStep}" Margin=" 10" Background="Transparent"
+                  ItemContainerStyle="{DynamicResource newFoodList}"
                  >
             
         </ListBox>

From 372d2588763e0b9e9dd0d5b960744dd9205027f7 Mon Sep 17 00:00:00 2001
From: NXX <447201003@qq>
Date: Mon, 10 Apr 2023 18:00:10 +0800
Subject: [PATCH 17/96] =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkBF/Control_MorkBF.cs       | 16 +++----
 BPASmartClient.MorkF/Control_MorkF.cs         | 15 ++++---
 BPASmartClient.MorkF/Model/MaterialSurplus.cs |  2 +-
 BPASmartClient/Control/FoodMenu.xaml          | 45 +++++++++++++++++++
 BPASmartClient/Control/FoodMenu.xaml.cs       | 26 +++++++++++
 BPASmartClient/MainWindow.xaml                |  8 ++++
 6 files changed, 96 insertions(+), 16 deletions(-)
 create mode 100644 BPASmartClient/Control/FoodMenu.xaml
 create mode 100644 BPASmartClient/Control/FoodMenu.xaml.cs

diff --git a/BPASmartClient.MorkBF/Control_MorkBF.cs b/BPASmartClient.MorkBF/Control_MorkBF.cs
index 94d82768..a87d88f7 100644
--- a/BPASmartClient.MorkBF/Control_MorkBF.cs
+++ b/BPASmartClient.MorkBF/Control_MorkBF.cs
@@ -37,14 +37,14 @@ namespace BPASmartClient.MorkBF
             MonitorViewModel.DeviceId = DeviceId;
             ActionManage.GetInstance.Register(new Action(() =>
             {
-                GlobalFoodMenu.LocalFoodMenus.Clear();
-                if (BPASmartClient.Helper.Json<LocalFryPotMessage>.Data.FryPotMessage.Count > 0)
-                {
-                    foreach (var item in BPASmartClient.Helper.Json<LocalFryPotMessage>.Data.FryPotMessage)
-                    {
-                        GlobalFoodMenu.LocalFoodMenus.Add(new FoodMenuModel { GoodKey = item.GoodKey, GoodName = item.GoodName });
-                    }
-                }
+                //GlobalFoodMenu.LocalFoodMenus.Clear();
+                //if (BPASmartClient.Helper.Json<LocalFryPotMessage>.Data.FryPotMessage.Count > 0)
+                //{
+                //    foreach (var item in BPASmartClient.Helper.Json<LocalFryPotMessage>.Data.FryPotMessage)
+                //    {
+                //        GlobalFoodMenu.LocalFoodMenus.Add(new FoodMenuModel { GoodKey = item.GoodKey, GoodName = item.GoodName });
+                //    }
+                //}
             }), "更新菜单");
             CommandRegist();//调试
             ServerInit();
diff --git a/BPASmartClient.MorkF/Control_MorkF.cs b/BPASmartClient.MorkF/Control_MorkF.cs
index 3e523895..db339e8e 100644
--- a/BPASmartClient.MorkF/Control_MorkF.cs
+++ b/BPASmartClient.MorkF/Control_MorkF.cs
@@ -1,4 +1,5 @@
 using BPA.Message;
+using System;
 using BPA.Message.Enum;
 using BPASmartClient.Device;
 using BPASmartClient.EventBus;
@@ -755,10 +756,10 @@ namespace BPASmartClient.MorkF
         private void StartOrderMain(object o)
         {
             if (o == null) return;
-            if (o is FoodMenuModel good)
-            {
-                NewStartLocalOrder(good.GoodName);
-            }
+            //if (o is FoodMenuModel good)
+            //{
+            //    NewStartLocalOrder(good.GoodName);
+            //}
 
                 
             //if (o == null) return;
@@ -2477,7 +2478,7 @@ namespace BPASmartClient.MorkF
                         if (materialInfo != null) 
                         {
                             //if
-                            if(Convert.ToInt32(materialInfo.Qty) - goodBatching.BatchingCount < 0)
+                            if(System.Convert.ToInt32(materialInfo.Qty) - goodBatching.BatchingCount < 0)
                             {
                                 MessageLog.GetInstance.ShowEx($"{materialInfo.Name}不够，请更新菜品库，并点击检测");
                                 return;
@@ -2887,12 +2888,12 @@ namespace BPASmartClient.MorkF
                     if (batchingInfo == null)
                     {
                         //为空就新增
-                        BatchingInfos.Add(new BatchingInfo() { BatchingCount = Convert.ToInt32(surplus.Qty) - stagingCount, BatchingLoc = surplus.Loc, BatchingId = surplus.Key });
+                        BatchingInfos.Add(new BatchingInfo() { BatchingCount = System.Convert.ToInt32(surplus.Qty) - stagingCount, BatchingLoc = surplus.Loc, BatchingId = surplus.Key });
                     }
                     else
                     {
                         batchingInfo.BatchingLoc = surplus.Loc;
-                        batchingInfo.BatchingCount = Convert.ToInt32(surplus.Qty) - stagingCount;
+                        batchingInfo.BatchingCount = System.Convert.ToInt32(surplus.Qty) - stagingCount;
                     }
                 }
                 Thread.Sleep(1000);
diff --git a/BPASmartClient.MorkF/Model/MaterialSurplus.cs b/BPASmartClient.MorkF/Model/MaterialSurplus.cs
index b75043fd..0bef04b9 100644
--- a/BPASmartClient.MorkF/Model/MaterialSurplus.cs
+++ b/BPASmartClient.MorkF/Model/MaterialSurplus.cs
@@ -87,7 +87,7 @@ namespace BPASmartClient.MorkF
                 foreach(MaterialInfo material in materials)
                 {
                     //surplus += int.Parse(material.Qty.ToString());
-                    surplus += Convert.ToInt32(material.Qty);
+                    surplus += System.Convert.ToInt32(material.Qty);
                 }
                 return true;
             }
diff --git a/BPASmartClient/Control/FoodMenu.xaml b/BPASmartClient/Control/FoodMenu.xaml
new file mode 100644
index 00000000..44e6465a
--- /dev/null
+++ b/BPASmartClient/Control/FoodMenu.xaml
@@ -0,0 +1,45 @@
+<UserControl x:Class="Control.FoodMenu"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:Control"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Name="FoodMenu">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+            <Style TargetType="ListBoxItem">
+                <Setter Property="Margin" Value="2"/>
+                <Setter Property="FontSize" Value="22"/>
+                <Setter Property="FontWeight" Value="Black"/>
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="FontFamily" Value="楷体"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate  TargetType="ListBoxItem">
+                            <Border BorderBrush="Black" BorderThickness="0" Background="Transparent">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="80*"/>
+                                        <ColumnDefinition Width="20*"/>
+                                    </Grid.ColumnDefinitions>
+                                </Grid>
+                            </Border>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid>
+        <ListBox>
+            
+            
+        </ListBox>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient/Control/FoodMenu.xaml.cs b/BPASmartClient/Control/FoodMenu.xaml.cs
new file mode 100644
index 00000000..245a4e39
--- /dev/null
+++ b/BPASmartClient/Control/FoodMenu.xaml.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Control
+{
+    /// <summary>
+    /// FoodMenu.xaml 的交互逻辑
+    /// </summary>
+    public partial class FoodMenu : UserControl
+    {
+        public FoodMenu()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient/MainWindow.xaml b/BPASmartClient/MainWindow.xaml
index 35bc41c3..69810d4f 100644
--- a/BPASmartClient/MainWindow.xaml
+++ b/BPASmartClient/MainWindow.xaml
@@ -80,6 +80,14 @@
                             Content="订单监视"
                             Cursor="Hand"
                             Tag="OrderStatusView" />
+                        <Button
+                            Width="120"
+                            Height="40"
+                            Margin="20,0"
+                            Click="MenuItem_Click"
+                            Content="本地菜单"
+                            Cursor="Hand"
+                            Tag="OrderStatusView" />
                     </StackPanel>
                     <!--#endregion-->
                     <Menu x:Name="myMenu" Visibility="Visible">

From fa783064f7ff172f1a63b5f96a05a8d9d09becf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Tue, 11 Apr 2023 10:41:47 +0800
Subject: [PATCH 18/96] =?UTF-8?q?=E7=94=B3=E5=94=90=E9=85=8D=E6=96=99?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UserControls/ConveyBelt2.xaml             |   3 +-
 .../UserControls/ConveyBelt2.xaml.cs          |  49 ++++++--
 BPASmartClient.DosingSystemSingle/App.xaml    |   3 +-
 BPASmartClient.S7Net/SiemensHelper.cs         |   2 +-
 DosingSystem/App.xaml.cs                      |  29 +++++
 DosingSystem/View/TempManageControlView.xaml  |  99 +++++++++++++++
 .../View/TempManageControlView.xaml.cs        |  28 +++++
 .../ViewModel/TempManageControlViewModel.cs   | 115 ++++++++++++++++++
 8 files changed, 315 insertions(+), 13 deletions(-)
 create mode 100644 DosingSystem/View/TempManageControlView.xaml
 create mode 100644 DosingSystem/View/TempManageControlView.xaml.cs
 create mode 100644 DosingSystem/ViewModel/TempManageControlViewModel.cs

diff --git a/BPASmartClient.CustomResource/UserControls/ConveyBelt2.xaml b/BPASmartClient.CustomResource/UserControls/ConveyBelt2.xaml
index 79e65167..55ea5e43 100644
--- a/BPASmartClient.CustomResource/UserControls/ConveyBelt2.xaml
+++ b/BPASmartClient.CustomResource/UserControls/ConveyBelt2.xaml
@@ -83,7 +83,7 @@
                             Duration="0:0:20" />
                     </Storyboard>
                 </VisualState>
-                <VisualState Name="Stop" />
+                <!--<VisualState Name="Stop" />-->
             </VisualStateGroup>
             <VisualStateGroup Name="DirectionGroup">
                 <VisualState Name="LeftState">
@@ -96,6 +96,7 @@
                             Duration="0:0:20" />
                     </Storyboard>
                 </VisualState>
+                <VisualState Name="Stop" />
                 <VisualState Name="RightState">
                     <Storyboard RepeatBehavior="Forever">
                         <DoubleAnimation
diff --git a/BPASmartClient.CustomResource/UserControls/ConveyBelt2.xaml.cs b/BPASmartClient.CustomResource/UserControls/ConveyBelt2.xaml.cs
index a5500610..5b716772 100644
--- a/BPASmartClient.CustomResource/UserControls/ConveyBelt2.xaml.cs
+++ b/BPASmartClient.CustomResource/UserControls/ConveyBelt2.xaml.cs
@@ -37,7 +37,22 @@ namespace BPASmartClient.CustomResource.UserControls
 
         private static void OnRunningChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            VisualStateManager.GoToState(d as ConveyBelt2, (bool)e.NewValue ? "RunState" : "Stop", false);
+            string status = "Stop";
+            if ((bool)e.NewValue)
+            {
+                if ((d as ConveyBelt2)?.BeltDirection == 0)
+                {
+                    VisualStateManager.GoToState(d as ConveyBelt2, "RightState", false);
+                    return;
+                }
+                else
+                {
+                    VisualStateManager.GoToState(d as ConveyBelt2, "LeftState", false);
+                    return;
+                }
+            }
+            VisualStateManager.GoToState(d as ConveyBelt2, status, false);
+            //VisualStateManager.GoToState(d as ConveyBelt2, (bool)e.NewValue ? "RunState" : "Stop", false);
         }
 
         public double BeltWidth
@@ -59,7 +74,7 @@ namespace BPASmartClient.CustomResource.UserControls
             if (BeltHeight > 100)
             {
                 pathFigure.StartPoint = new Point(0, 35 + (BeltHeight - 100) / 2);
-                pathFigure.Segments.Add(new LineSegment(new Point(BeltWidth - 10, 35 + (BeltHeight - 100)/2), true));
+                pathFigure.Segments.Add(new LineSegment(new Point(BeltWidth - 10, 35 + (BeltHeight - 100) / 2), true));
             }
             else
             {
@@ -74,7 +89,7 @@ namespace BPASmartClient.CustomResource.UserControls
             {
                 this.recDown.Margin = new Thickness(0, BeltHeight - 20, 0, 0);
             }
-            else 
+            else
             {
                 this.recDown.Margin = new Thickness(0, 80, 0, 0);
             }
@@ -115,15 +130,29 @@ namespace BPASmartClient.CustomResource.UserControls
 
         private static void OnDirectionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-
-            if ((d as ConveyBelt2)?.BeltDirection == 0)
-            {
-                VisualStateManager.GoToState(d as ConveyBelt2, "RightState", false);
-            }
-            else
+            string status = "Stop";
+            if ((d as ConveyBelt2).IsRun)
             {
-                VisualStateManager.GoToState(d as ConveyBelt2, "LeftState", false);
+                if ((d as ConveyBelt2)?.BeltDirection == 0)
+                {
+                    VisualStateManager.GoToState(d as ConveyBelt2, "RightState", false);
+                    return;
+                }
+                else
+                {
+                    VisualStateManager.GoToState(d as ConveyBelt2, "LeftState", false);
+                    return;
+                }
             }
+            VisualStateManager.GoToState(d as ConveyBelt2, status, false);
+            //if ((d as ConveyBelt2)?.BeltDirection == 0)
+            //{
+            //    VisualStateManager.GoToState(d as ConveyBelt2, "RightState", false);
+            //}
+            //else
+            //{
+            //    VisualStateManager.GoToState(d as ConveyBelt2, "LeftState", false);
+            //}
 
         }
     }
diff --git a/BPASmartClient.DosingSystemSingle/App.xaml b/BPASmartClient.DosingSystemSingle/App.xaml
index 7fb508f6..49315c62 100644
--- a/BPASmartClient.DosingSystemSingle/App.xaml
+++ b/BPASmartClient.DosingSystemSingle/App.xaml
@@ -1,4 +1,5 @@
-<Application x:Class="BPASmartClient.DosingSystemSingle.App"
+<Application
+    x:Class="BPASmartClient.DosingSystemSingle.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:con="clr-namespace:BPASmartClient.CustomResource.Converters;assembly=BPASmartClient.CustomResource"
diff --git a/BPASmartClient.S7Net/SiemensHelper.cs b/BPASmartClient.S7Net/SiemensHelper.cs
index 01c59f24..5d943ecf 100644
--- a/BPASmartClient.S7Net/SiemensHelper.cs
+++ b/BPASmartClient.S7Net/SiemensHelper.cs
@@ -120,7 +120,7 @@ namespace BPASmartClient.S7Net
         }
         public void WriteInt16(int db, short txt, int startAddress = 0)
         {
-            var bytes =BitConverter.GetBytes(txt);
+            var bytes = BitConverter.GetBytes(txt);
             myPlc.WriteBytes(DataType.DataBlock, db, startAddress, bytes);
 
         }
diff --git a/DosingSystem/App.xaml.cs b/DosingSystem/App.xaml.cs
index 284a1be0..11317a5d 100644
--- a/DosingSystem/App.xaml.cs
+++ b/DosingSystem/App.xaml.cs
@@ -17,6 +17,9 @@ using BPASmartClient.DosingSystem.Model;
 using System.Diagnostics;
 using System.IO;
 using BPASmartClient.Update.Model;
+using BPASmartClient.DosingSystem.ViewModel;
+using System.Drawing;
+using System.Windows.Media;
 
 namespace BPASmartClient.DosingSystem
 {
@@ -31,6 +34,22 @@ namespace BPASmartClient.DosingSystem
         protected override void OnStartup(StartupEventArgs e)
         {
             bool createNew;
+            MessageLog.GetInstance.NotifyShow = new Action<string>(o =>
+            {
+                DebugLogViewModel.MessageModels.Add(new MessageModel()
+                {
+                    LogInfo = o,
+                    Forground = System.Windows.Media.Brushes.DeepSkyBlue
+                });
+            });
+            MessageLog.GetInstance.NotifyShowEx = new Action<string>(o =>
+            {
+                DebugLogViewModel.MessageModels.Add(new MessageModel()
+                {
+                    LogInfo = o,
+                    Forground = System.Windows.Media.Brushes.Red
+                });
+            });
             ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, "DosingSystem", out createNew);
             if (!createNew)
             {
@@ -42,6 +61,7 @@ namespace BPASmartClient.DosingSystem
             BPASmartClient.Helper.SystemHelper.GetInstance.CreateDesktopShortcut();
             MenuInit();
             DataInit();
+            SiemensTest.GetInstance.Init();
             DeviceInquire.GetInstance.Init();//配料机设备上线监听，设备列表初始化
             MainView mv = new MainView();
             mv.TitleName = $"味魔方管理系统软件[简称：味魔方] V1.0.1";
@@ -173,6 +193,15 @@ namespace BPASmartClient.DosingSystem
                 AssemblyName = "BPASmartClient.DosingSystem",
                 ToggleWindowPath = "View.ConveyerBeltManualView"
             });
+
+            ManualControl.Add(new SubMenumodel()
+            {
+                SubMenuName = "配料输送带控制",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.DosingSystem",
+                ToggleWindowPath = "View.TempManageControlView"
+            });
+
             //ManualControl.Add(new SubMenumodel()
             //{
             //    SubMenuName = "料仓控制",
diff --git a/DosingSystem/View/TempManageControlView.xaml b/DosingSystem/View/TempManageControlView.xaml
new file mode 100644
index 00000000..588401a2
--- /dev/null
+++ b/DosingSystem/View/TempManageControlView.xaml
@@ -0,0 +1,99 @@
+<UserControl
+    x:Class="BPASmartClient.DosingSystem.View.TempManageControlView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.DosingSystem.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.DosingSystem.ViewModel"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:TempManageControlViewModel />
+    </UserControl.DataContext>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+        <Grid Margin="8">
+            <Grid
+                Name="cy"
+                Grid.Row="0"
+                Margin="5">
+                <pry:ImageBorder
+                    Grid.RowSpan="2"
+                    Width="{Binding ElementName=cy, Path=ActualWidth}"
+                    Height="{Binding ElementName=cy, Path=ActualHeight}" />
+
+                <StackPanel Background="Transparent">
+                    <Grid Height="40">
+                        <Image
+                            Margin="2,3,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Source="/BPASmartClient.CustomResource;component/Image/标签.png" />
+                        <TextBlock
+                            Margin="10,10,0,0"
+                            VerticalAlignment="Top"
+                            FontSize="16"
+                            Foreground="Aqua"
+                            Text="{Binding Name}" />
+                        <StackPanel
+                            Margin="0,0,20,0"
+                            HorizontalAlignment="Right"
+                            Orientation="Horizontal">
+                            <TextBlock
+                                Margin="0,0,2,0"
+                                Style="{StaticResource TextBlockStyle}"
+                                Text="输送带反转控制" />
+                            <ToggleButton
+                                Width="80"
+                                Height="30"
+                                Margin="5,0,5,0"
+                                Background="Transparent"
+                                FontSize="20"
+                                IsChecked="{Binding Reversal}"
+                                Style="{StaticResource SwitchToggleButtonStyle}" />
+
+                            <TextBlock
+                                Margin="20,0,5,0"
+                                VerticalAlignment="Center"
+                                FontSize="20"
+                                Foreground="#00c2f4"
+                                Text="输送带正转控制" />
+
+                            <ToggleButton
+                                Width="80"
+                                Height="30"
+                                Margin="5,0,5,0"
+                                Background="Transparent"
+                                FontSize="20"
+                                IsChecked="{Binding Foreward}"
+                                Style="{StaticResource SwitchToggleButtonStyle}" />
+
+                        </StackPanel>
+
+                    </Grid>
+                    <Grid Name="gr" Height="200">
+                        <pry:ConveyBelt2
+                            Grid.RowSpan="4"
+                            Margin="-12,0,10,0"
+                            BeltDashThickess="50"
+                            BeltDirection="{Binding BeltDirection}"
+                            BeltHeight="{Binding ElementName=gr, Path=ActualHeight}"
+                            BeltWidth="{Binding ElementName=gr, Path=ActualWidth}"
+                            IsRun="{Binding IsRun}" />
+                    </Grid>
+                </StackPanel>
+            </Grid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/DosingSystem/View/TempManageControlView.xaml.cs b/DosingSystem/View/TempManageControlView.xaml.cs
new file mode 100644
index 00000000..cd3b265a
--- /dev/null
+++ b/DosingSystem/View/TempManageControlView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.DosingSystem.View
+{
+    /// <summary>
+    /// TempManageControlView.xaml 的交互逻辑
+    /// </summary>
+    public partial class TempManageControlView : UserControl
+    {
+        public TempManageControlView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DosingSystem/ViewModel/TempManageControlViewModel.cs b/DosingSystem/ViewModel/TempManageControlViewModel.cs
new file mode 100644
index 00000000..179e6ba3
--- /dev/null
+++ b/DosingSystem/ViewModel/TempManageControlViewModel.cs
@@ -0,0 +1,115 @@
+using BPA.Helper;
+using BPASmartClient.S7Net;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.DosingSystem.ViewModel
+{
+    public class TempManageControlViewModel : NotifyBase
+    {
+        public TempManageControlViewModel()
+        {
+
+        }
+
+        /// <summary>
+        /// 正转
+        /// </summary>
+        public bool Foreward
+        {
+            get { return _mForeward; }
+            set
+            {
+                _mForeward = value;
+                BeltDirection = 0;
+                IsRun = _mForeward;
+                OnPropertyChanged();
+                Task.Factory.StartNew(() =>
+                {
+                    if (Reversal || !_mForeward)
+                    {
+                        SiemensTest.GetInstance.sh.Write("M1000.1", true);
+                        Thread.Sleep(2000);
+                        SiemensTest.GetInstance.sh.Write("M1000.1", false);
+                    }
+                    if (_mForeward)
+                    {
+                        SiemensTest.GetInstance.sh.Write("M1000.0", true);
+                        Thread.Sleep(2000);
+                        SiemensTest.GetInstance.sh.Write("M1000.0", false);
+                    }
+                });
+            }
+        }
+        private bool _mForeward;
+
+        /// <summary>
+        /// 反转
+        /// </summary>
+        public bool Reversal
+        {
+            get { return _mReversal; }
+            set
+            {
+                _mReversal = value;
+                BeltDirection = 1;
+                IsRun = _mReversal;
+                OnPropertyChanged();
+                Task.Factory.StartNew(() =>
+                {
+                    if (Foreward || !_mReversal)
+                    {
+                        SiemensTest.GetInstance.sh.Write("M1000.1", true);
+                        Thread.Sleep(2000);
+                        SiemensTest.GetInstance.sh.Write("M1000.1", false);
+                    }
+                    if (_mReversal)
+                    {
+                        SiemensTest.GetInstance.sh.Write("M1000.3", true);
+                        Thread.Sleep(2000);
+                        SiemensTest.GetInstance.sh.Write("M1000.3", false);
+                    }
+                });
+            }
+        }
+        private bool _mReversal;
+
+        public bool IsRun { get { return _mIsRun; } set { _mIsRun = value; OnPropertyChanged(); } }
+        private bool _mIsRun;
+
+
+        public int BeltDirection { get { return _mBeltDirection; } set { _mBeltDirection = value; OnPropertyChanged(); } }
+        private int _mBeltDirection;
+
+    }
+
+    public class SiemensTest
+    {
+
+        private volatile static SiemensTest _Instance;
+        public static SiemensTest GetInstance => _Instance ?? (_Instance = new SiemensTest());
+        private SiemensTest() { }
+
+        public SiemensHelper sh { get; set; } = new SiemensHelper();
+
+        public void Init()
+        {
+            Task.Run(() =>
+            {
+                //sh.Connect(S7.Net.CpuType.S71500, "192.168.1.12");
+                sh.Connect(S7.Net.CpuType.S71200, "192.168.0.15");
+                if (sh.IsConnected)
+                    MessageLog.GetInstance.Show("西门子PLC连接成功");
+                else
+                    MessageLog.GetInstance.Show("西门子PLC连接失败");
+            });
+            //sh.Connect(S7.Net.CpuType.S71500, "192.168.1.12");
+            //sh.Connect(S7.Net.CpuType.S71200, "192.168.0.15");
+        }
+
+    }
+}

From f18f2ff8d4ffcc7b912004b0752aec1ab42839a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Tue, 11 Apr 2023 13:11:51 +0800
Subject: [PATCH 19/96] =?UTF-8?q?=E8=8A=82=E5=8D=A1=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E4=BA=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.JakaRobot/JaKaHelper.cs | 153 +++++++++++++++++++------
 BPASmartClient/Control/FoodMenu.xaml   |  48 ++++----
 WpfApp1/App.xaml                       |  15 ++-
 WpfApp1/MainWindow.xaml                |  35 ++++--
 WpfApp1/MainWindow.xaml.cs             | 129 ++++++++++++---------
 WpfApp1/WpfApp1.csproj                 |   1 +
 6 files changed, 248 insertions(+), 133 deletions(-)

diff --git a/BPASmartClient.JakaRobot/JaKaHelper.cs b/BPASmartClient.JakaRobot/JaKaHelper.cs
index 85c0ce2f..046ccc43 100644
--- a/BPASmartClient.JakaRobot/JaKaHelper.cs
+++ b/BPASmartClient.JakaRobot/JaKaHelper.cs
@@ -1,5 +1,7 @@
 using BPASmartClient.Helper;
 using BPASmartClient.Message;
+using System.Net;
+using System.Net.NetworkInformation;
 using System.Text;
 
 namespace BPASmartClient.JakaRobot
@@ -60,7 +62,7 @@ namespace BPASmartClient.JakaRobot
         //public const string SENCE_初始位 = "20000";
 
         #endregion
-        private int rshd = -1;
+        public int rshd = -1;
         private bool login = false;
 
         /// <summary>
@@ -74,49 +76,124 @@ namespace BPASmartClient.JakaRobot
         public bool IsIdle { get; set; } = false;
         public bool IsConnected { get { return login; } }
         public bool IsDeviceFirstInit { get; set; }
+        private string IpAddress { get; set; }
+        private bool IsPingOk { get; set; }
+
+        public void Conn(string ip)
+        {
+            jakaAPI.create_handler(ip.ToCharArray(), ref rshd);
+            login = true;
+        }
 
         public void Connect(string ip)
         {
-            bool ErrorFlag = false;
-            ThreadManage.GetInstance().StartLong(new Action(() =>
+            MessageLog.GetInstance.Show("节卡机器人连接中。。。。。");
+            IpAddress = ip;
+            Task.Factory.StartNew(() =>
             {
-                if (rshd == -1 || login == false) 
+                while (!IsPingOk)
                 {
-                    try
-                    {
-                        jakaAPI.create_handler(ip.ToCharArray(), ref rshd);
-                        login = true;
-                    }
-                    catch (Exception ex)
-                    {
-                        if (!ErrorFlag)
-                        {
-                            MessageLog.GetInstance.ShowEx(ex.ToString());
-                            ErrorFlag = true;
-                            login = false;
-                        }
-                        Thread.Sleep(3000);
-                    }
+                    Ping myPing = new Ping();
+                    myPing.PingCompleted += new PingCompletedEventHandler(_myPing_PingCompleted);
+                    myPing.SendAsync(IpAddress, 1000, null);
+                    Thread.Sleep(3000);
                 }
-                if (login && IsDeviceFirstInit==false)
+            });
+
+
+            //bool ErrorFlag = false;
+            //ThreadManage.GetInstance().StartLong(new Action(() =>
+            //{
+            //    if (rshd == -1 || login == false)
+            //    {
+            //        try
+            //        {
+            //            jakaAPI.create_handler(ip.ToCharArray(), ref rshd);
+            //            login = true;
+            //        }
+            //        catch (Exception ex)
+            //        {
+            //            if (!ErrorFlag)
+            //            {
+            //                MessageLog.GetInstance.ShowEx(ex.ToString());
+            //                ErrorFlag = true;
+            //                login = false;
+            //            }
+            //            Thread.Sleep(3000);
+            //        }
+            //    }
+            //    if (login && IsDeviceFirstInit == false)
+            //    {
+            //        try
+            //        {
+            //            Power_On();//打开机器人电源
+            //            Thread.Sleep(1000);
+            //            Enable_robot();//机器人上使能
+            //            IsDeviceFirstInit = true;
+            //            MessageLog.GetInstance.Show("机器人已上电使能");
+            //        }
+            //        catch (Exception ex)
+            //        {
+            //            MessageLog.GetInstance.ShowEx("机器人未完成上电和使能");
+            //        }
+            //    }
+            //    Thread.Sleep(5000);
+            //}), $"节卡机器人连接", true);
+
+        }
+
+        private void _myPing_PingCompleted(object sender, PingCompletedEventArgs e)
+        {
+            if (e.Reply != null && e.Reply.Status == IPStatus.Success)
+            {
+                IsPingOk = true;
+                MessageLog.GetInstance.Show("节卡机器人物理网络准备就绪");
+                Thread.Sleep(3000);
+                bool ErrorFlag = false;
+                ThreadManage.GetInstance().StartLong(new Action(() =>
                 {
-                    try
+                    if (rshd == -1 || login == false)
                     {
-                        Power_On();//打开机器人电源
-                        Thread.Sleep(1000);
-                        Enable_robot();//机器人上使能
-                        IsDeviceFirstInit = true;
-                        MessageLog.GetInstance.Show("机器人已上电使能");
+                        try
+                        {
+                            int result = jakaAPI.create_handler(IpAddress.ToCharArray(), ref rshd);
+                            login = true;
+                            MessageLog.GetInstance.Show($"节卡机器人创建连接成功,句柄：{rshd},返回值：{result}");
+                        }
+                        catch (Exception ex)
+                        {
+                            if (!ErrorFlag)
+                            {
+                                MessageLog.GetInstance.ShowEx(ex.ToString());
+                                ErrorFlag = true;
+                                login = false;
+                            }
+                            Thread.Sleep(3000);
+                        }
                     }
-                    catch (Exception ex)
+                    if (login && IsDeviceFirstInit == false)
                     {
-                        MessageLog.GetInstance.ShowEx("机器人未完成上电和使能");
+                        try
+                        {
+                            MessageLog.GetInstance.Show("节卡机器人打开电源准备");
+                            Thread.Sleep(2000);
+                            Power_On();//打开机器人电源
+                            Thread.Sleep(1000);
+                            MessageLog.GetInstance.Show("节卡机器人上使能准备");
+                            Enable_robot();//机器人上使能
+                            IsDeviceFirstInit = true;
+                            MessageLog.GetInstance.Show("机器人已上电使能");
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageLog.GetInstance.ShowEx("机器人未完成上电和使能");
+                        }
                     }
-                }
-                Thread.Sleep(5000);
-            }), $"节卡机器人连接", true);
-           
+                    Thread.Sleep(5000);
+                }), $"节卡机器人连接", true);
+            }
         }
+
         public void Power_On()
         {
             if (login)
@@ -129,10 +206,10 @@ namespace BPASmartClient.JakaRobot
                 {
                     MessageLog.GetInstance.ShowEx(ave.ToString());
                 }
-                //catch (Exception ex)
-                //{
-                //    MessageLog.GetInstance.ShowEx(ex.ToString());
-                //}
+                catch (Exception ex)
+                {
+                    MessageLog.GetInstance.ShowEx(ex.ToString());
+                }
             }
             else
             {
@@ -324,8 +401,8 @@ namespace BPASmartClient.JakaRobot
         {
             try
             {
-                //加载
-                p: file = Programname.ToCharArray();
+            //加载
+            p: file = Programname.ToCharArray();
                 MessageLog.GetInstance.Show($"调用文件名：{Programname}");
                 status = new JKTYPE.ProgramState();
                 jakaAPI.get_program_state(ref rshd, ref status);
diff --git a/BPASmartClient/Control/FoodMenu.xaml b/BPASmartClient/Control/FoodMenu.xaml
index 44e6465a..dc0e436c 100644
--- a/BPASmartClient/Control/FoodMenu.xaml
+++ b/BPASmartClient/Control/FoodMenu.xaml
@@ -1,12 +1,14 @@
-<UserControl x:Class="Control.FoodMenu"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:Control"
-      mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
-      Name="FoodMenu">
+<UserControl
+    x:Class="Control.FoodMenu"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Control"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Name="FoodMenu1"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -14,19 +16,22 @@
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="ListBoxItem">
-                <Setter Property="Margin" Value="2"/>
-                <Setter Property="FontSize" Value="22"/>
-                <Setter Property="FontWeight" Value="Black"/>
-                <Setter Property="Background" Value="Transparent"/>
-                <Setter Property="FontFamily" Value="楷体"/>
+                <Setter Property="Margin" Value="2" />
+                <Setter Property="FontSize" Value="22" />
+                <Setter Property="FontWeight" Value="Black" />
+                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="FontFamily" Value="楷体" />
                 <Setter Property="Template">
                     <Setter.Value>
-                        <ControlTemplate  TargetType="ListBoxItem">
-                            <Border BorderBrush="Black" BorderThickness="0" Background="Transparent">
+                        <ControlTemplate TargetType="ListBoxItem">
+                            <Border
+                                Background="Transparent"
+                                BorderBrush="Black"
+                                BorderThickness="0">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="80*"/>
-                                        <ColumnDefinition Width="20*"/>
+                                        <ColumnDefinition Width="80*" />
+                                        <ColumnDefinition Width="20*" />
                                     </Grid.ColumnDefinitions>
                                 </Grid>
                             </Border>
@@ -36,10 +41,5 @@
             </Style>
         </ResourceDictionary>
     </UserControl.Resources>
-    <Grid>
-        <ListBox>
-            
-            
-        </ListBox>
-    </Grid>
+    <Grid />
 </UserControl>
diff --git a/WpfApp1/App.xaml b/WpfApp1/App.xaml
index 2e70522d..0c5af8ec 100644
--- a/WpfApp1/App.xaml
+++ b/WpfApp1/App.xaml
@@ -1,9 +1,8 @@
-<Application x:Class="WpfApp1.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:WpfApp1"
-             StartupUri="MainWindow.xaml">
-    <Application.Resources>
-         
-    </Application.Resources>
+<Application
+    x:Class="WpfApp1.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:WpfApp1"
+    StartupUri="MainWindow.xaml">
+    <Application.Resources />
 </Application>
diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml
index cfada060..9e5f5e2b 100644
--- a/WpfApp1/MainWindow.xaml
+++ b/WpfApp1/MainWindow.xaml
@@ -1,12 +1,29 @@
-<Window x:Class="WpfApp1.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:WpfApp1"
-        mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800">
+<Window
+    x:Class="WpfApp1.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WpfApp1"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="MainWindow"
+    Width="800"
+    Height="450"
+    mc:Ignorable="d">
     <Grid>
-
+        <Button
+            Width="100"
+            Height="30"
+            Margin="36,24,664,381"
+            Content="连接" Click="Button_Click" />
+        <Button
+            Width="100"
+            Height="30"
+            Margin="167,24,533,381"
+            Content="上电" Click="Button_Click_1" />
+        <Button
+            Width="100"
+            Height="30"
+            Margin="300,24,400,381"
+            Content="使能" Click="Button_Click_2" />
     </Grid>
 </Window>
diff --git a/WpfApp1/MainWindow.xaml.cs b/WpfApp1/MainWindow.xaml.cs
index 5c44b05d..ea98f3da 100644
--- a/WpfApp1/MainWindow.xaml.cs
+++ b/WpfApp1/MainWindow.xaml.cs
@@ -12,6 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using BPASmartClient.JakaRobot;
 using BPASmartClient.S7Net;
 
 namespace WpfApp1
@@ -24,67 +25,87 @@ namespace WpfApp1
         public MainWindow()
         {
             InitializeComponent();
-            SiemensHelper siemensHelper = new SiemensHelper();
-            siemensHelper.Connect(S7.Net.CpuType.S71200, "192.168.101.16");
-            if (siemensHelper.IsConnected)
-            {
-                siemensHelper.WriteString(S7.Net.DataType.DataBlock, 1, 0, "cccc");
-                var res = siemensHelper.ReadClass<XL_Start_DB>(1);
+            //SiemensHelper siemensHelper = new SiemensHelper();
+            //siemensHelper.Connect(S7.Net.CpuType.S71200, "192.168.101.16");
+            //if (siemensHelper.IsConnected)
+            //{
+            //    siemensHelper.WriteString(S7.Net.DataType.DataBlock, 1, 0, "cccc");
+            //    var res = siemensHelper.ReadClass<XL_Start_DB>(1);
 
-                //XL_Start_DB xL_Start_DB = new XL_Start_DB();
-                //xL_Start_DB.RecipeCode = "编码";
-                //xL_Start_DB.RecipeName = "名称";
-                //xL_Start_DB.StockCode = 1;
-                //xL_Start_DB.TrayCode = 2;
-                //for (int i = 0; i < xL_Start_DB.Powder.Length; i++)
-                //{
-                //    xL_Start_DB.Powder[i].Powder_Name = $"料{i}";
-                //    xL_Start_DB.Powder[i].Powder_Weight = (float)(5.0 + i);
-                //}
-                //for (int i = 0; i < xL_Start_DB.Material.Length; i++)
-                //{
-                //    xL_Start_DB.Material[i].Material_Name = $"原料{i}";
-                //    xL_Start_DB.Material[i].Material_Weight = (float)(50.0 + i);
-                //    xL_Start_DB.Material[i].Material_BarrelNum = (short)(i + 1);
-                //}
-                //xL_Start_DB.Order_Request_ACK = true;
-                //xL_Start_DB.Order_Request = true;
+            //    //XL_Start_DB xL_Start_DB = new XL_Start_DB();
+            //    //xL_Start_DB.RecipeCode = "编码";
+            //    //xL_Start_DB.RecipeName = "名称";
+            //    //xL_Start_DB.StockCode = 1;
+            //    //xL_Start_DB.TrayCode = 2;
+            //    //for (int i = 0; i < xL_Start_DB.Powder.Length; i++)
+            //    //{
+            //    //    xL_Start_DB.Powder[i].Powder_Name = $"料{i}";
+            //    //    xL_Start_DB.Powder[i].Powder_Weight = (float)(5.0 + i);
+            //    //}
+            //    //for (int i = 0; i < xL_Start_DB.Material.Length; i++)
+            //    //{
+            //    //    xL_Start_DB.Material[i].Material_Name = $"原料{i}";
+            //    //    xL_Start_DB.Material[i].Material_Weight = (float)(50.0 + i);
+            //    //    xL_Start_DB.Material[i].Material_BarrelNum = (short)(i + 1);
+            //    //}
+            //    //xL_Start_DB.Order_Request_ACK = true;
+            //    //xL_Start_DB.Order_Request = true;
 
-                //for (int i = 0; i < xL_Start_DB.Standby.Length; i++)
-                //{
-                //    xL_Start_DB.Standby[i] = (short)(i + 100);
-                //    xL_Start_DB.Standby1[i] = (short)(i + 300);
-                //}
+            //    //for (int i = 0; i < xL_Start_DB.Standby.Length; i++)
+            //    //{
+            //    //    xL_Start_DB.Standby[i] = (short)(i + 100);
+            //    //    xL_Start_DB.Standby1[i] = (short)(i + 300);
+            //    //}
 
-                res.RecipeCode = "";
-                res.RecipeName = "";
-                res.StockCode = 0;
-                res.TrayCode = 0;
-                for (int i = 0; i < res.Powder.Length; i++)
-                {
-                    res.Powder[i].Powder_Name = "";
-                    res.Powder[i].Powder_Weight = 0;
-                }
-                for (int i = 0; i < res.Material.Length; i++)
-                {
-                    res.Material[i].Material_Name = "";
-                    res.Material[i].Material_Weight = 0;
-                    res.Material[i].Material_BarrelNum = 0;
-                }
-                res.Order_Request_ACK = false;
-                res.Order_Request = false;
+            //    res.RecipeCode = "";
+            //    res.RecipeName = "";
+            //    res.StockCode = 0;
+            //    res.TrayCode = 0;
+            //    for (int i = 0; i < res.Powder.Length; i++)
+            //    {
+            //        res.Powder[i].Powder_Name = "";
+            //        res.Powder[i].Powder_Weight = 0;
+            //    }
+            //    for (int i = 0; i < res.Material.Length; i++)
+            //    {
+            //        res.Material[i].Material_Name = "";
+            //        res.Material[i].Material_Weight = 0;
+            //        res.Material[i].Material_BarrelNum = 0;
+            //    }
+            //    res.Order_Request_ACK = false;
+            //    res.Order_Request = false;
 
-                for (int i = 0; i < res.Standby.Length; i++)
-                {
-                    res.Standby[i] = 0;
-                    res.Standby1[i] = 0;
-                }
+            //    for (int i = 0; i < res.Standby.Length; i++)
+            //    {
+            //        res.Standby[i] = 0;
+            //        res.Standby1[i] = 0;
+            //    }
 
-                siemensHelper.WriteClass<XL_Start_DB>(res, 1);
+            //    siemensHelper.WriteClass<XL_Start_DB>(res, 1);
 
-                var res1 = siemensHelper.ReadClass<XL_Start_DB>(1);
-            }
+            //    var res1 = siemensHelper.ReadClass<XL_Start_DB>(1);
+            //}
 
         }
+
+        JaKaHelper jaKaHelper = new JaKaHelper();
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            jaKaHelper.Conn("192.168.0.12");
+            MessageBox.Show($"连接成功,{jaKaHelper.rshd}");
+        }
+
+        private void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+            jaKaHelper.Power_On();
+            MessageBox.Show($"上电成功,{jaKaHelper.rshd}");
+        }
+
+        private void Button_Click_2(object sender, RoutedEventArgs e)
+        {
+            jaKaHelper.Enable_robot();
+            MessageBox.Show($"使能成功,{jaKaHelper.rshd}");
+        }
     }
 }
diff --git a/WpfApp1/WpfApp1.csproj b/WpfApp1/WpfApp1.csproj
index 1d569dcc..4bf6fe58 100644
--- a/WpfApp1/WpfApp1.csproj
+++ b/WpfApp1/WpfApp1.csproj
@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\BPASmartClient.JakaRobot\BPASmartClient.JakaRobot.csproj" />
     <ProjectReference Include="..\BPASmartClient.S7Net\BPASmartClient.S7Net.csproj" />
   </ItemGroup>
 

From a53e32297d028de1809c2343de5cc48900952b71 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Thu, 13 Apr 2023 13:36:49 +0800
Subject: [PATCH 20/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Model/AlarmHelper.cs                |    1 -
 BPASmartClient.Device/BaseDevice.cs           |    2 +-
 BPASmartClient.Helper/ExpandMethod.cs         |  120 ++
 BPASmartClient.Helper/ThreadManage.cs         |    1 -
 .../Model/GVL_BigStation.cs                   |   10 +
 .../Model/HK_PLC/DB_Write.cs                  |   19 +
 .../Model/HK_PLC/HKPlcCommAddress.cs          |   13 +
 .../Model/ProcessControl.cs                   | 1133 ++++++-----
 .../Model/RawMaterial/RecipeData.cs           |    8 +
 .../Model/RecipeDosing.cs                     |   25 +
 .../Model/Siemens/SiemensDeviceStatus.cs      |   23 +-
 .../View/HardwareStatusView.xaml              |   17 +-
 .../View/ManualFlowView.xaml                  |  111 +-
 .../View/RecipeReceiveView.xaml               |   14 +-
 .../View/RecipeSendDownView.xaml              |    9 +-
 .../View/RecipeSendDownView.xaml.cs           |   16 +-
 .../ViewModel/HardwareStatusViewModel.cs      |  107 +-
 .../ViewModel/ManualFlowViewModel.cs          |   64 +-
 .../ViewModel/RecipeReceiveViewModel.cs       |   24 +
 .../ViewModel/RecipeSendDownViewModel.cs      |    6 +-
 .../App.xaml.cs                               |   49 +-
 .../BPASmartClient.JXJFoodSmallStation.csproj |    7 +
 .../Model/Bom/BomMaterial.cs                  |   21 +
 .../Model/Bom/BomMaterialData.cs              |   16 +
 ...lcCommAttribute.cs => VarCommAttribute.cs} |    4 +-
 .../Model/GVL_SmallStation.cs                 |  230 ++-
 .../Model/HK_PLC/DataComm.cs                  |   41 +
 .../Model/HK_PLC/HKDeviceStatus.cs            |    3 +-
 .../Model/HK_PLC/HKDeviceWrite.cs             |   23 +
 .../Model/HK_PLC/PlcReadAddressDB3.cs         |  156 +-
 .../Model/HK_PLC/PlcWriteAddressDB7.cs        |   13 +
 .../Model/ProcessControl.cs                   | 1650 ++++++++++-------
 .../Model/RawMaterial/DeviceInquire.cs        |    1 -
 .../Model/RawMaterial/DevicePar.cs            |    2 +
 .../Model/Siemens/SiemensDeviceStatus.cs      |   23 +-
 .../Model/WindSend/WindSendDeviceStatus.cs    |    7 +-
 .../Model/WindSend/WindSendRawMaterial.cs     |    4 +-
 .../View/BomOfMaterialView.xaml               |  250 +++
 .../View/BomOfMaterialView.xaml.cs            |   28 +
 .../View/ManualFlowView.xaml                  |   51 +-
 .../View/ManualFlowView.xaml.cs               |    5 +
 .../View/PlcVarMonitorView.xaml               |    7 +-
 .../View/ProcessMonitorView.xaml              |   90 +
 .../View/ProcessMonitorView.xaml.cs           |   28 +
 .../View/RecipeReceiveView.xaml               |   20 +-
 .../View/RecipeReceiveView.xaml.cs            |    2 +
 .../View/RobotView.xaml                       |    4 +-
 .../View/StockBinRawMaterialView.xaml         |   14 +-
 .../View/WindSendParView.xaml                 |    6 +-
 .../View/WindSendParView.xaml.cs              |    3 +-
 .../ViewModel/BomOfMaterialViewModel.cs       |   85 +
 .../ViewModel/HardwareStatusViewModel.cs      |    4 +-
 .../ViewModel/ManualControlViewModel.cs       |  216 ++-
 .../ViewModel/ManualFlowViewModel.cs          |   41 +-
 .../ViewModel/ProcessMonitorViewModel.cs      |   23 +
 .../ViewModel/RecipeReceiveViewModel.cs       |   12 +
 .../ViewModel/RobotViewModel.cs               |   24 +-
 .../ViewModel/SystemParViewModel.cs           |   17 +-
 .../ViewModel/WindSendParViewModel.cs         |    5 +-
 BPASmartClient.MorkS/Control_Morks.cs         |    9 +-
 BPASmartClient.MorkS/GVL_MORKS.cs             |    3 +
 BPASmartClient.MorkS/Model/MorksPar.cs        |    4 +
 BPASmartClient.MorkS/View/ParSet.xaml         |   27 +-
 .../ViewModel/ParSetViewModel.cs              |    4 +
 BPASmartClient/App.config                     |    8 +-
 DosingSystem/Model/par/LocaPar.cs             |   18 +
 .../ViewModel/RecipeControlViewModel.cs       |  536 +++---
 67 files changed, 3589 insertions(+), 1928 deletions(-)
 create mode 100644 BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKPlcCommAddress.cs
 create mode 100644 BPASmartClient.JXJFoodBigStation/Model/RecipeDosing.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterial.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterialData.cs
 rename BPASmartClient.JXJFoodSmallStation/Model/GVL/{PlcCommAttribute.cs => VarCommAttribute.cs} (78%)
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/DataComm.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceWrite.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcWriteAddressDB7.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml
 create mode 100644 BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml
 create mode 100644 BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/ViewModel/ProcessMonitorViewModel.cs
 create mode 100644 DosingSystem/Model/par/LocaPar.cs

diff --git a/BPASmartClient.CustomResource/Pages/Model/AlarmHelper.cs b/BPASmartClient.CustomResource/Pages/Model/AlarmHelper.cs
index a1aa60c6..e504cf29 100644
--- a/BPASmartClient.CustomResource/Pages/Model/AlarmHelper.cs
+++ b/BPASmartClient.CustomResource/Pages/Model/AlarmHelper.cs
@@ -67,7 +67,6 @@ namespace BPASmartClient.CustomResource.Pages.Model
                 }
                 Thread.Sleep(100);
             }), $"{typeof(AlarmT).Name},报警通用模块监听");
-
         }
 
         /// <summary>
diff --git a/BPASmartClient.Device/BaseDevice.cs b/BPASmartClient.Device/BaseDevice.cs
index e5b10552..be2eea4b 100644
--- a/BPASmartClient.Device/BaseDevice.cs
+++ b/BPASmartClient.Device/BaseDevice.cs
@@ -284,7 +284,7 @@ namespace BPASmartClient.Device
                     foreach (var faces in res)
                     {
                         if (faces.Name == "IStatus")
-                        {
+                        {   
                             InterfaceStatus = item.GetValue(this) as IStatus;
                             GetMonitorData(InterfaceStatus);
                         }
diff --git a/BPASmartClient.Helper/ExpandMethod.cs b/BPASmartClient.Helper/ExpandMethod.cs
index e3df2666..050ca1c3 100644
--- a/BPASmartClient.Helper/ExpandMethod.cs
+++ b/BPASmartClient.Helper/ExpandMethod.cs
@@ -185,6 +185,126 @@ namespace BPASmartClient.Helper
 
             return false;
         }
+        public static string ToBinString(this object value)
+        {
+            int num = 0;
+            int num2 = 0;
+            int num3 = 0;
+            string text = "";
+            long num4 = 0L;
+            try
+            {
+                if (value.GetType().Name.IndexOf("[]") < 0)
+                {
+                    string a = value.GetType().Name;
+                    switch (a)
+                    {
+                        case "Byte":
+                            num3 = 7;
+                            num4 = (byte)value;
+                            break;
+                        case "UInt16":
+                            num3 = 15;
+                            num4 = (ushort)value;
+                            break;
+                        case "Int16":
+                            num3 = 15;
+                            num4 = (short)value;
+                            break;
+                        case "UInt32":
+                            num3 = 31;
+                            num4 = (uint)value;
+                            break;
+                        case "Int32":
+                            num3 = 31;
+                            num4 = (int)value;
+                            break;
+                        case "Int64":
+                            num3 = 63;
+                            num4 = (long)value;
+                            break;
+                        default:
+                            throw new Exception();
+                    }
+
+                    for (num = num3; num >= 0; num += -1)
+                    {
+                        if ((num + 1) % 4 == 0) text = text + " ";
+                        text = (((num4 & (long)Math.Pow(2.0, num)) <= 0) ? (text + "0") : (text + "1"));
+                    }
+                }
+                else
+                {
+                    switch (value.GetType().Name)
+                    {
+                        case "Byte[]":
+                            {
+                                num3 = 7;
+                                byte[] array4 = (byte[])value;
+                                for (num2 = 0; num2 <= array4.Length - 1; num2++)
+                                {
+                                    for (num = num3; num >= 0; num += -1)
+                                    {
+                                        text = (((array4[num2] & (byte)Math.Pow(2.0, num)) <= 0) ? (text + "0") : (text + "1"));
+                                    }
+                                }
+
+                                break;
+                            }
+                        case "Int16[]":
+                            {
+                                num3 = 15;
+                                short[] array2 = (short[])value;
+                                for (num2 = 0; num2 <= array2.Length - 1; num2++)
+                                {
+                                    for (num = num3; num >= 0; num += -1)
+                                    {
+                                        text = (((array2[num2] & (byte)Math.Pow(2.0, num)) <= 0) ? (text + "0") : (text + "1"));
+                                    }
+                                }
+
+                                break;
+                            }
+                        case "Int32[]":
+                            {
+                                num3 = 31;
+                                int[] array3 = (int[])value;
+                                for (num2 = 0; num2 <= array3.Length - 1; num2++)
+                                {
+                                    for (num = num3; num >= 0; num += -1)
+                                    {
+                                        text = (((array3[num2] & (byte)Math.Pow(2.0, num)) <= 0) ? (text + "0") : (text + "1"));
+                                    }
+                                }
+
+                                break;
+                            }
+                        case "Int64[]":
+                            {
+                                num3 = 63;
+                                byte[] array = (byte[])value;
+                                for (num2 = 0; num2 <= array.Length - 1; num2++)
+                                {
+                                    for (num = num3; num >= 0; num += -1)
+                                    {
+                                        text = (((array[num2] & (byte)Math.Pow(2.0, num)) <= 0) ? (text + "0") : (text + "1"));
+                                    }
+                                }
+
+                                break;
+                            }
+                        default:
+                            throw new Exception();
+                    }
+                }
+
+                return text;
+            }
+            catch
+            {
+                return "";
+            }
+        }
 
 
 
diff --git a/BPASmartClient.Helper/ThreadManage.cs b/BPASmartClient.Helper/ThreadManage.cs
index 25f0cd24..33d37d20 100644
--- a/BPASmartClient.Helper/ThreadManage.cs
+++ b/BPASmartClient.Helper/ThreadManage.cs
@@ -201,5 +201,4 @@ namespace BPASmartClient.Helper
             return false;
         }
     }
-
 }
diff --git a/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs b/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs
index 624df1bd..ff7f543e 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/GVL_BigStation.cs
@@ -62,6 +62,16 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方
         /// </summary>
         public static int Recipe4DosingStatus { get; set; }
+
+
+        public static int[] RecipeDosingStatus { get; set; } = new int[4] { 0, 0, 0, 0 };
+        public static bool[] AllowIssueRecipe { get; set; } = new bool[4] { false, false, false, false };
+        public static bool[] ReceviceFinishRecipe { get; set; } = new bool[4] { false, false, false, false };
+        public static bool[] DosingFinishRecipe { get; set; } = new bool[4] { false, false, false, false };
+
+        public static bool[] IsTrayArrive { get; set; } = new bool[5] { false, false, false, false,false };
+        public static DateTime[] RecipeDosingTime { get; set; } = new DateTime[4] { DateTime.Now, DateTime.Now, DateTime.Now, DateTime.Now };
+
         /// <summary>
         /// 是否处于手动下发配方
         /// </summary>
diff --git a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/DB_Write.cs b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/DB_Write.cs
index 82c4d8dd..4d12381e 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/DB_Write.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/DB_Write.cs
@@ -58,6 +58,25 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
         /// </summary>
         public bool Tray5InPlace { get; set; }
         /// <summary>
+        /// 配方1配料完成
+        /// </summary>
+        public bool Recipe1DoisngFinish { get; set; }
+
+        /// <summary>
+        /// 配方2配料完成
+        /// </summary>
+        public bool Recipe2DoisngFinish { get; set; }
+
+        /// <summary>
+        /// 配方3配料完成
+        /// </summary>
+        public bool Recipe3DoisngFinish { get; set; }
+
+        /// <summary>
+        /// 配方4配料完成
+        /// </summary>
+        public bool Recipe4DoisngFinish { get; set; }
+        /// <summary>
         /// 配方编码
         /// </summary>
         public short RecipeCode { get; set; }
diff --git a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKPlcCommAddress.cs b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKPlcCommAddress.cs
new file mode 100644
index 00000000..b571013d
--- /dev/null
+++ b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKPlcCommAddress.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
+{
+    public class HKPlcCommAddress
+    {
+
+    }
+}
diff --git a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
index b5f1a742..b1962f34 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
@@ -27,27 +27,27 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// <summary>
         /// 西门子配方数据
         /// </summary>
-        public ObservableCollection<RecipeData> SiemensRecipes = new ObservableCollection<RecipeData>();
+        public ObservableCollection<RecipeData> SiemensRecipes { get; set; } = new ObservableCollection<RecipeData>();
         /// <summary>
         /// 本地配方数据
         /// </summary>
-        public ObservableCollection<RecipeData> LocalRecipes = new ObservableCollection<RecipeData>();
+        public ObservableCollection<RecipeData> LocalRecipes { get; set; } = new ObservableCollection<RecipeData>();
         /// <summary>
         /// 配方等待执行
         /// </summary>
-        public ObservableCollection<RecipeData> RecipeWaitExecute = new ObservableCollection<RecipeData>();
+        public ObservableCollection<RecipeData> RecipeWaitExecute { get; set; } = new ObservableCollection<RecipeData>();   
         /// <summary>
         /// 配方正在执行
         /// </summary>
-        public ObservableCollection<RecipeData> RecipeExecuting = new ObservableCollection<RecipeData>();
+        public ObservableCollection<RecipeData> RecipeExecuting { get; set; } = new ObservableCollection<RecipeData>();
         /// <summary>
         /// 配方执行完成
         /// </summary>
-        public ObservableCollection<RecipeData> RecipeExecuteComple = new ObservableCollection<RecipeData>();
+        public ObservableCollection<RecipeData> RecipeExecuteComple { get; set; } = new ObservableCollection<RecipeData>();
         /// <summary>
         /// 原料的名称和料仓的位置对应
         /// </summary>
-        public ConcurrentDictionary<int, string> RawMaterialsNamePos = new ConcurrentDictionary<int, string>();
+        public ConcurrentDictionary<int, string> RawMaterialsNamePos { get; set; } = new ConcurrentDictionary<int, string>();
         /// <summary>
         /// 硬件料仓的原料信息
         /// </summary>
@@ -60,6 +60,9 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         public ConcurrentQueue<string> SiemensRecipeQueue2 = new ConcurrentQueue<string>();
         public ConcurrentQueue<string> SiemensRecipeQueue3 = new ConcurrentQueue<string>();
         public ConcurrentQueue<string> SiemensRecipeQueue4 = new ConcurrentQueue<string>();
+
+        public ConcurrentDictionary<int, ConcurrentQueue<string>> SiemensRecipeQueue = new ConcurrentDictionary<int, ConcurrentQueue<string>>();
+        public ObservableCollection<RecipeDosing> recipe = new ObservableCollection<RecipeDosing>();
         /// <summary>
         /// 本地配方队列
         /// </summary>
@@ -89,7 +92,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         for (int i = 0; i < GVL_BigStation.Max_DosingSotckBinNum; i++)
                         {
                             int index = RawMaterialsNamePos.Values.ToList().IndexOf(recipe.Material[i].Material_Name);
-                            if (index>=0)
+                            if (index >= 0)
                             {
                                 RawMaterials.Add(new RawMaterial()
                                 {
@@ -101,7 +104,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             }
                             else
                             {
-                                MessageNotify.GetInstance.ShowAlarmLog($"本地原料名称和西门子下发的原料名称无法对应，原料名称：{recipe.Material[i].Material_Name},");
+                                MessageNotify.GetInstance.ShowAlarmLog($"本地缺少原料{recipe.Material[i].Material_Name}，和西门子下发的原料名称无法对应,");
                             }
                         }
                         App.Current.Dispatcher.Invoke(() =>
@@ -118,11 +121,11 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                 }
             }), "SiemensSendRecipe", true);
-            //testRawMaterialNameData();//自定义料仓名称
             DeviceConnectInit();//设备连接初始化
             ThreadInit();//线程初始化
             VarResetInit();//变量初始化
         }
+        #region 本地配方--暂时不使用
         private void LocalRecipeRecevice()
         {
             if (LocalRecipes.Count > 0)
@@ -223,7 +226,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
                             }
                         }
-                        else 
+                        else
                         {
                             HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
@@ -249,7 +252,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         {
                             GVL_BigStation.BarrelWasherSign = false;
                         }
-                        GVL_BigStation.Recipe1DosingStatus = 3; 
+                        GVL_BigStation.Recipe1DosingStatus = 3;
                         switch (trayCode)
                         {
                             case 1:
@@ -331,7 +334,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             }
                         }
                         LocalRecipeQueue1.TryDequeue(out code);
-                        RecipeExecuteComple.Add(LocalRecipes.ElementAt(index));//将配方添加到完成列表
                         //App.Current.Dispatcher.Invoke(() => {
                         //    Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
                         //});
@@ -373,7 +375,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         default:
                             break;
                     }
-                    if (HKDevice.PlcRead.IsAllowIssueRecipe2 && GVL_BigStation.Recipe2DosingStatus == 0 &&Inplace)//配方2是否允许下发配发
+                    if (HKDevice.PlcRead.IsAllowIssueRecipe2 && GVL_BigStation.Recipe2DosingStatus == 0 && Inplace)//配方2是否允许下发配发
                     {
                         if (LocalRecipes.ElementAt(index).IsWashingBarrel)
                         {
@@ -497,10 +499,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             }
                         }
                         LocalRecipeQueue2.TryDequeue(out code);
-                        RecipeExecuteComple.Add(LocalRecipes.ElementAt(index));//将该配方添加到下
-                        //App.Current.Dispatcher.Invoke(() => {
-                        //    Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                        //});
                         LocalRecipes.RemoveAt(index);
                         GVL_BigStation.Recipe2DosingStatus = 0;
                     }
@@ -555,7 +553,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
                             }
                         }
-                        else 
+                        else
                         {
                             HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
@@ -664,10 +662,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         HKDevice.HK_PLC_S7.Write<bool>("DB98.DBX1.1", false);
                         LocalRecipeQueue3.TryDequeue(out code);
-                        RecipeExecuteComple.Add(LocalRecipes.ElementAt(index));//将该配方添加到下
-                        //App.Current.Dispatcher.Invoke(() => {
-                        //    Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                        //});
                         LocalRecipes.RemoveAt(index);
                         GVL_BigStation.Recipe3DosingStatus = 0;
                     }
@@ -722,7 +716,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
                             }
                         }
-                        else 
+                        else
                         {
                             HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
@@ -828,19 +822,16 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             {
                                 item.Laying_Off_Weight = HKDevice.PlcRead.StockBin14ActualWeight;
                             }
-                        }
+                        }      
                         HKDevice.HK_PLC_S7.Write<bool>("DB98.DBX1.3", false);
                         LocalRecipeQueue4.TryDequeue(out code);
-                        RecipeExecuteComple.Add(LocalRecipes.ElementAt(index));//将该配方添加到下
-                        //App.Current.Dispatcher.Invoke(() => {
-                        //    Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                        //});
                         LocalRecipes.RemoveAt(index);
                         GVL_BigStation.Recipe4DosingStatus = 0;
                     }
                 }
             }
         }
+        #endregion
         private void ReceviceData()
         {
             SiemensRecipes = Json<RemoteRecipe>.Data.Recipes;
@@ -848,151 +839,178 @@ namespace BPASmartClient.JXJFoodBigStation.Model
             {
                 foreach (var data in SiemensRecipes)
                 {
-                    if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1)
+                    if (data.RecipesSource == RecipeSource.远程)
                     {
-                        if (!(SiemensRecipeQueue1.Contains(data.RecipeCode)))
+                        if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1)
                         {
-                            if (SiemensDevice.DL_Status is DL_Status_DB status)
+                            if (!(SiemensRecipeQueue1.Contains(data.RecipeCode)))
                             {
-                                switch (GVL_BigStation.SiemensSendRecipeStatus) 
+                                if (SiemensDevice.DL_Status is DL_Status_DB status)
                                 {
-                                    case 3:
+                                    switch (GVL_BigStation.SiemensSendRecipeStatus)
+                                    {
+                                        case 3:
+                                            SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
+                                            SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方1，发送配方编号和请求配料标志给西门子");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 4;
+                                            break;
+                                        case 4:
+                                            if (SiemensDevice.DL_Status.Dosing_Start_ACK)
+                                            {
+                                                SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
+                                                SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
+                                                MessageNotify.GetInstance.ShowRunLog($"配方1，西门子确认开始配料");
+                                                GVL_BigStation.SiemensSendRecipeStatus = 5;
+                                            }
+                                            break;
+                                        case 5:
+                                            if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
+                                            {
+                                                SiemensRecipeQueue1.Enqueue(data.RecipeCode);
+                                                MessageNotify.GetInstance.ShowRunLog($"配方1，配方：{data.RecipeCode}，加入队列");
+                                                GVL_BigStation.SiemensSendRecipeStatus = 0;
+                                            }
+                                            break;
+                                        default:
+                                            break;
+                                    }
+                                }
+                            }
+                        }
+                        else if (SiemensRecipeQueue2.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe2)
+                        {
+                            if (!(SiemensRecipeQueue2.Contains(data.RecipeCode)))
+                            {
+                                if (SiemensDevice.DL_Status is DL_Status_DB status)
+                                {
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 3)
+                                    {
                                         SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
                                         SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方1，发送配方编号和请求配料标志给西门子");
+                                        MessageNotify.GetInstance.ShowRunLog($"配方2，发送配方编号和请求配料标志给西门子");
                                         GVL_BigStation.SiemensSendRecipeStatus = 4;
-                                        break;
-                                    case 4:
+                                    }
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 4)
+                                    {
                                         if (SiemensDevice.DL_Status.Dosing_Start_ACK)
                                         {
                                             SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
                                             SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
-                                            MessageNotify.GetInstance.ShowRunLog($"配方1，西门子确认开始配料");
+                                            MessageNotify.GetInstance.ShowRunLog($"配方2，西门子确认开始配料");
                                             GVL_BigStation.SiemensSendRecipeStatus = 5;
                                         }
-                                        break;
-                                    case 5:
+                                    }
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 5)
+                                    {
                                         if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
                                         {
-                                            SiemensRecipeQueue1.Enqueue(data.RecipeCode);
-                                            MessageNotify.GetInstance.ShowRunLog($"配方1，配方：{data.RecipeCode}，加入队列");
+                                            SiemensRecipeQueue2.Enqueue(data.RecipeCode);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方2，配方：{data.RecipeCode}，加入队列");
                                             GVL_BigStation.SiemensSendRecipeStatus = 0;
                                         }
-                                        break;
-                                    default:
-                                        break;
+                                    }
                                 }
                             }
                         }
-                    }
-                    else if (SiemensRecipeQueue2.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe2)
-                    {
-                        if (!(SiemensRecipeQueue2.Contains(data.RecipeCode)))
+                        else if (SiemensRecipeQueue3.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe3)
                         {
-                            if (SiemensDevice.DL_Status is DL_Status_DB status)
+                            if (!(SiemensRecipeQueue3.Contains(data.RecipeCode)))
                             {
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 3)
+                                if (SiemensDevice.DL_Status is DL_Status_DB status)
                                 {
-                                    SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
-                                    SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
-                                    MessageNotify.GetInstance.ShowRunLog($"配方2，发送配方编号和请求配料标志给西门子");
-                                    GVL_BigStation.SiemensSendRecipeStatus = 4;
-                                }
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 4)
-                                {
-                                    if (SiemensDevice.DL_Status.Dosing_Start_ACK)
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 3)
+                                    {
+                                        SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
+                                        SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
+                                        MessageNotify.GetInstance.ShowRunLog($"配方3，发送配方编号和请求配料标志给西门子");
+                                        GVL_BigStation.SiemensSendRecipeStatus = 4;
+                                    }
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 4)
                                     {
-                                        SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
-                                        SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方2，西门子确认开始配料");
-                                        GVL_BigStation.SiemensSendRecipeStatus = 5;
+                                        if (SiemensDevice.DL_Status.Dosing_Start_ACK)
+                                        {
+                                            SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
+                                            SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方3，西门子确认开始配料");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 5;
+                                        }
                                     }
-                                }
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 5)
-                                {
-                                    if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 5)
                                     {
-                                        SiemensRecipeQueue2.Enqueue(data.RecipeCode);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方2，配方：{data.RecipeCode}，加入队列");
-                                        GVL_BigStation.SiemensSendRecipeStatus = 0;
+                                        if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
+                                        {
+                                            SiemensRecipeQueue3.Enqueue(data.RecipeCode);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方3，配方：{data.RecipeCode}，加入队列");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 0;
+                                        }
                                     }
                                 }
                             }
                         }
-                    }
-                    else if (SiemensRecipeQueue3.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe3)
-                    {
-                        if (!(SiemensRecipeQueue3.Contains(data.RecipeCode))) 
+                        else if (SiemensRecipeQueue4.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe4)
                         {
-                            if (SiemensDevice.DL_Status is DL_Status_DB status)
+                            if (!(SiemensRecipeQueue4.Contains(data.RecipeCode)))
                             {
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 3)
-                                {
-                                    SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
-                                    SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
-                                    MessageNotify.GetInstance.ShowRunLog($"配方3，发送配方编号和请求配料标志给西门子");
-                                    GVL_BigStation.SiemensSendRecipeStatus = 4;
-                                }
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 4)
+                                if (SiemensDevice.DL_Status is DL_Status_DB status)
                                 {
-                                    if (SiemensDevice.DL_Status.Dosing_Start_ACK)
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 3)
                                     {
-                                        SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
-                                        SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方3，西门子确认开始配料");
-                                        GVL_BigStation.SiemensSendRecipeStatus = 5;
+                                        SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
+                                        SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
+                                        MessageNotify.GetInstance.ShowRunLog($"配方4，发送配方编号和请求配料标志给西门子");
+                                        GVL_BigStation.SiemensSendRecipeStatus = 4;
                                     }
-                                }
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 5)
-                                {
-                                    if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 4)
+                                    {
+                                        if (SiemensDevice.DL_Status.Dosing_Start_ACK)
+                                        {
+                                            SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
+                                            SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方4，西门子确认开始配料");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 5;
+                                        }
+                                    }
+                                    if (GVL_BigStation.SiemensSendRecipeStatus == 5)
                                     {
-                                        SiemensRecipeQueue3.Enqueue(data.RecipeCode);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方3，配方：{data.RecipeCode}，加入队列");
-                                        GVL_BigStation.SiemensSendRecipeStatus = 0;
+                                        if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
+                                        {
+                                            SiemensRecipeQueue4.Enqueue(data.RecipeCode);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方4，配方：{data.RecipeCode}，加入队列");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 0;
+                                        }
                                     }
                                 }
                             }
                         }
                     }
-                    else if (SiemensRecipeQueue4.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe4)
+                    else 
                     {
-                        if (!(SiemensRecipeQueue4.Contains(data.RecipeCode))) 
+                        if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1) 
                         {
-                            if (SiemensDevice.DL_Status is DL_Status_DB status)
-                            {
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 3)
-                                {
-                                    SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
-                                    SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
-                                    MessageNotify.GetInstance.ShowRunLog($"配方4，发送配方编号和请求配料标志给西门子");
-                                    GVL_BigStation.SiemensSendRecipeStatus = 4;
-                                }
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 4)
-                                {
-                                    if (SiemensDevice.DL_Status.Dosing_Start_ACK)
-                                    {
-                                        SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
-                                        SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方4，西门子确认开始配料");
-                                        GVL_BigStation.SiemensSendRecipeStatus = 5;
-                                    }
-                                }
-                                if (GVL_BigStation.SiemensSendRecipeStatus == 5)
-                                {
-                                    if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
-                                    {
-                                        SiemensRecipeQueue4.Enqueue(data.RecipeCode);
-                                        MessageNotify.GetInstance.ShowRunLog($"配方4，配方：{data.RecipeCode}，加入队列");
-                                        GVL_BigStation.SiemensSendRecipeStatus = 0;
-                                    }
-                                }
-                            }
+                            SiemensRecipeQueue1.Enqueue(data.RecipeCode);
+                            MessageNotify.GetInstance.ShowRunLog($"本地配方，配方：{data.RecipeCode}，加入队列1");
+                        }
+                        else if (SiemensRecipeQueue2.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe2)
+                        {
+                            SiemensRecipeQueue2.Enqueue(data.RecipeCode);
+                            MessageNotify.GetInstance.ShowRunLog($"本地配方，配方：{data.RecipeCode}，加入队列2");
+                        }
+                        else if(SiemensRecipeQueue3.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe3)
+                        {
+                            SiemensRecipeQueue3.Enqueue(data.RecipeCode);
+                            MessageNotify.GetInstance.ShowRunLog($"本地配方，配方：{data.RecipeCode}，加入队列3");
+                        }
+                        else if (SiemensRecipeQueue4.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe4)
+                        {
+                            SiemensRecipeQueue4.Enqueue(data.RecipeCode);
+                            MessageNotify.GetInstance.ShowRunLog($"本地配方，配方：{data.RecipeCode}，加入队列4");
+
                         }
                     }
                 }
             }
-            else 
+            else
             {
                 SiemensRecipeQueue1.Clear();
                 SiemensRecipeQueue2.Clear();
@@ -1004,10 +1022,8 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                 GVL_BigStation.Recipe3DosingStatus = 0;
                 GVL_BigStation.Recipe4DosingStatus = 0;
             }
-
-           
         }
-        public void Order_Cancel() 
+        public void Order_Cancel()
         {
             if (GVL_BigStation.Order_Cancel) //订单取消
             {
@@ -1126,6 +1142,8 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 });
                                 SiemensRecipeQueue1.TryDequeue(out code);
                                 GVL_BigStation.Order_CancelStep = 0;
+                                GVL_BigStation.Order_Cancel = false;
+                                GVL_BigStation.Order_CancelRecipeCode = "";
                                 MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
                             }
                             break;
@@ -1158,6 +1176,8 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 });
                                 SiemensRecipeQueue2.TryDequeue(out code);
                                 GVL_BigStation.Order_CancelStep = 0;
+                                GVL_BigStation.Order_Cancel = false;
+                                GVL_BigStation.Order_CancelRecipeCode = "";
                                 MessageNotify.GetInstance.ShowRunLog($"队列2，西门子取消订单完成，订单号：{code}");
                             }
                             break;
@@ -1190,6 +1210,8 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 });
                                 SiemensRecipeQueue3.TryDequeue(out code);
                                 GVL_BigStation.Order_CancelStep = 0;
+                                GVL_BigStation.Order_Cancel = false;
+                                GVL_BigStation.Order_CancelRecipeCode = "";
                                 MessageNotify.GetInstance.ShowRunLog($"队列3，西门子取消订单完成，订单号：{code}");
                             }
                             break;
@@ -1222,6 +1244,8 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 });
                                 SiemensRecipeQueue4.TryDequeue(out code);
                                 GVL_BigStation.Order_CancelStep = 0;
+                                GVL_BigStation.Order_Cancel = false;
+                                GVL_BigStation.Order_CancelRecipeCode = "";
                                 MessageNotify.GetInstance.ShowRunLog($"队列4，西门子取消订单完成，订单号：{code}");
                             }
                             break;
@@ -1263,42 +1287,42 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.IsAllowIssueRecipe1 && GVL_BigStation.Recipe1DosingStatus == 0 && Inplace)//配方1是否允许下发配发
                     {
-                        
+
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             if (!GVL_BigStation.BarrelWasherSign)
                             {
                                 GVL_BigStation.BarrelWasherSign = true;
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
-                                
+                                MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+
                                 GVL_BigStation.DosingRecipe1Time = DateTime.Now;
                                 HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
                                 GVL_BigStation.Recipe1DosingStatus = 1;
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                                MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                             }
                         }
-                        else 
+                        else
                         {
                             GVL_BigStation.DosingRecipe1Time = DateTime.Now;
                             HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
                             GVL_BigStation.Recipe1DosingStatus = 1;
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                         }
-                       
+
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe1 && GVL_BigStation.Recipe1DosingStatus == 1)
                     {
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                            MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
                         }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", false);
                         StockBinParReset();
-                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
+                        MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
                         GVL_BigStation.Recipe1DosingStatus = 2;
                     }
                     if (GVL_BigStation.Recipe1DosingStatus == 2 && HKDevice.PlcRead.Recipe1DosingFinish)
@@ -1309,67 +1333,9 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         GVL_BigStation.Recipe1DosingFinish = true;
                         GVL_BigStation.Recipe1DosingStatus = 3;
-                        MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
-                        foreach (var item in SiemensRecipes.ElementAt(index).RawMaterial)
-                        {
-                            if (item.RawMaterialLocation == 1)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin1ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 2)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin2ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 3)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin3ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 4)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin4ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 5)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin5ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 6)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin6ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 7)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin7ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 8)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin8ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 9)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin9ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 10)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin10ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 11)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin11ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 12)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin12ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 13)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin13ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 14)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin14ActualWeight;
-                            }
-                        }
-                        if (SiemensDevice.IsConnected)
+                        MessageNotify.GetInstance.ShowRunLog($"配方1，配方状态：{code}配料完成");
+                        ReadStockBinDosingWeight(SiemensRecipes.ElementAt(index));
+                        if (SiemensDevice.IsConnected && !GVL_BigStation.IsUseLocalRecipe)
                         {
                             FinishData.Order_No = SiemensRecipes.ElementAt(index).RecipeCode;
                             FinishData.Product_Code = SiemensRecipes.ElementAt(index).RecipeName;
@@ -1383,30 +1349,27 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
                                 FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
                                 FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
+                                MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe1Time).TotalSeconds;
                             FinishData.ProcessTime = Convert.ToInt16(a);
                             SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
-                            MessageNotify.GetInstance.ShowRunLog($"配方配料完成，将信号反馈给西门子");
+                            MessageNotify.GetInstance.ShowRunLog($"配方1，{code}配方配料完成，将信号反馈给西门子");
                         }
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.4", true);
+                        GVL_BigStation.Recipe1DosingStatus = 3;
+                    }
+                    if (GVL_BigStation.Recipe1DosingStatus == 3 && HKDevice.PlcRead.Recipe1DosingFinish == false)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.4", false);
                         SiemensRecipeQueue1.TryDequeue(out code);
-                        RecipeExecuteComple.Add(SiemensRecipes.ElementAt(index));//将配方添加到完成列表
-                        if (!GVL_BigStation.IsUseLocalRecipe)
-                        {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
-                        else
+                        App.Current.Dispatcher.Invoke(() =>
                         {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
+                            Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
+                        });
                         GVL_BigStation.Recipe1DosingStatus = 0;
+                        MessageNotify.GetInstance.ShowRunLog($"配方1，{code}配方配料完成，复位plc配料完成信号");
                     }
                 }
             }
@@ -1438,7 +1401,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         default:
                             break;
                     }
-                    if (HKDevice.PlcRead.IsAllowIssueRecipe2 && GVL_BigStation.Recipe2DosingStatus == 0 && Inplace )//配方2是否允许下发配发
+                    if (HKDevice.PlcRead.IsAllowIssueRecipe2 && GVL_BigStation.Recipe2DosingStatus == 0 && Inplace)//配方2是否允许下发配发
                     {
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
@@ -1446,22 +1409,22 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             {
                                 GVL_BigStation.BarrelWasherSign = true;
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+                                MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
 
                                 GVL_BigStation.DosingRecipe2Time = DateTime.Now;
                                 HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", true);
                                 GVL_BigStation.Recipe2DosingStatus = 1;
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                                MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                             }
                         }
-                        else 
+                        else
                         {
                             GVL_BigStation.DosingRecipe2Time = DateTime.Now;
                             HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", true);
                             GVL_BigStation.Recipe2DosingStatus = 1;
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                         }
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe2 && GVL_BigStation.Recipe2DosingStatus == 1)
@@ -1469,12 +1432,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                            MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
                         }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", false);
                         StockBinParReset();
                         GVL_BigStation.Recipe2DosingStatus = 2;
-                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
+                        MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
                     }
                     if (GVL_BigStation.Recipe2DosingStatus == 2 && HKDevice.PlcRead.Recipe2DosingFinish)
                     {
@@ -1483,105 +1446,44 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             GVL_BigStation.BarrelWasherSign = false;
                         }
                         GVL_BigStation.Recipe2DosingFinish = true;
-                        GVL_BigStation.Recipe2DosingStatus = 3;
-                        MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
-                        foreach (var item in SiemensRecipes.ElementAt(index).RawMaterial)
+                        MessageNotify.GetInstance.ShowRunLog($"配方2，配方状态：{code}配料完成");
+                        ReadStockBinDosingWeight(SiemensRecipes.ElementAt(index));
+                        if (SiemensDevice.IsConnected && !GVL_BigStation.IsUseLocalRecipe)
                         {
-                            if (item.RawMaterialLocation == 1)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin1ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 2)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin2ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 3)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin3ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 4)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin4ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 5)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin5ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 6)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin6ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 7)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin7ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 8)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin8ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 9)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin9ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 10)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin10ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 11)
+                            FinishData.Order_No = SiemensRecipes.ElementAt(index).RecipeCode;
+                            FinishData.Product_Code = SiemensRecipes.ElementAt(index).RecipeName;
+                            FinishData.job_No = (short)SiemensRecipes.ElementAt(index).TrayCode;
+                            for (int i = 0; i < FinishData.Material.Length; i++)
                             {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin11ActualWeight;
+                                FinishData.Material[i] = new UDT1();
                             }
-                            else if (item.RawMaterialLocation == 12)
+                            for (int i = 0; i < SiemensRecipes.ElementAt(index).RawMaterial.Count; i++)
                             {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin12ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 13)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin13ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 14)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin14ActualWeight;
-                            }
-                        }
-                        if (SiemensDevice.IsConnected)
-                        {
-                            FinishData.Order_No = SiemensRecipes.ElementAt(index).RecipeCode;
-                            FinishData.Product_Code = SiemensRecipes.ElementAt(index).RecipeName;
-                            FinishData.job_No = (short)SiemensRecipes.ElementAt(index).TrayCode;
-                            for (int i = 0; i < FinishData.Material.Length; i++)
-                            {
-                                FinishData.Material[i] = new UDT1();
-                            }
-                            for (int i = 0; i < SiemensRecipes.ElementAt(index).RawMaterial.Count; i++)
-                            {
-                                FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
-                                FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
-                                FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
+                                FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
+                                FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
+                                FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
+                                MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe2Time).TotalSeconds;
                             FinishData.ProcessTime = Convert.ToInt16(a);
                             SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
-                            MessageNotify.GetInstance.ShowRunLog($"配方配料完成，将信号反馈给西门子");
+                            MessageNotify.GetInstance.ShowRunLog($"配方2，{code}配方配料完成，将信号反馈给西门子");
                         }
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.5", true);
+                        GVL_BigStation.Recipe2DosingStatus = 3;
+                    }
+                    if (GVL_BigStation.Recipe2DosingStatus == 3 && HKDevice.PlcRead.Recipe2DosingFinish == false)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.5", false);
                         SiemensRecipeQueue2.TryDequeue(out code);
                         RecipeExecuteComple.Add(SiemensRecipes.ElementAt(index));
-                        if (!GVL_BigStation.IsUseLocalRecipe)
-                        {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
-                        else
+                        App.Current.Dispatcher.Invoke(() =>
                         {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
+                            Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
+                        });
                         GVL_BigStation.Recipe2DosingStatus = 0;
+                        MessageNotify.GetInstance.ShowRunLog($"配方2，{code}配方配料完成，复位plc配料完成信号");
                     }
                 }
             }
@@ -1621,21 +1523,21 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             {
                                 GVL_BigStation.BarrelWasherSign = true;
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+                                MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
                                 GVL_BigStation.DosingRecipe3Time = DateTime.Now;
                                 HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
                                 GVL_BigStation.Recipe3DosingStatus = 1;
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                                MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                             }
                         }
-                        else 
+                        else
                         {
                             GVL_BigStation.DosingRecipe3Time = DateTime.Now;
                             HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
                             GVL_BigStation.Recipe3DosingStatus = 1;
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                         }
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe3 && GVL_BigStation.Recipe3DosingStatus == 1)
@@ -1643,12 +1545,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                            MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
                         }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", false);
                         StockBinParReset();
                         GVL_BigStation.Recipe3DosingStatus = 2;
-                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
+                        MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
                     }
                     if (HKDevice.PlcRead.Recipe3DosingFinish && GVL_BigStation.Recipe3DosingStatus == 2)
                     {
@@ -1658,67 +1560,9 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         GVL_BigStation.Recipe3DosingFinish = true;
                         GVL_BigStation.Recipe3DosingStatus = 3;
-                        MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
-                        foreach (var item in SiemensRecipes.ElementAt(index).RawMaterial)
-                            {
-                                if (item.RawMaterialLocation == 1)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin1ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 2)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin2ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 3)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin3ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 4)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin4ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 5)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin5ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 6)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin6ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 7)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin7ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 8)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin8ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 9)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin9ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 10)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin10ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 11)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin11ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 12)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin12ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 13)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin13ActualWeight;
-                                }
-                                else if (item.RawMaterialLocation == 14)
-                                {
-                                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin14ActualWeight;
-                                }
-                            }
-                        if (SiemensDevice.IsConnected)
+                        MessageNotify.GetInstance.ShowRunLog($"配方3，配方状态：{code}配料完成");
+                        ReadStockBinDosingWeight(SiemensRecipes.ElementAt(index));
+                        if (SiemensDevice.IsConnected && !GVL_BigStation.IsUseLocalRecipe)
                         {
                             FinishData.Order_No = SiemensRecipes.ElementAt(index).RecipeCode;
                             FinishData.Product_Code = SiemensRecipes.ElementAt(index).RecipeName;
@@ -1732,30 +1576,27 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
                                 FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
                                 FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
+                                MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe3Time).TotalSeconds;
                             FinishData.ProcessTime = Convert.ToInt16(a);
                             SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
-                            MessageNotify.GetInstance.ShowRunLog($"配方配料完成，将信号反馈给西门子");
+                            MessageNotify.GetInstance.ShowRunLog($"配方3，{code}配方配料完成，将信号反馈给西门子");
                         }
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.6", true);
+                        GVL_BigStation.Recipe3DosingStatus = 3;
+                    }
+                    if (GVL_BigStation.Recipe3DosingStatus == 3 && HKDevice.PlcRead.Recipe3DosingFinish == false)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.6", false);
                         SiemensRecipeQueue3.TryDequeue(out code);
-                        RecipeExecuteComple.Add(SiemensRecipes.ElementAt(index));//将该配方添加到下
-                        if (!GVL_BigStation.IsUseLocalRecipe)
-                        {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
-                        else
+                        App.Current.Dispatcher.Invoke(() =>
                         {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
+                            Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
+                        });
                         GVL_BigStation.Recipe3DosingStatus = 0;
+                        MessageNotify.GetInstance.ShowRunLog($"配方3，{code}配方配料完成，复位plc配料完成信号");
                     }
                 }
             }
@@ -1795,12 +1636,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             {
                                 GVL_BigStation.BarrelWasherSign = true;
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+                                MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
                                 GVL_BigStation.DosingRecipe4Time = DateTime.Now;
                                 HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
                                 GVL_BigStation.Recipe4DosingStatus = 1;
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                                MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                             }
                         }
                         else
@@ -1809,7 +1650,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
                             GVL_BigStation.Recipe4DosingStatus = 1;
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                         }
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe4 && GVL_BigStation.Recipe4DosingStatus == 1)
@@ -1817,12 +1658,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                            MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
                         }
                         GVL_BigStation.Recipe4DosingStatus = 2;
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", false);
                         StockBinParReset();
-                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
+                        MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
                     }
                     if (GVL_BigStation.Recipe4DosingStatus == 2 && HKDevice.PlcRead.Recipe4DosingFinish)
                     {
@@ -1832,67 +1673,9 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         GVL_BigStation.Recipe4DosingFinish = true;
                         GVL_BigStation.Recipe4DosingStatus = 3;
-                        MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
-                        foreach (var item in SiemensRecipes.ElementAt(index).RawMaterial)
-                        {
-                            if (item.RawMaterialLocation == 1)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin1ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 2)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin2ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 3)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin3ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 4)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin4ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 5)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin5ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 6)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin6ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 7)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin7ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 8)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin8ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 9)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin9ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 10)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin10ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 11)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin11ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 12)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin12ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 13)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin13ActualWeight;
-                            }
-                            else if (item.RawMaterialLocation == 14)
-                            {
-                                item.Laying_Off_Weight = HKDevice.PlcRead.StockBin14ActualWeight;
-                            }
-                        }
-                        if (SiemensDevice.IsConnected)
+                        MessageNotify.GetInstance.ShowRunLog($"配方4，配方状态：{code}配料完成");
+                        ReadStockBinDosingWeight(SiemensRecipes.ElementAt(index));
+                        if (SiemensDevice.IsConnected && !GVL_BigStation.IsUseLocalRecipe)
                         {
                             FinishData.Order_No = SiemensRecipes.ElementAt(index).RecipeCode;
                             FinishData.Product_Code = SiemensRecipes.ElementAt(index).RecipeName;
@@ -1906,30 +1689,27 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
                                 FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
                                 FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
+                                MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe4Time).TotalSeconds;
                             FinishData.ProcessTime = Convert.ToInt16(a);
                             SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
-                            MessageNotify.GetInstance.ShowRunLog($"配方配料完成，将信号反馈给西门子");
+                            MessageNotify.GetInstance.ShowRunLog($"配方4，{code}配方配料完成，将信号反馈给西门子");
                         }
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.7", true);
+                        GVL_BigStation.Recipe4DosingStatus = 3;
+                    }
+                    if (GVL_BigStation.Recipe4DosingStatus == 3 && HKDevice.PlcRead.Recipe4DosingFinish == false)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB99.DBX1.7", false);
                         SiemensRecipeQueue4.TryDequeue(out code);
-                        RecipeExecuteComple.Add(SiemensRecipes.ElementAt(index));//将该配方添加到下
-                        if (!GVL_BigStation.IsUseLocalRecipe)
-                        {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
-                        else
+                        App.Current.Dispatcher.Invoke(() =>
                         {
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
-                            });
-                        }
+                            Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
+                        });
                         GVL_BigStation.Recipe4DosingStatus = 0;
+                        MessageNotify.GetInstance.ShowRunLog($"配方4，{code}配方配料完成，复位plc配料完成信号");
                     }
                 }
             }
@@ -1950,39 +1730,25 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         private void testRawMaterialNameData()
         {
             //RawMaterialsInfo = Json<RawMaterialData>.Data.RawMaterial;
-            //foreach (var material in RawMaterialsInfo)
-            //{
-            //    if (!string.IsNullOrEmpty(material.RawMaterialName))
-            //    {
-            //        if (!RawMaterialsNamePos.ContainsKey(material.RawMaterialName))
-            //        {
-            //            RawMaterialsNamePos.Add(material.RawMaterialName, (short)material.RawMaterialLocation);
-            //        }
-            //    }
-            //}
+            /*foreach (var material in RawMaterialsInfo)
+            {
+                if (!string.IsNullOrEmpty(material.RawMaterialName))
+                {
+                    if (!RawMaterialsNamePos.ContainsKey(material.RawMaterialName))
+                    {
+                        RawMaterialsNamePos.Add(material.RawMaterialName, (short)material.RawMaterialLocation);
+                    }
+                }
+            }*/
             if (RawMaterialsNamePos.Count == 14)
             {
-                for (int i = 0; i < typeof(StockBinName).GetProperties().Length; i++) 
+                for (int i = 0; i < typeof(StockBinName).GetProperties().Length; i++)
                 {
                     PropertyInfo pro = GVL_BigStation.stockBinName.GetType().GetProperty(typeof(StockBinName).GetProperties()[i].Name);
-                    RawMaterialsNamePos[i+1] = pro.GetValue(GVL_BigStation.stockBinName, null).ToString();
+                    RawMaterialsNamePos[i + 1] = pro.GetValue(GVL_BigStation.stockBinName, null).ToString();
                 }
-               /* RawMaterialsNamePos[1] = GVL_BigStation.stockBinName.RawMaterialName1;
-                RawMaterialsNamePos[2] = GVL_BigStation.stockBinName.RawMaterialName2;
-                RawMaterialsNamePos[3] = GVL_BigStation.stockBinName.RawMaterialName3;
-                RawMaterialsNamePos[4] = GVL_BigStation.stockBinName.RawMaterialName4;
-                RawMaterialsNamePos[5] = GVL_BigStation.stockBinName.RawMaterialName5;
-                RawMaterialsNamePos[6] = GVL_BigStation.stockBinName.RawMaterialName6;
-                RawMaterialsNamePos[7] = GVL_BigStation.stockBinName.RawMaterialName7;
-                RawMaterialsNamePos[8] = GVL_BigStation.stockBinName.RawMaterialName8;
-                RawMaterialsNamePos[9] = GVL_BigStation.stockBinName.RawMaterialName9;
-                RawMaterialsNamePos[10] = GVL_BigStation.stockBinName.RawMaterialName10;
-                RawMaterialsNamePos[11] = GVL_BigStation.stockBinName.RawMaterialName11;
-                RawMaterialsNamePos[12] = GVL_BigStation.stockBinName.RawMaterialName12;
-                RawMaterialsNamePos[13] = GVL_BigStation.stockBinName.RawMaterialName13;
-                RawMaterialsNamePos[14] = GVL_BigStation.stockBinName.RawMaterialName14;*/
             }
-            else 
+            else
             {
                 RawMaterialsNamePos.TryAdd(1, GVL_BigStation.stockBinName.RawMaterialName1);
                 RawMaterialsNamePos.TryAdd(2, GVL_BigStation.stockBinName.RawMaterialName2);
@@ -2018,13 +1784,15 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     HardWareRawMaterialInfo.ElementAt(index).RawMaterialName = item.Value;
                     HardWareRawMaterialInfo.ElementAt(index).RawMaterialChineseName = name;
                 }
-                else if (num == -1) 
+                else if (num == -1)
                 {
                     HardWareRawMaterialInfo.ElementAt(index).RawMaterialLocation = item.Key;
                     HardWareRawMaterialInfo.ElementAt(index).RawMaterialName = "";
                     HardWareRawMaterialInfo.ElementAt(index).RawMaterialChineseName = "";
                 }
             }
+            
+            RawMaterialsInfo = HardWareRawMaterialInfo;
         }
         /// <summary>
         /// MES的物料名称和物料编码对应
@@ -2095,7 +1863,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// <summary>
         /// 设备连接 西门子和海科PLC
         /// </summary>
-        public void DeviceConnectInit() 
+        public void DeviceConnectInit()
         {
             GVL_BigStation.IsAllowHKPlcConnect = ConfigurationManager.AppSettings["HKPlc_Connect"].ToLower() == "true" ? true : false;
             GVL_BigStation.IsAllowSiemensConnect = ConfigurationManager.AppSettings["Siemens_Connect"].ToLower() == "true" ? true : false;
@@ -2141,7 +1909,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
             }
         }
 
-        public void ThreadInit() 
+        public void ThreadInit()
         {
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
@@ -2238,16 +2006,16 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                 }
                 else
                 {
-                    if (GVL_BigStation.IsUseLocalRecipe)
+                    /*if (GVL_BigStation.IsUseLocalRecipe)
                     {
                         LocalRecipeRecevice();
                         LocalRecipeDosing();
                     }
                     else
-                    {
+                    {*/
                         ReceviceData();
                         RecipeInfoToHKPLC();
-                    }
+                   /* }*/
                 }
                 Thread.Sleep(10);
             }), "配方数据执行流程", true);
@@ -2255,7 +2023,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// <summary>
         /// 初始化变量复位
         /// </summary>
-        public void VarResetInit() 
+        public void VarResetInit()
         {
             LocalRecipeQueue1.Clear();
             LocalRecipeQueue2.Clear();
@@ -2266,5 +2034,364 @@ namespace BPASmartClient.JXJFoodBigStation.Model
             SiemensRecipeQueue3.Clear();
             SiemensRecipeQueue4.Clear();
         }
+        public void RecipeDosing()
+        {
+            GVL_BigStation.AllowIssueRecipe[0] = HKDevice.PlcRead.IsAllowIssueRecipe1;
+            GVL_BigStation.AllowIssueRecipe[1] = HKDevice.PlcRead.IsAllowIssueRecipe2;
+            GVL_BigStation.AllowIssueRecipe[2] = HKDevice.PlcRead.IsAllowIssueRecipe3;
+            GVL_BigStation.AllowIssueRecipe[3] = HKDevice.PlcRead.IsAllowIssueRecipe4;
+            GVL_BigStation.ReceviceFinishRecipe[0] = HKDevice.PlcRead.ReceiveFinishRecipe1;
+            GVL_BigStation.ReceviceFinishRecipe[1] = HKDevice.PlcRead.ReceiveFinishRecipe2;
+            GVL_BigStation.ReceviceFinishRecipe[2] = HKDevice.PlcRead.ReceiveFinishRecipe3;
+            GVL_BigStation.ReceviceFinishRecipe[3] = HKDevice.PlcRead.ReceiveFinishRecipe4;
+            GVL_BigStation.DosingFinishRecipe[0] = HKDevice.PlcRead.Recipe1DosingFinish;
+            GVL_BigStation.DosingFinishRecipe[1] = HKDevice.PlcRead.Recipe2DosingFinish;
+            GVL_BigStation.DosingFinishRecipe[2] = HKDevice.PlcRead.Recipe3DosingFinish;
+            GVL_BigStation.DosingFinishRecipe[3] = HKDevice.PlcRead.Recipe4DosingFinish;
+            GVL_BigStation.IsTrayArrive[0] = HKDevice.PlcRead.Tray1InPlace;
+            GVL_BigStation.IsTrayArrive[1] = HKDevice.PlcRead.Tray2InPlace;
+            GVL_BigStation.IsTrayArrive[2] = HKDevice.PlcRead.Tray3InPlace;
+            GVL_BigStation.IsTrayArrive[3] = HKDevice.PlcRead.Tray4InPlace;
+            GVL_BigStation.IsTrayArrive[4] = HKDevice.PlcRead.Tray5InPlace;
+            #region 接收配方
+            SiemensRecipes = Json<RemoteRecipe>.Data.Recipes;
+            if (SiemensRecipes.Count > 0)
+            {
+                foreach (var data in SiemensRecipes)
+                {
+                    foreach (var item in SiemensRecipeQueue)
+                    {
+                        if (item.Value.Count == 0 && item.Key == data.TrayCode && GVL_BigStation.AllowIssueRecipe[item.Key-1])
+                        {
+                            if (SiemensDevice.DL_Status is DL_Status_DB status)
+                            {
+                                switch (GVL_BigStation.SiemensSendRecipeStatus)
+                                {
+                                    case 3:
+                                        SiemensDevice.Siemens_PLC_S7.WriteString(2331, data.RecipeCode, 10);
+                                        SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", true);
+                                        MessageNotify.GetInstance.ShowRunLog($"配方1，发送配方编号和请求配料标志给西门子");
+                                        GVL_BigStation.SiemensSendRecipeStatus = 4;
+                                        break;
+                                    case 4:
+                                        if (SiemensDevice.DL_Status.Dosing_Start_ACK)
+                                        {
+                                            SiemensDevice.Siemens_PLC_S7.WriteString(2331, "", 10);
+                                            SiemensDevice.Siemens_PLC_S7.Write("DB2331.DBX28.0", false);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方1，西门子确认开始配料");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 5;
+                                        }
+                                        break;
+                                    case 5:
+                                        if (SiemensDevice.DL_Status.Dosing_Start_ACK == false)
+                                        {
+                                            item.Value.Enqueue(data.RecipeCode);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方1，配方：{data.RecipeCode}，加入队列");
+                                            GVL_BigStation.SiemensSendRecipeStatus = 0;
+                                        }
+                                        break;
+                                    default:
+                                        break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                SiemensRecipeQueue.Clear();
+                GVL_BigStation.BarrelWasherSign = false;
+                for (int i = 0; i < GVL_BigStation.RecipeDosingStatus.Length; i++)
+                {
+                    GVL_BigStation.RecipeDosingStatus[i] = 0;
+                }
+            }
+            #endregion
+            #region 取消配方
+            if (GVL_BigStation.Order_Cancel) //订单取消
+            {
+                if (!string.IsNullOrEmpty(GVL_BigStation.Order_CancelRecipeCode))
+                {
+                    string code = GVL_BigStation.Order_CancelRecipeCode;
+                    int index = Array.FindIndex(Json<RemoteRecipe>.Data.Recipes.ToArray(), p => p.RecipeCode == GVL_BigStation.Order_CancelRecipeCode);
+                    short TrayCode = 0;
+                    if (index >= 0)
+                    {
+                        TrayCode = (short)Json<RemoteRecipe>.Data.Recipes.ElementAt(index).TrayCode;
+                    }
+                    switch (GVL_BigStation.Order_CancelStep)
+                    {
+                        case 0:
+                            if (index == -1)
+                            {
+                                GVL_BigStation.Order_CancelStep = 10;
+                            }
+                            else
+                            {
+                                GVL_BigStation.Order_CancelStep = 20;
+                                foreach (var item in SiemensRecipeQueue)
+                                {
+                                    if (item.Value.Contains(code)) 
+                                    {
+                                        GVL_BigStation.Order_CancelStep = 30;
+                                    }
+                                }
+                            }
+                            break;
+                        case 10:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
+                            GVL_BigStation.Order_CancelStep = 11;
+                            break;
+                        case 11:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                                GVL_BigStation.Order_CancelStep = 12;
+                            }
+                            break;
+                        case 12:
+                            MessageNotify.GetInstance.ShowRunLog($"西门子取消订单,但未找到订单:{GVL_BigStation.Order_CancelRecipeCode}");
+                            GVL_BigStation.Order_Cancel = false;
+                            GVL_BigStation.Order_CancelRecipeCode = "";
+                            GVL_BigStation.Order_CancelStep = 0;
+                            break;
+
+                        case 20:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
+                            GVL_BigStation.Order_CancelStep = 21;
+                            break;
+                        case 21:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                                GVL_BigStation.Order_CancelStep = 22;
+                            }
+                            break;
+                        case 22:
+                            GVL_BigStation.SiemensSendRecipeStatus = 0;
+                            App.Current.Dispatcher.Invoke(() =>
+                            {
+                                Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);
+                            });
+                            MessageNotify.GetInstance.ShowRunLog($"正在执行请求订单流程，配方还未到PLC，订单号：{GVL_BigStation.Order_CancelRecipeCode}");
+                            GVL_BigStation.Order_Cancel = false;
+                            GVL_BigStation.Order_CancelRecipeCode = "";
+                            GVL_BigStation.Order_CancelStep = 0;
+                            break;
+
+                        case 30:
+                            foreach (var item in SiemensRecipeQueue)
+                            {
+                                if (item.Value.Contains(code))
+                                {
+                                    if (GVL_BigStation.RecipeDosingStatus[item.Key-1] != 0)
+                                    {
+                                        HKDevice.HK_PLC_S7.Write("DB99.DBX230.0", true);
+                                        HKDevice.HK_PLC_S7.Write("DB99.DBW232", (short)TrayCode);
+                                        GVL_BigStation.RecipeDosingStatus[item.Key - 1] = 0;
+                                        item.Value.TryDequeue(out code);
+                                        GVL_BigStation.Order_CancelStep = 32;
+                                        MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
+                                    }
+                                    else
+                                    {
+                                        GVL_BigStation.Order_CancelStep = 32;
+                                        MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
+                                    }
+                                }
+                            }
+                            break;
+                        case 32:
+                            SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", true);
+                            GVL_BigStation.Order_CancelStep = 33;
+                            break;
+                        case 33:
+                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2301.DBX320.2") == false)
+                            {
+                                SiemensDevice.Siemens_PLC_S7.Write("DB2301.DBX330.1", false);
+                                App.Current.Dispatcher.Invoke(() =>
+                                {
+                                    Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);
+                                });
+                                GVL_BigStation.Order_CancelStep = 0;
+                                MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+            #endregion
+            #region 配料
+            foreach (var data in SiemensRecipeQueue)
+            {
+                int index = Array.FindIndex(SiemensRecipes.ToArray(), p => p.RecipeCode == data.Value.ElementAt(0));
+                if (index >= 0 && index < SiemensRecipes.Count)
+                {
+                    string code = SiemensRecipes.ElementAt(index).RecipeCode;
+                    int trayCode = SiemensRecipes.ElementAt(index).TrayCode;
+                    if (GVL_BigStation.RecipeDosingStatus[data.Key] == 0 && GVL_BigStation.AllowIssueRecipe[data.Key] && GVL_BigStation.IsTrayArrive[trayCode - 1])//配方4是否允许下发配发
+                    {
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            if (!GVL_BigStation.BarrelWasherSign)//其他配方在洗桶时，等待其他配方洗完，在发送数据
+                            {
+                                GVL_BigStation.BarrelWasherSign = true;
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+
+                                GVL_BigStation.RecipeDosingTime[data.Key] = DateTime.Now;
+                                HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                                HKDevice.HK_PLC_S7.Write($"DB99.DBX0.{2 + data.Key}", true);
+                                GVL_BigStation.RecipeDosingStatus[data.Key] = 1;
+                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            }
+                        }
+                        else
+                        {
+                            GVL_BigStation.RecipeDosingTime[data.Key] = DateTime.Now;
+                            HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                            HKDevice.HK_PLC_S7.Write($"DB99.DBX0.{2 + data.Key}", true);
+                            GVL_BigStation.RecipeDosingStatus[data.Key] = 1;
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                        }
+                    }
+                    if (GVL_BigStation.RecipeDosingStatus[data.Key] == 1 && GVL_BigStation.ReceviceFinishRecipe[data.Key])
+                    {
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶
+                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶复位");
+                        }
+                        GVL_BigStation.RecipeDosingStatus[data.Key] = 2;
+                        HKDevice.HK_PLC_S7.Write($"DB99.DBX0.{2 + data.Key}", true);
+                        StockBinParReset();
+                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
+                    }
+                    if (GVL_BigStation.RecipeDosingStatus[data.Key] == 2 && GVL_BigStation.DosingFinishRecipe[data.Key])
+                    {
+                        if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
+                        {
+                            GVL_BigStation.BarrelWasherSign = false;
+                        }
+                        MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
+                        ReadStockBinDosingWeight(SiemensRecipes.ElementAt(index));
+                        if (SiemensDevice.IsConnected)
+                        {
+                            FinishData.Order_No = SiemensRecipes.ElementAt(index).RecipeCode;
+                            FinishData.Product_Code = SiemensRecipes.ElementAt(index).RecipeName;
+                            FinishData.job_No = (short)SiemensRecipes.ElementAt(index).TrayCode;
+                            for (int i = 0; i < FinishData.Material.Length; i++)
+                            {
+                                FinishData.Material[i] = new UDT1();
+                            }
+                            for (int i = 0; i < SiemensRecipes.ElementAt(index).RawMaterial.Count; i++)
+                            {
+                                FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
+                                FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
+                                FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
+                                MessageNotify.GetInstance.ShowRunLog($"配方{data.Key}，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
+                            }
+                            FinishData.Ask_For_Finish = true;
+                            double a = DateTime.Now.Subtract(GVL_BigStation.RecipeDosingTime[data.Key]).TotalSeconds;
+                            FinishData.ProcessTime = Convert.ToInt16(a);
+                            SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
+                            MessageNotify.GetInstance.ShowRunLog($"{code}配方配料完成，将信号反馈给西门子");
+                        }
+                        data.Value.TryDequeue(out code);
+                        if (!GVL_BigStation.IsUseLocalRecipe)
+                        {
+                            App.Current.Dispatcher.Invoke(() =>
+                            {
+                                Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
+                            });
+                        }
+                        else
+                        {
+                            App.Current.Dispatcher.Invoke(() =>
+                            {
+                                Json<LocalRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
+                            });
+                        }
+                        HKDevice.HK_PLC_S7.Write($"DB99.DBX1.{data.Key + 3}", true);
+                        GVL_BigStation.RecipeDosingStatus[data.Key] = 3;
+                    }
+                    if (GVL_BigStation.RecipeDosingStatus[data.Key] == 3 && GVL_BigStation.DosingFinishRecipe[data.Key] == false)
+                    {
+                        HKDevice.HK_PLC_S7.Write($"DB99.DBX1.{data.Key + 3}", false);
+                        GVL_BigStation.RecipeDosingStatus[data.Key] = 0;
+                    }
+                }
+            }
+            #endregion
+        }
+        /// <summary>
+        /// 读取配料完成时，每个料仓的配料重量
+        /// </summary>
+        /// <param name="recipes"></param>
+        public void ReadStockBinDosingWeight(RecipeData recipes)
+        {
+            foreach (var item in recipes.RawMaterial)
+            {
+                if (item.RawMaterialLocation == 1)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin1ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 2)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin2ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 3)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin3ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 4)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin4ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 5)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin5ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 6)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin6ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 7)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin7ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 8)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin8ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 9)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin9ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 10)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin10ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 11)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin11ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 12)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin12ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 13)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin13ActualWeight;
+                }
+                else if (item.RawMaterialLocation == 14)
+                {
+                    item.Laying_Off_Weight = HKDevice.PlcRead.StockBin14ActualWeight;
+                }
+            }
+        }
     }
 }
diff --git a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs
index dc05bc4f..9d1a21c9 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs
@@ -44,5 +44,13 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// 原料数据
         /// </summary>
         public ObservableCollection<RawMaterial> RawMaterial { get; set; } = new ObservableCollection<RawMaterial>();
+
+        public RecipeSource RecipesSource { get { return _mRecipesSource; } set { _mRecipesSource = value; OnPropertyChanged(); } }
+        private RecipeSource _mRecipesSource = RecipeSource.远程;
+    }
+    public enum RecipeSource 
+    {
+        本地,
+        远程
     }
 }
diff --git a/BPASmartClient.JXJFoodBigStation/Model/RecipeDosing.cs b/BPASmartClient.JXJFoodBigStation/Model/RecipeDosing.cs
new file mode 100644
index 00000000..d55082c1
--- /dev/null
+++ b/BPASmartClient.JXJFoodBigStation/Model/RecipeDosing.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodBigStation.Model
+{
+    public class RecipeDosing
+    {
+        public string RecipeCode { get; set; }
+        public int RecipeTray { get; set; }
+        public int DosingStatus { get; set; }
+
+
+        public bool IsAllowIssue { get; set; }
+        public bool IsAGVArrive { get; set; }
+        public bool IsReceviceFinish { get; set; }
+        public bool IsDosingFinish { get; set; }
+
+        public DateTime DosingStartTime { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.JXJFoodBigStation/Model/Siemens/SiemensDeviceStatus.cs b/BPASmartClient.JXJFoodBigStation/Model/Siemens/SiemensDeviceStatus.cs
index 1456067a..2bc9ba0b 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/Siemens/SiemensDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/Siemens/SiemensDeviceStatus.cs
@@ -17,7 +17,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model.Siemens
         public bool IsConnected => Siemens_PLC_S7.IsConnected;
 
         public DL_Status_DB DL_Status = new DL_Status_DB();
-        bool a = false;
+        bool printFirstLog = false;
         public void Init()
         {
             ThreadManage.GetInstance().StartLong(new Action(() =>
@@ -30,14 +30,27 @@ namespace BPASmartClient.JXJFoodBigStation.Model.Siemens
                     //var res3 = this.Siemens_PLC_S7.ReadClass<DL_DataColl_DB>(2391);
                     if (res != null && res is DL_Start_DB start)
                     {
-                        if (GVL_BigStation.Order_Request && GVL_BigStation.SiemensSendRecipeStatus == 0)
+                        if (GVL_BigStation.SiemensSendRecipeStatus == 0)
                         {
-                            this.Siemens_PLC_S7.Write("DB2301.DBX330.0", true);
-                            MessageNotify.GetInstance.ShowRunLog($"向西门子请求订单");
-                            GVL_BigStation.SiemensSendRecipeStatus = 1;
+                            if (GVL_BigStation.Order_Request)
+                            {
+                                this.Siemens_PLC_S7.Write("DB2301.DBX330.0", true);
+                                MessageNotify.GetInstance.ShowRunLog($"向西门子请求订单");
+                                GVL_BigStation.SiemensSendRecipeStatus = 1;
+                            }
+                            else
+                            {
+                                this.Siemens_PLC_S7.Write("DB2301.DBX330.0", false);
+                                if (!printFirstLog)
+                                {
+                                    printFirstLog = true;
+                                    MessageNotify.GetInstance.ShowRunLog($"plc不允许下发订单");
+                                }
+                            }
                         }
                         if (RTrig.GetInstance("Order_Request_Ack").Start(start.Order_Request_Ack) && GVL_BigStation.SiemensSendRecipeStatus == 1)
                         {
+                            printFirstLog = false;
                             ActionManage.GetInstance.Send("SiemensSendRecipe", start);
                             this.Siemens_PLC_S7.Write("DB2301.DBX330.0", false);
                             MessageNotify.GetInstance.ShowRunLog($"西门子下发订单:{start.RecipeCode}");
diff --git a/BPASmartClient.JXJFoodBigStation/View/HardwareStatusView.xaml b/BPASmartClient.JXJFoodBigStation/View/HardwareStatusView.xaml
index ae8c420d..e0d3a366 100644
--- a/BPASmartClient.JXJFoodBigStation/View/HardwareStatusView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/HardwareStatusView.xaml
@@ -374,7 +374,7 @@
                         <UniformGrid
                             HorizontalAlignment="Left"
                             VerticalAlignment="Top"
-                            Columns="6"
+                            Columns="7"
                             Rows="1" />
                     </ItemsPanelTemplate>
                 </ListView.ItemsPanel>
@@ -386,7 +386,7 @@
                                 <Grid.RowDefinitions>
                                     <RowDefinition />
                                     <RowDefinition />
-                                    <RowDefinition />
+                                    <!--<RowDefinition />-->
                                     <!--<RowDefinition Height="0.1*"/>-->
                                 </Grid.RowDefinitions>
                                 <!--<TextBox
@@ -465,7 +465,7 @@
                                         Text=" 号仓" />
                                 </StackPanel>
 
-                                <Button Grid.Row="2"
+                                <!--<Button Grid.Row="2"
                                     Width="200"
                                     Height="40"
                                     Margin="5,0,5,0"
@@ -474,7 +474,7 @@
                                     Content="修改原料名称"
                                     FontSize="20"
                                     Panel.ZIndex="0"
-                                    Style="{StaticResource ImageButtonStyle}"></Button>
+                                    Style="{StaticResource ImageButtonStyle}"></Button>-->
 
 
                                 <Image
@@ -536,7 +536,7 @@
                 Height="{Binding ElementName=gr, Path=ActualHeight}"
                 Margin="10,0,30,0"
                 ConveyorBeltWidth="70"
-                Direction="2"
+                Direction="0"
                 StrokeBrush="#00BEFA"
                 StrokeDashArray="1.5 1.5"
                 StrokeFillBrush="#00BEFA"
@@ -558,7 +558,7 @@
                         <UniformGrid
                             HorizontalAlignment="Left"
                             VerticalAlignment="Top"
-                            Columns="6"
+                            Columns="7"
                             Rows="1" />
                     </ItemsPanelTemplate>
                 </ListView.ItemsPanel>
@@ -568,7 +568,6 @@
                         <Border Margin="5" Background="Transparent">
                             <Grid Height="220">
                                 <Grid.RowDefinitions>
-                                    <RowDefinition/>
                                     <RowDefinition/>
                                     <RowDefinition/>
                                     <!--<RowDefinition  Height="0.1*"/>-->
@@ -637,7 +636,7 @@
                                         Foreground="#FF0084FF"
                                         Text=" 号仓" />
                                 </StackPanel>
-                                <Button Grid.Row="2"
+                                <!--<Button Grid.Row="2"
                                     Width="200"
                                     Height="40"
                                     Margin="5,0,5,0"
@@ -645,7 +644,7 @@
                                     CommandParameter="{Binding DeviceName}"
                                     Content="修改原料名称"
                                     FontSize="20"
-                                    Style="{StaticResource ImageButtonStyle}"></Button>
+                                    Style="{StaticResource ImageButtonStyle}"></Button>-->
                                 <Image
                                     Grid.RowSpan="2"
                                     Source="/BPASmartClient.CustomResource;component/Image/光柱.png"
diff --git a/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
index 084de0e0..3697d340 100644
--- a/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
@@ -13,6 +13,8 @@
     
     <Grid Margin="10">
         <Grid.RowDefinitions>
+            <RowDefinition Height="50" />
+            <RowDefinition Height="50" />
             <RowDefinition Height="100" />
             <RowDefinition Height="1*" />
         </Grid.RowDefinitions>
@@ -23,7 +25,8 @@
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
-                    Command="{Binding Tray1InPlace}"
+                    Command="{Binding TrayInPlace}"
+                    CommandParameter="1"
                     Content="AGV到达工位1"
                     FontSize="20"
                     Panel.ZIndex="0"
@@ -32,7 +35,8 @@
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
-                    Command="{Binding Tray2InPlace}"
+                    Command="{Binding TrayInPlace}"
+                    CommandParameter="2"
                     Content="AGV到达工位2"
                     FontSize="20"
                     Panel.ZIndex="0"
@@ -41,7 +45,8 @@
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
-                    Command="{Binding Tray3InPlace}"
+                    Command="{Binding TrayInPlace}"
+                    CommandParameter="3"
                     Content="AGV到达工位3"
                     FontSize="20"
                     Panel.ZIndex="0"
@@ -50,7 +55,8 @@
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
-                    Command="{Binding Tray4InPlace}"
+                    Command="{Binding TrayInPlace}"
+                    CommandParameter="4"
                     Content="AGV到达工位4"
                     FontSize="20"
                     Panel.ZIndex="0"
@@ -59,11 +65,71 @@
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
-                    Command="{Binding Tray5InPlace}"
+                    Command="{Binding TrayInPlace}"
+                    CommandParameter="5"
                     Content="AGV到达工位5"
                     FontSize="20"
                     Panel.ZIndex="0"
                     Style="{StaticResource ImageButtonStyle}"></Button>
+            </StackPanel>
+        </Grid>
+        <Grid Grid.Row="1">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center">
+                <Button
+                    Width="200"
+                    Height="40"
+                    Margin="5,0,5,0"
+                    Command="{Binding TrayLeave}"
+                    CommandParameter="1"
+                    Content="AGV离开工位1"
+                    FontSize="20"
+                    Panel.ZIndex="0"
+                    Style="{StaticResource ImageButtonStyle}"></Button>
+                <Button
+                    Width="200"
+                    Height="40"
+                    Margin="5,0,5,0"
+                    Command="{Binding TrayLeave}"
+                    CommandParameter="2"
+                    Content="AGV离开工位2"
+                    FontSize="20"
+                    Panel.ZIndex="0"
+                    Style="{StaticResource ImageButtonStyle}"></Button>
+                <Button
+                    Width="200"
+                    Height="40"
+                    Margin="5,0,5,0"
+                    Command="{Binding TrayLeave}"
+                    CommandParameter="3"
+                    Content="AGV离开工位3"
+                    FontSize="20"
+                    Panel.ZIndex="0"
+                    Style="{StaticResource ImageButtonStyle}"></Button>
+                <Button
+                    Width="200"
+                    Height="40"
+                    Margin="5,0,5,0"
+                    Command="{Binding TrayLeave}"
+                    CommandParameter="4"
+                    Content="AGV离开工位4"
+                    FontSize="20"
+                    Panel.ZIndex="0"
+                    Style="{StaticResource ImageButtonStyle}"></Button>
+                <Button
+                    Width="200"
+                    Height="40"
+                    Margin="5,0,5,0"
+                    Command="{Binding TrayLeave}"
+                    CommandParameter="5"
+                    Content="AGV离开工位5"
+                    FontSize="20"
+                    Panel.ZIndex="0"
+                    Style="{StaticResource ImageButtonStyle}"></Button>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Row="2">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center">
                 <Button
                     Width="200"
                     Height="40"
@@ -84,10 +150,11 @@
                     Style="{StaticResource ImageButtonStyle}"></Button>
             </StackPanel>
         </Grid>
-        <Grid Grid.Row="1">
+        <Grid Grid.Row="3">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition></ColumnDefinition>
                 <ColumnDefinition></ColumnDefinition>
+                <ColumnDefinition></ColumnDefinition>
             </Grid.ColumnDefinitions>
             <StackPanel>
                 <WrapPanel>
@@ -100,66 +167,66 @@
                     <Button Style="{StaticResource ImageButtonStyle}" Width="120" Height="40" FontSize="20" Content="取消订单" Margin="5" Command="{Binding CancelRecipeCommand}"></Button>
                 </WrapPanel>
             </StackPanel>
-            <StackPanel Grid.Column="1">
+            <StackPanel Grid.Column="3">
                 <WrapPanel>
                     <TextBlock Text="料仓名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBinName}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBinName}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓1名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin1Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin1Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓2名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin2Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin2Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓3名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin3Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin3Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓4名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin4Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin4Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓5名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin5Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin5Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓6名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin6Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin6Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓7名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin7Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin7Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓8名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin8Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin8Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓9名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin9Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin9Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓10名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin10Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin10Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓11名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin11Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin11Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓12名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin12Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin12Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓13名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin13Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin13Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
                     <TextBlock Text="料仓14名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin14Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="{Binding StockBin14Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
                 </WrapPanel>
             </StackPanel>
         </Grid>
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
index 1c3603c8..3c220ef4 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
@@ -159,11 +159,23 @@
             <CheckBox
                 x:Name="IsUseLocalRecipe"
                 Margin="0,0,10,0"
-                Content="本地配方"
+                Content="使用本地配方配料"
                 FontFamily="楷体"
                 VerticalAlignment="Center"
                 Foreground="Aqua"
                 IsChecked="{Binding IsUseLocalRecipe}" />
+
+            <!--<pry:IcoButton 
+                Width="140"
+                Margin="10"
+                HorizontalAlignment="Left"
+                Command="{Binding RefreshRecipe}"
+                Content="刷新配方"
+                FontSize="16"
+                Foreground="Aqua"
+                IcoText="&#xe626;"
+                Style="{StaticResource IcoButtonStyle}" />-->
+            
             <pry:IcoButton 
                 Width="140"
                 Margin="10"
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
index fe52930c..5b5688dd 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
@@ -419,7 +419,6 @@
 
         <Grid.ColumnDefinitions>
             <ColumnDefinition />
-            <ColumnDefinition Width="0.25*" />
         </Grid.ColumnDefinitions>
 
         <Grid Name="ggr" Margin="10">
@@ -822,7 +821,7 @@
 
         </Grid>
 
-        <Grid
+        <!--<Grid
             Name="gr"
             Grid.Column="1"
             Margin="10">
@@ -924,11 +923,11 @@
                             </ItemsControl>
 
                         </Grid>
-                        <!--<TreeView x:Name="repiceListMaking"   ItemsSource="{Binding RecipeProcesse}"
+                        --><!--<TreeView x:Name="repiceListMaking"   ItemsSource="{Binding RecipeProcesse}"
                                   ScrollViewer.VerticalScrollBarVisibility="Disabled" HorizontalAlignment="Stretch" Background="Wheat"  ItemContainerStyle="{StaticResource recipeTreeItem}">
                         </TreeView>-->
 
-                        <!--  等待和已完成  -->
+                        <!--  等待和已完成  --><!--
 
                         <TreeView
                             x:Name="repiceList"
@@ -945,6 +944,6 @@
                     </Grid>
                 </Border>
             </ScrollViewer>
-        </Grid>
+        </Grid>-->
     </Grid>
 </UserControl>
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml.cs b/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml.cs
index a5099747..66464759 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml.cs
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml.cs
@@ -28,24 +28,24 @@ namespace BPASmartClient.JXJFoodBigStation.View
 
         private void RadioButtonCompelete_Click(object sender, RoutedEventArgs e)
         {
-            repiceList.ItemsSource = RecipeSendDownViewModel.UserTreeCompelete;
-            repiceList.Visibility = Visibility.Visible;
-            repiceListMaking.Visibility = Visibility.Hidden;
+            //repiceList.ItemsSource = RecipeSendDownViewModel.UserTreeCompelete;
+            //repiceList.Visibility = Visibility.Visible;
+            //repiceListMaking.Visibility = Visibility.Hidden;
 
 
         }
 
         private void RadioButtonWait_Click(object sender, RoutedEventArgs e)
         {
-            repiceList.ItemsSource = RecipeSendDownViewModel.UserTreeWait;
-            repiceList.Visibility = Visibility.Visible;
-            repiceListMaking.Visibility = Visibility.Hidden;
+            //repiceList.ItemsSource = RecipeSendDownViewModel.UserTreeWait;
+            //repiceList.Visibility = Visibility.Visible;
+            //repiceListMaking.Visibility = Visibility.Hidden;
         }
 
         private void RadioButtonMaking_Click(object sender, RoutedEventArgs e)
         {
-            repiceListMaking.Visibility = Visibility.Visible;
-            repiceList.Visibility = Visibility.Hidden;
+            //repiceListMaking.Visibility = Visibility.Visible;
+            //repiceList.Visibility = Visibility.Hidden;
 
         }
     }
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/HardwareStatusViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/HardwareStatusViewModel.cs
index 2118adfb..cd1e96f6 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/HardwareStatusViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/HardwareStatusViewModel.cs
@@ -12,6 +12,8 @@ using Microsoft.Toolkit.Mvvm.Input;
 using BPASmartClient.JXJFoodBigStation.Model;
 using BPASmartClient.JXJFoodBigStation.View;
 using System.Windows.Forms;
+using BPASmartClient.JXJFoodBigStation.Model.HK_PLC;
+using System.Reflection;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
@@ -19,101 +21,30 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
     {
         public HardwareStatusViewModel()
         {
-
-            for (int i = 6; i > 0; i--)
-            {
-                TopDeviceCurrentStatuses.Add(new DeviceCurrentStatus()
-                {
-                    DeviceName = i.ToString(),
-                    DeviceNum = i,
-                    RunStatus = true,
-                    Weight = new Random().Next(0, 100)
-                });
-            }
-            for (int i = 7; i < 13; i++)
+            foreach (PropertyInfo mi in typeof(StockBinName).GetProperties())
             {
-                BottomDeviceCurrentStatuses.Add(new DeviceCurrentStatus()
+                object ab = GVL_BigStation.stockBinName.GetType().GetProperty(mi.Name).GetValue(GVL_BigStation.stockBinName, null);
+                if (mi.Name=="RawMaterialName1" || mi.Name == "RawMaterialName2" || mi.Name == "RawMaterialName3" || mi.Name == "RawMaterialName4" || mi.Name == "RawMaterialName5" || mi.Name == "RawMaterialName6" || mi.Name == "RawMaterialName7")
                 {
-                    DeviceName = i.ToString(),
-                    DeviceNum = i,
-                    RunStatus = false,
-                    Weight = new Random().Next(0, 100)
-                });
-            }
-            StartCommand = new RelayCommand<string>((deviceName) => 
-            {
-                if (deviceName != null)
-                {
-                    var top = TopDeviceCurrentStatuses.FirstOrDefault(p => p.DeviceName == deviceName);
-                    if (top != null)
-                    {
-                        ActionManage.GetInstance.Send("StartTopDevice", deviceName);
-                    }
-                    var bottom = BottomDeviceCurrentStatuses.FirstOrDefault(p => p.DeviceName == deviceName);
-                    if (bottom != null)
+                    TopDeviceCurrentStatuses.Add(new DeviceCurrentStatus()
                     {
-                        ActionManage.GetInstance.Send("StartBottomDevice", deviceName);
-                    }
+                        DeviceName = ab.ToString(),
+                        DeviceNum = TopDeviceCurrentStatuses.Count + 1,
+                        RunStatus = true,
+                        Weight = new Random().Next(0, 100)
+                    });
                 }
-            });
-            StopCommand = new RelayCommand<string>((deviceName) => 
-            {
-                if (deviceName != null)
+                else
                 {
-                    var top = TopDeviceCurrentStatuses.FirstOrDefault(p => p.DeviceName == deviceName);
-                    if (top != null)
-                    {
-                        ActionManage.GetInstance.Send("StopTopDevice", deviceName);
-                    }
-                    var bottom = BottomDeviceCurrentStatuses.FirstOrDefault(p => p.DeviceName == deviceName);
-                    if (bottom != null)
+                    BottomDeviceCurrentStatuses.Add(new DeviceCurrentStatus()
                     {
-                        ActionManage.GetInstance.Send("StopBottomDevice", deviceName);
-                    }
+                        DeviceName = ab.ToString(),
+                        DeviceNum = BottomDeviceCurrentStatuses.Count + 8,
+                        RunStatus = false,
+                        Weight = new Random().Next(0, 100)
+                    });
                 }
-            });
-
-            UpdateRawMaterName = new RelayCommand<string>((deviceName) =>
-            {
-                ActionManage.GetInstance.CancelRegister("UpdateDeviceName");
-                ActionManage.GetInstance.Register(new Action<object>((res) =>
-                {
-                    if (res != null && res is string newName)
-                    {
-                        int cnt = Array.FindIndex(TopDeviceCurrentStatuses.ToArray(), p => p.DeviceName == deviceName);
-                        if (cnt >= 0)
-                        {
-                            int index = Array.FindIndex(BottomDeviceCurrentStatuses.ToArray(), p => p.DeviceName == newName);
-                            int index1 = Array.FindIndex(TopDeviceCurrentStatuses.ToArray(), p => p.DeviceName == newName);
-                            if (index == -1 && index1 == -1)
-                            {
-                                var obj = TopDeviceCurrentStatuses.FirstOrDefault(p => p.DeviceName == deviceName);
-                                obj.DeviceName = newName;
-                            }
-                            else
-                            {
-                                System.Windows.Forms.MessageBox.Show("设备名称与其他名称冲突", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                            }
-                        }
-                        else 
-                        {
-                            int index = Array.FindIndex(TopDeviceCurrentStatuses.ToArray(), p => p.DeviceName == newName);
-                            int index1 = Array.FindIndex(BottomDeviceCurrentStatuses.ToArray(), p => p.DeviceName == newName);
-                            if (index == -1 && index1 == -1)
-                            {
-                                var obj = BottomDeviceCurrentStatuses.FirstOrDefault(p => p.DeviceName == deviceName);
-                                obj.DeviceName = newName;
-                            }
-                            else
-                            {
-                                System.Windows.Forms.MessageBox.Show("设备名称与其他名称冲突", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                            }
-                        }
-                    }
-                }), "UpdateDeviceName");
-                ChangeDeviceNameView view = new ChangeDeviceNameView();
-                view.ShowDialog();
-            });
+            }
         }
         public ObservableCollection<DeviceCurrentStatus> TopDeviceCurrentStatuses { get; set; } = new ObservableCollection<DeviceCurrentStatus>();
         public ObservableCollection<DeviceCurrentStatus> BottomDeviceCurrentStatuses { get; set; } = new ObservableCollection<DeviceCurrentStatus>();
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
index 44d109e2..4b9201b8 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
@@ -21,25 +21,21 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
     {
         public ManualFlowViewModel()
         {
-            Tray1InPlace = new RelayCommand(() =>
+            TrayInPlace = new RelayCommand<object>((o) =>
             {
-                GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(1, true);
-            });
-            Tray2InPlace = new RelayCommand(() =>
-            {
-                GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(2, true);
-            });
-            Tray3InPlace = new RelayCommand(() =>
-            {
-                GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(3, true);
-            });
-            Tray4InPlace = new RelayCommand(() =>
-            {
-                GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(4, true);
+                if (o != null)
+                {
+                    byte loc = Convert.ToByte(o);
+                    GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(loc, true);
+                }
             });
-            Tray5InPlace = new RelayCommand(() =>
+            TrayLeave = new RelayCommand<object>((o) => 
             {
-                GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(5, true);
+                if (o!=null) 
+                {
+                    byte loc = Convert.ToByte(o);
+                    GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(loc, false);
+                }
             });
             ClearTrayInPlace = new RelayCommand(() =>
             {
@@ -82,11 +78,8 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                 StockBin14Name = GVL_BigStation.stockBinName.RawMaterialName14;
             }), "设备状态读取",true);
         }
-        public RelayCommand Tray1InPlace { get; set; }
-        public RelayCommand Tray2InPlace { get; set; }
-        public RelayCommand Tray3InPlace { get; set; }
-        public RelayCommand Tray4InPlace { get; set; }
-        public RelayCommand Tray5InPlace { get; set; }
+        public RelayCommand<object> TrayInPlace { get; set; }
+        public RelayCommand<object> TrayLeave { get; set; }
         public RelayCommand ClearTrayInPlace { get; set; }
         public RelayCommand ClearAllRecipe { get; set; }
         public static bool Heartbeat { get { return _mHeartbeat; } set { _mHeartbeat = value; OnStaticPropertyChanged(); } }
@@ -94,34 +87,35 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
 
         public string CancelRecipeCode { get { return _CancelRecipeCode; } set { _CancelRecipeCode = value; OnPropertyChanged(); } }
         public string _CancelRecipeCode { get; set; }
+
         public static string StockBin1Name { get { return _StockBin1Name; } set { _StockBin1Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin1Name { get; set; }
+        private static string _StockBin1Name { get; set; }
         public static string StockBin2Name { get { return _StockBin2Name; } set { _StockBin2Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin2Name { get; set; }
+        private static string _StockBin2Name { get; set; }
         public static string StockBin3Name { get { return _StockBin3Name; } set { _StockBin3Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin3Name { get; set; }
+        private static string _StockBin3Name { get; set; }
         public static string StockBin4Name { get { return _StockBin4Name; } set { _StockBin4Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin4Name { get; set; }
+        private static string _StockBin4Name { get; set; }
         public static string StockBin5Name { get { return _StockBin5Name; } set { _StockBin5Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin5Name { get; set; }
+        private static string _StockBin5Name { get; set; }
         public static string StockBin6Name { get { return _StockBin6Name; } set { _StockBin6Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin6Name { get; set; }
+        private static string _StockBin6Name { get; set; }
         public static string StockBin7Name { get { return _StockBin7Name; } set { _StockBin7Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin7Name { get; set; }
+        private static string _StockBin7Name { get; set; }
         public static string StockBin8Name { get { return _StockBin8Name; } set { _StockBin8Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin8Name { get; set; }
+        private static string _StockBin8Name { get; set; }
         public static string StockBin9Name { get { return _StockBin9Name; } set { _StockBin9Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin9Name { get; set; }
+        private static string _StockBin9Name { get; set; }
         public static string StockBin10Name { get { return _StockBin10Name; } set { _StockBin10Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin10Name { get; set; }
+        private static string _StockBin10Name { get; set; }
         public static string StockBin11Name { get { return _StockBin11Name; } set { _StockBin11Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin11Name { get; set; }
+        private static string _StockBin11Name { get; set; }
         public static string StockBin12Name { get { return _StockBin12Name; } set { _StockBin12Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin12Name { get; set; }
+        private static string _StockBin12Name { get; set; }
         public static string StockBin13Name { get { return _StockBin13Name; } set { _StockBin13Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin13Name { get; set; }
+        private static string _StockBin13Name { get; set; }
         public static string StockBin14Name { get { return _StockBin14Name; } set { _StockBin14Name = value; OnStaticPropertyChanged(); } }
-        public static string _StockBin14Name { get; set; }
+        private static string _StockBin14Name { get; set; }
         public RelayCommand CancelRecipeCommand { get; set; }
 
         public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs
index b1eaec92..f4e90230 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs
@@ -46,6 +46,27 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                 RecipeInfosView nrv = new RecipeInfosView();
                 nrv.ShowDialog();
             });
+
+            //RefreshRecipe = new RelayCommand(() =>
+            //{
+            //    foreach (var item in ProcessControl.GetInstance.RawMaterialsInfo)
+            //    {
+            //        RawMaterialNames.Add(item.RawMaterialName);
+            //    }
+
+            //    foreach (var item in Json<LocalRecipe>.Data.Recipes)
+            //    {
+            //        foreach (var tep in item.RawMaterial)
+            //        {
+            //            if (RawMaterialNames.Contains(tep.RawMaterialName))
+            //            {
+            //                int index = Array.FindIndex(ProcessControl.GetInstance.RawMaterialsInfo.ToArray(), p => p.RawMaterialName == tep.RawMaterialName);
+            //                tep.RawMaterialLocation = ProcessControl.GetInstance.RawMaterialsInfo.ElementAt(index).RawMaterialLocation;
+            //            }
+            //        }
+            //    }
+            //});
+
             //模拟配方
             //NewSimulateRecipe = new RelayCommand(() =>
             //{
@@ -104,9 +125,12 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
       //  public RelayCommand NewSimulateRecipe { get; set; }
         public RelayCommand ClearAllRecipe { get; set; }
         public RelayCommand NewRecipe { get; set; }
+        public RelayCommand RefreshRecipe { get; set; }
         public bool IsUseLocalRecipe { get { return _isUseLocalRecipe; } set { _isUseLocalRecipe = value;  OnPropertyChanged(); } }
         public bool _isUseLocalRecipe { get; set; }
         public RelayCommand<string> RemoveCommand { get; set; }
         public ObservableCollection<RecipeData> Recipes { get; set; } = new ObservableCollection<RecipeData>();
+
+        public ObservableCollection<string> RawMaterialNames { get; set; } = new ObservableCollection<string>();
     }
 }
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
index 4f9acbb1..0a6fc51b 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
@@ -3,6 +3,7 @@ using BPASmartClient.CustomResource.UserControls;
 using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.Helper;
 using BPASmartClient.JXJFoodBigStation.Model;
+using BPASmartClient.JXJFoodBigStation.Model.Siemens;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
@@ -44,9 +45,10 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                         var res = Recipes.FirstOrDefault(p => p.RecipeName == recipeName);
                         if (res != null)
                         {
-                            if (!ProcessControl.GetInstance.LocalRecipes.Contains(res))
+                            if (!Json<RemoteRecipe>.Data.Recipes.Contains(res))
                             {
-                                ProcessControl.GetInstance.LocalRecipes.Add(res);
+                                res.RecipesSource = RecipeSource.本地;
+                                Json<RemoteRecipe>.Data.Recipes.Add(res);
                                 MessageNotify.GetInstance.ShowRunLog($"手动下发配方:{recipeName}完成");
                                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"配方下发完成");
                             }
diff --git a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
index 70aafb9e..249d610c 100644
--- a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
@@ -78,21 +78,21 @@ namespace BPASmartClient.JXJFoodSmallStation
 
             #region 配方管理菜单
             ObservableCollection<SubMenumodel> RecipeManage = new ObservableCollection<SubMenumodel>();
-            RecipeManage.Add(new SubMenumodel()
-            {
-                SubMenuName = "味魔方配方管理",
-                SubMenuPermission = new Permission[] { Permission.管理员 },
-                AssemblyName = "BPASmartClient.JXJFoodSmallStation",
-                ToggleWindowPath = "View.RecipeSettingsView"
-            });
+            //RecipeManage.Add(new SubMenumodel()
+            //{
+            //    SubMenuName = "味魔方配方管理",
+            //    SubMenuPermission = new Permission[] { Permission.管理员 },
+            //    AssemblyName = "BPASmartClient.JXJFoodSmallStation",
+            //    ToggleWindowPath = "View.RecipeSettingsView"
+            //});
 
-            RecipeManage.Add(new SubMenumodel()
-            {
-                SubMenuName = "味魔方配方下发",
-                SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员 },
-                AssemblyName = "BPASmartClient.JXJFoodSmallStation",
-                ToggleWindowPath = "View.RecipeControlView"
-            });
+            //RecipeManage.Add(new SubMenumodel()
+            //{
+            //    SubMenuName = "味魔方配方下发",
+            //    SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员 },
+            //    AssemblyName = "BPASmartClient.JXJFoodSmallStation",
+            //    ToggleWindowPath = "View.RecipeControlView"
+            //});
             RecipeManage.Add(new SubMenumodel()
             {
                 SubMenuName = "本地配方管理",
@@ -120,7 +120,7 @@ namespace BPASmartClient.JXJFoodSmallStation
             ObservableCollection<SubMenumodel> ParSet = new ObservableCollection<SubMenumodel>();
             ParSet.Add(new SubMenumodel()
             {
-                SubMenuName = "柔性味魔方参数设置",
+                SubMenuName = "味魔方参数设置",
                 SubMenuPermission = new Permission[] { Permission.管理员 },
                 AssemblyName = "BPASmartClient.JXJFoodSmallStation",
                 ToggleWindowPath = "View.DeviceMaterialParView"
@@ -141,11 +141,19 @@ namespace BPASmartClient.JXJFoodSmallStation
             });
             ParSet.Add(new SubMenumodel()
             {
-                SubMenuName = "原料与料仓对应设置",
+                SubMenuName = "原料与料仓管理",
                 SubMenuPermission = new Permission[] { Permission.管理员 },
                 AssemblyName = "BPASmartClient.JXJFoodSmallStation",
                 ToggleWindowPath = "View.StockBinRawMaterialView"
             });
+            ParSet.Add(new SubMenumodel()
+            {
+                SubMenuName = "西门子物料管理",
+                SubMenuPermission = new Permission[] { Permission.管理员 },
+                AssemblyName = "BPASmartClient.JXJFoodSmallStation",
+                ToggleWindowPath = "View.BomOfMaterialView"
+            });
+            
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
             {
                 MainMenuIcon = "&#xe62d;",
@@ -252,12 +260,19 @@ namespace BPASmartClient.JXJFoodSmallStation
             });
             DeviceMonitor.Add(new SubMenumodel()
             {
-                SubMenuName = "变量监控",
+                SubMenuName = "Plc变量监控",
                 SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
                 AssemblyName = "BPASmartClient.JXJFoodSmallStation",
                 ToggleWindowPath = "View.PlcVarMonitorView"
             });
             DeviceMonitor.Add(new SubMenumodel()
+            {
+                SubMenuName = "流程变量监控",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.JXJFoodSmallStation",
+                ToggleWindowPath = "View.ProcessMonitorView"
+            });
+            DeviceMonitor.Add(new SubMenumodel()
             {
                 SubMenuName = "设备状态",
                 SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
diff --git a/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj b/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
index f14324ad..6c3c8aaa 100644
--- a/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
+++ b/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
@@ -26,6 +26,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Update="View\BomOfMaterialView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="View\RobotView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -38,6 +41,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Page Update="View\BomOfMaterialView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="View\ChangeDeviceNameView.xaml">
         <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
     </Page>
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterial.cs b/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterial.cs
new file mode 100644
index 00000000..56606358
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterial.cs
@@ -0,0 +1,21 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.Model.Bom
+{
+    public class BomMaterial:ObservableObject
+    {
+        public int Count { get { return _count; } set { _count = value; OnPropertyChanged(); } }
+        public int _count { get; set; }
+        
+        public string MaterialCode { get { return _materialCode; }set { _materialCode = value;OnPropertyChanged(); } }
+        private string _materialCode="";
+
+        public string MaterialName { get { return _materialName; } set { _materialName = value; OnPropertyChanged(); } }
+        private string _materialName="";
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterialData.cs b/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterialData.cs
new file mode 100644
index 00000000..d7cacf1b
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterialData.cs
@@ -0,0 +1,16 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.Model.Bom
+{
+    public class BomMaterialData
+    {
+        public ObservableCollection<BomMaterial> Materials { get; set; } = new ObservableCollection<BomMaterial>();
+
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcCommAttribute.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL/VarCommAttribute.cs
similarity index 78%
rename from BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcCommAttribute.cs
rename to BPASmartClient.JXJFoodSmallStation/Model/GVL/VarCommAttribute.cs
index 8d72460d..1e23d1d9 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcCommAttribute.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/GVL/VarCommAttribute.cs
@@ -7,9 +7,9 @@ using System.Threading.Tasks;
 namespace BPASmartClient.JXJFoodSmallStation.Model.GVL
 {
     [AttributeUsage(AttributeTargets.Property)]
-    public sealed class PlcCommAttribute:Attribute
+    public sealed class VarCommAttribute:Attribute
     {
-        public PlcCommAttribute(string address,string des) 
+        public VarCommAttribute(string address,string des) 
         {
             Address = address;
             Describe = des;
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
index 3313406a..a35d57c1 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
@@ -1,4 +1,5 @@
-using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
+using BPASmartClient.JXJFoodSmallStation.Model.GVL;
+using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
 using BPASmartClient.JXJFoodSmallStation.Model.Siemens;
 using System;
 using System.Collections.Concurrent;
@@ -16,181 +17,270 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         public static GVL_SmallStation GetInstance => SmallStation ?? (SmallStation = new GVL_SmallStation());
         private GVL_SmallStation() { }
 
-        public static PlcReadAddressDB3 plcReadDataDB3 { get; set; } = new PlcReadAddressDB3();
+        public PlcReadAddressDB3 plcReadDataDB3 { get; set; } = new PlcReadAddressDB3();
+        /// <summary>
+        /// 配料站料仓数目
+        /// </summary>
+        public const int Max_DosingSotckBinNum = 15;
+        /// <summary>
+        /// 风送料仓数目
+        /// </summary>
+        public const int Max_PowderSotckBinNum = 5;
 
+
+        [VarComm("Global", "订单取消")]
         /// <summary>
         /// 订单取消
         /// </summary>
-        public static bool Order_Cancel { get; set; }
+        public bool NotUseSmallDosing { get; set; }
+
+
+        [VarComm("Global", "订单取消")]
         /// <summary>
-        /// 取消订单的编号
+        /// 订单取消
         /// </summary>
-        public static string Order_CancelRecipeCode { get; set; } = "";
+        public bool Order_Cancel { get; set; }
+
+        [VarComm("Global", "订单取消的配方编号")]
         /// <summary>
-        /// 托盘1托盘到位 逻辑完成
+        /// 订单取消的配方编号
         /// </summary>
-        public static int Tray1LogicFinish { get; set; } = 0;
+        public string Order_CancelRecipeCode { get; set; } = "";
+
+
+        [VarComm("Global", "柔性配料料仓配料情况")]
         /// <summary>
-        /// 托盘2托盘到位 逻辑完成
+        /// 料仓配料情况
         /// </summary>
-        public static int Tray2LogicFinish { get; set; } = 0;
+        public ushort StockBinDosing { get; set; } = 0;
+
+        [VarComm("Global", "托盘1托盘到位情况0:未到位,1=AGV到位,2=托盘有货架,3=AGV取托盘完成")]
         /// <summary>
-        /// 托盘1有货架
+        /// 托盘1托盘到位情况
         /// </summary>
-        public static bool Station1HaveTray { get; set; }
+        public int Tray1LogicFinish { get; set; } = 0;
+
+        [VarComm("Global", "托盘2托盘到位情况0:未到位,1=AGV到位,2=托盘有货架,3=AGV取托盘完成")]
         /// <summary>
-        /// 托盘2有货架
+        /// 托盘2托盘到位 逻辑完成
+        /// </summary>
+        public int Tray2LogicFinish { get; set; } = 0;
+
+        [VarComm("Global", "托盘1有货架")]
+        /// <summary>
+        /// 托盘1有货架
         /// </summary>
-        public static bool Station2HaveTray { get; set; }
+        public bool Station1HaveTray { get; set; }
+
+
+        [VarComm("Global", "托盘2有货架")]
         /// <summary>
         /// 托盘2有货架
         /// </summary>
-        public static int nStep { get; set; }
+        public bool Station2HaveTray { get; set; }
+
+
+        [VarComm("Global", "托盘1传感器信号")]
         /// <summary>
         /// 托盘1传感器信号
         /// </summary>
-        public static bool Station1Sensor { get; set; }
+        public bool Station1Sensor { get; set; }
+
+        [VarComm("Global", "托盘2传感器信号")]
         /// <summary>
         /// 托盘2传感器信号
         /// </summary>
-        public static bool Station2Sensor { get; set; }
+        public bool Station2Sensor { get; set; }
+
+
+        [VarComm("Global", "托盘1气缸信号")]
         /// <summary>
         /// 托盘1气缸信号
         /// </summary>
-        public static bool Station1Cylinder { get; set; }
+        public bool Station1Cylinder { get; set; }
+
+        [VarComm("Global", "托盘2气缸信号")]
         /// <summary>
         /// 托盘2气缸信号
         /// </summary>
-        public static bool Station2Cylinder { get; set; }
+        public bool Station2Cylinder { get; set; }
+
+        [VarComm("Global", "AGV放托盘1完成")]
         /// <summary>
         /// AGV放托盘1完成
         /// </summary>
-        public static bool AGV_PutTray1Finish { get; set; }
+        public bool AGV_PutTray1Finish { get; set; }
+
+        [VarComm("Global", "AGV取托盘1完成")]
         /// <summary>
         /// AGV取托盘1完成
         /// </summary>
-        public static bool AGV_GetTray1Finish { get; set; }
+        public bool AGV_GetTray1Finish { get; set; }
 
+        [VarComm("Global", "AGV放托盘2完成")]
+        /// <summary>
+        /// AGV放托盘1完成
+        /// </summary>
+        public bool AGV_PutTray2Finish { get; set; }
 
-        public static bool AGV_PutTray2Finish { get; set; }
-        public static bool AGV_GetTray2Finish { get; set; }
+        [VarComm("Global", "AGV取托盘2完成")]
+        /// <summary>
+        /// AGV取托盘2完成
+        /// </summary>
+        public bool AGV_GetTray2Finish { get; set; }
 
-        public static bool CylinderReset { get; set; }
+        [VarComm("Global", "托盘1气缸复位")]
         /// <summary>
-        /// 配料站料仓数目
+        /// 托盘1气缸复位
         /// </summary>
-        public const int Max_DosingSotckBinNum = 15;
+        public bool CylinderReset { get; set; }
+
+        [VarComm("Global", "发送给plc的心跳")]
         /// <summary>
-        /// 风送料仓数目
+        /// 发送给plc的心跳
         /// </summary>
-        public const int Max_PowderSotckBinNum = 5;
         public bool HeartBeatToPlc { get; set; } = false;
+
+        [VarComm("Global", "来自plc的心跳")]
+        /// <summary>
+        /// 来自plc的心跳
+        /// </summary>
         public bool HeartBeatFromPlc { get; set; } = false;
+
+        [VarComm("Global", "是否允许西门子下发配方")]
         /// <summary>
         /// 是否允许西门子下发配方
         /// </summary>
-        public static bool IsAllowSiemensSendRecipe { get; set; } = false;
+        public bool IsAllowSiemensSendRecipe { get; set; } = false;
+
+        [VarComm("Global", "西门子下发配方状态0=等待下发配方 1=请求下发配方 2=接收配方 3=配方接收配方完成 4=请求配料 5=西门子确认开始配料 6=西门子确认开始配料信号复位")]
         /// <summary>
         /// 西门子下发配方状态 0:等待下发配方 1：请求下发配方 2：上位机接收配方 3：配方接收配方完成 4：上位机向西门子请求配料 5：西门子确认开始配料 6:西门子确认开始配料 信号复位
         /// </summary>
-        public static int SiemensSendRecipeStatus { get; set; } = 0;
+        public int SiemensSendRecipeStatus { get; set; } = 0;
+    
+        [VarComm("Global", "配方1下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料")]
         /// <summary>
-        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方
+        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料
         /// </summary>
         public int RecipeStatusIDTray1 { get; set; } = 0;
 
-        /// <summary>
-        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方
-        /// </summary>
-        public int RecipeStatusIDTray2 { get; set; } = 0;
 
+        [VarComm("Global", "配方2下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料")]
         /// <summary>
-        /// Tray1的柔性味魔方配料标志（下发配方时，若柔性味魔方的状态=3，复位该状态）
-        /// </summary>
-        public bool DosingTray1 { get; set; } = false;//默认为true,初始时，判断柔性味魔方的状态。
-        /// <summary>
-        /// Tray2的柔性味魔方配料标志
+        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料
         /// </summary>
-        public bool DosingTray2 { get; set; } = false;
+        public int RecipeStatusIDTray2 { get; set; } = 0;
 
-        public int DosingTray1Loc { get; set; } = 0;
-        public int DosingTray2Loc { get; set; } = 0;
+        [VarComm("Global", "当前配方正在配料位置")]
         /// <summary>
         /// 当前料仓的位置
         /// </summary>
         public int StockInIsWork { get; set; } = 0;
 
+
+        [VarComm("Global", "是否使用粉仓配料")]
         /// <summary>
-        /// 记录AGV进站送货的指令顺序
-        /// </summary>
-        public int AgvDeliveryPosition { get; set; }= 0;
-        /// <summary>
-        /// 记录AGV进站取货的指令顺序
+        /// 是否使用粉仓配料
         /// </summary>
-        public int AgvPickUpPosition { get; set; } = 0;
+        public bool RequestOrder { get; set; } = false;
 
+
+        [VarComm("Global", "是否使用粉仓配料")]
         /// <summary>
-        /// 是否使用粉仓
+        /// 是否使用粉仓配料
         /// </summary>
         public bool IsUseWindSend { get; set; } = false;
+
+        [VarComm("Global", "粉仓正在配料")]
         /// <summary>
-        /// 风送配料完成标志
+        /// 粉仓正在配料
         /// </summary>
-        public bool WindSendDosingFinish { get; set; } = false;
+        public bool WindSendDosing { get; set; } = false;
+
 
         /// <summary>
-        /// 顶升气缸的信号
+        /// 所有气缸的信号
         /// </summary>
-        public bool[] Cylinder_JackInfo = new bool[15];
+        public bool[] Cylinder_JackInfo { get; set; } = new bool[30];
 
         #region 本地模拟配方
+
+        [VarComm("Global", "是否使用本地模拟配方")]
         /// <summary>
         /// 是否使用本地模拟配方
         /// </summary>
         public bool IsUseLocalRecipe { get; set; }
+
         /// <summary>
-        /// 是否使用本地模拟订单+风送配方
+        /// 配料时间
         /// </summary>
-        public bool IsUseWindSendDosing { get; set; }
-        public static int test1 = 1;
         public DateTime time1;
+
+        /// <summary>
+        /// 原料的名称和原料编号对应，Mes提供的信息
+        /// </summary>
+        public ConcurrentDictionary<string, string> RawMaterialsNameCode { get; set; } = new ConcurrentDictionary<string, string>();
+        
+        [VarComm("Global", "风送是否允许AGV到工站")]
         /// <summary>
         /// 风送是否允许AGV到工站
         /// </summary>
-        public static bool WindSendAllowAGVPutGet { get; set; } = false;
+        public bool WindSendAllowAGVPutGet { get; set; } = false;
+
+        [VarComm("Global", "粉料仓配料完成")]
         /// <summary>
         /// 粉料仓配料完成
         /// </summary>
-        public static bool WindSendDosingComple { get; set; } = false;
+        public bool WindSendDosingComple { get; set; } = false;
+
+        [VarComm("Global", "PLC的系统模式 DB44.DBX0.1")]
         /// <summary>
-        /// 系统模式
+        /// PLC的系统模式 DB44.DBX0.1
         /// </summary>
-        public static bool SystemMode { get; set; } = false;
+        public bool PlcSystemMode { get; set; } = false;
+
+        [VarComm("Global", "PLC的系统模式 DB44.DBX0.1")]
         /// <summary>
-        /// 系统状态
+        /// 不使用15个料仓报警
         /// </summary>
-        public static bool SystemStatus { get; set; } = false;
+        public bool DisEnableStockBinAlarm { get; set; } = false;
+
+        [VarComm("Global", "PLC的系统自动启停 DB44.DBX0.0")]
         /// <summary>
-        /// 系统运行状态
+        /// PLC的系统自动启停 DB44.DBX0.0
         /// </summary>
-        public static bool SystemRunStatus { get; set; } = false;
+        public bool PlcSystemIsAutoRun { get; set; } = false;
+
+        [VarComm("Global", "PLC的系统自动暂停/开始 DB44.DBX0.2")]
         /// <summary>
-        /// 系统运行状态
+        /// PLC的系统自动暂停/开始 DB44.DBX0.2
         /// </summary>
-        public static int Time { get; set; } = 1000;
+        public bool PlcSystemIsPause { get; set; } = false;
+
+        [VarComm("Global", "延迟采集料仓的配料完成重量")]
+        /// <summary>
+        /// 延迟采集料仓的配料完成重量
+        /// </summary>
+        public int Time { get; set; } = 1000;
+
+        [VarComm("Global", "取消订单的步骤号")]
         /// <summary>
         /// 取消订单的步骤： 1-9：配料过程中配方1取消配方 10-19：配料过程中配方2取消配方 20-29：下发订单的过程中取消订单(订单未到达上位机)  30-39：下发订单的过程中取消订单(订单未到达PLC)
         /// </summary>
-        public static int OrderCancelStep = 0;
+        public int OrderCancelStep { get; set; } = 0;
 
+        [VarComm("Global", "机器人的状态")]
         /// <summary>
         /// 机器人的状态
         /// </summary>
-        public static ushort RobotStatus = 0;
+        public ushort RobotStatus { get; set; } = 0;
+
+        [VarComm("Global", "机器人的程序号")]
         /// <summary>
-        /// 机器人的状态
+        /// 机器人的程序号
         /// </summary>
-        public static byte RobotProgramNum = 0;
+        public byte RobotProgramNum { get; set; } = 0;
         #endregion
     }
     public enum IssueRecipeCondition
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/DataComm.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/DataComm.cs
new file mode 100644
index 00000000..f47bd894
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/DataComm.cs
@@ -0,0 +1,41 @@
+using BPASmartClient.Helper;
+using BPASmartClient.Modbus;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
+{
+    public class DataComm
+    {
+        public volatile static DataComm Instance;
+        public static DataComm GetInstance => Instance ?? (new DataComm());
+        public DataComm() { }
+        /// <summary>
+        /// 是否允许配料
+        /// </summary>
+        public bool IsAllowDosing { get { return _mIsAllowDosing; } set { _mIsAllowDosing = value; } }
+        private bool _mIsAllowDosing;
+
+        public bool DosingFinishToPLC { get { return _mDosingFinishToPLC; } set { _mDosingFinishToPLC = value; } }
+        private bool _mDosingFinishToPLC;
+
+        private int _mStockBinLocationToPLC;
+        public int StockBinLocationToPLC { get { return _mStockBinLocationToPLC; } set { _mStockBinLocationToPLC = value; } }
+
+        public bool StatusSignToBPA { get { return _mStatusSignToBPA; } set { _mStatusSignToBPA = value; } }
+        private bool _mStatusSignToBPA;
+
+        private int _mStockBinLocationToBPA;
+        public int StockBinLocationToBPA { get { return _mStockBinLocationToBPA; } set { _mStockBinLocationToBPA = value; } }
+
+        private int _mBarrelNumToPLC;
+        public int BarrelNumToPLC { get { return _mBarrelNumToPLC; } set { _mBarrelNumToPLC = value; } }
+       
+        /*public ConcurrentDictionary<int, StockBinLocations> DeviceLists = new ConcurrentDictionary<int, StockBinLocations>();*/
+    }
+   
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
index 6ccc889a..f03fda0e 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
@@ -30,9 +30,10 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
                     var res1 = this.HK_PLC_S7.ReadClass<PlcReadAddressDB3>(3);
                     if (res1 != null && res1 is PlcReadAddressDB3 data1)
                     {
-                        GVL_SmallStation.plcReadDataDB3 = data1;
+                        GVL_SmallStation.GetInstance.plcReadDataDB3 = data1;
                     }
                 }
+                Thread.Sleep(10);
             }),"海科PLC设备状态",true);
         }
         ///// <summary>
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceWrite.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceWrite.cs
new file mode 100644
index 00000000..5ca62ab8
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceWrite.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
+{
+    public class HKDeviceWrite
+    {
+        public string Address { get; set; }
+        public PlcVarType PlcVarType { get; set; } = PlcVarType.Bool;
+        public object Value { get; set; }
+    }
+    public enum PlcVarType 
+    {
+        Bool,
+        Byte,
+        Int,
+        Dint,
+        Real,
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
index 3f025d9e..26f141b4 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
@@ -9,170 +9,170 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
 {
     public class PlcReadAddressDB3
     {
-        [PlcComm("DB3.DBX0.0","心跳")]
+        [VarComm("DB3.DBX0.0","心跳")]
         public bool HeartBeat { get; set; }
-        [PlcComm("DB3.DBX0.1", "备用1")]
+        [VarComm("DB3.DBX0.1", "备用1")]
         public bool Standby1 { get; set; }
-        [PlcComm("DB3.DBX0.2", "备用2")]
+        [VarComm("DB3.DBX0.2", "备用2")]
         public bool Standby2 { get; set; }
-        [PlcComm("DB3.DBX0.3", "备用3")]
+        [VarComm("DB3.DBX0.3", "备用3")]
         public bool Standby3 { get; set; }
-        [PlcComm("DB3.DBX0.4", "备用4")]
+        [VarComm("DB3.DBX0.4", "备用4")]
         public bool Standby4 { get; set; }
-        [PlcComm("DB3.DBX0.5", "备用5")]
+        [VarComm("DB3.DBX0.5", "备用5")]
         public bool Standby5 { get; set; }
-        [PlcComm("DB3.DBX0.6", "备用6")]
+        [VarComm("DB3.DBX0.6", "备用6")]
         public bool Standby6 { get; set; }
-        [PlcComm("DB3.DBX0.7", "工站1有托盘")]
+        [VarComm("DB3.DBX0.7", "工站1有托盘")]
         public bool WorkStation1HaveTray { get; set; }
 
-        [PlcComm("DB3.DBX1.0", "工站2有托盘")]
+        [VarComm("DB3.DBX1.0", "工站2有托盘")]
         public bool WorkStation2HaveTray { get; set; }
-        [PlcComm("DB3.DBX1.1", "工站1配料完成")]
+        [VarComm("DB3.DBX1.1", "工站1配料完成")]
         public bool WorkStation1DosingComplete { get; set; }
-        [PlcComm("DB3.DBX1.2", "工站2配料完成")]
+        [VarComm("DB3.DBX1.2", "工站2配料完成")]
         public bool WorkStation2DosingComplete { get; set; }
-        [PlcComm("DB3.DBX1.3", "工站1接收配方完成")]
+        [VarComm("DB3.DBX1.3", "工站1接收配方完成")]
         public bool WorkStation1ReceviceRecipeComplete { get; set; }
-        [PlcComm("DB3.DBX1.4", "工站2接收配方完成")]
+        [VarComm("DB3.DBX1.4", "工站2接收配方完成")]
         public bool WorkStation2ReceviceRecipeComplete { get; set; }
-        [PlcComm("DB3.DBX1.5", "工站1气缸报警")]
+        [VarComm("DB3.DBX1.5", "工站1气缸报警")]
         public bool WorkStation1CylinderAlarm { get; set; }
-        [PlcComm("DB3.DBX1.6", "工站2气缸报警")]
+        [VarComm("DB3.DBX1.6", "工站2气缸报警")]
         public bool WorkStation2CylinderAlarm { get; set; }
-        [PlcComm("DB3.DBX1.7", "允许配方1下发配方")]
+        [VarComm("DB3.DBX1.7", "允许配方1下发配方")]
         public bool AllowRecipe1Issue { get; set; }
 
-        [PlcComm("DB3.DBX2.0", "允许配方2下发配方")]
+        [VarComm("DB3.DBX2.0", "允许配方2下发配方")]
         public bool AllowRecipe2Issue { get; set; }
-        [PlcComm("DB3.DBX2.1", "工站1传感器信号")]
+        [VarComm("DB3.DBX2.1", "工站1传感器信号")]
         public bool WorkStation1Sensor { get; set; }
-        [PlcComm("DB3.DBX2.2", "工站2传感器信号")]
+        [VarComm("DB3.DBX2.2", "工站2传感器信号")]
         public bool WorkStation2Sensor { get; set; }
-        [PlcComm("DB3.DBX2.3", "工站1气缸信号，false=伸出")]
+        [VarComm("DB3.DBX2.3", "工站1气缸信号，false=伸出")]
         public bool WorkStation1Cylinder { get; set; }
-        [PlcComm("DB3.DBX2.4", "工站2气缸信号，false=伸出")]
+        [VarComm("DB3.DBX2.4", "工站2气缸信号，false=伸出")]
         public bool WorkStation2Cylinder { get; set; }
-        [PlcComm("DB3.DBX2.5", "工站1取消订单")]
+        [VarComm("DB3.DBX2.5", "工站1取消订单")]
         public bool WorkStation1OrderCancel { get; set; }
-        [PlcComm("DB3.DBX2.6", "工站2取消订单")]
+        [VarComm("DB3.DBX2.6", "工站2取消订单")]
         public bool WorkStation2OrderCancel { get; set; }
-        [PlcComm("DB3.DBX2.7", "备用7")]
+        [VarComm("DB3.DBX2.7", "备用7")]
         public bool Standby7 { get; set; }
-        [PlcComm("DB3.DBB3", "备用")]
+        [VarComm("DB3.DBB3", "备用")]
         public byte Standby81 { get; set; }
-        [PlcComm("DB3.DBB4", "备用")]
+        [VarComm("DB3.DBB4", "备用")]
         public byte Standby82 { get; set; }
-        [PlcComm("DB3.DBB5", "备用")]
+        [VarComm("DB3.DBB5", "备用")]
         public byte Standby83 { get; set; }
-        [PlcComm("DB3.DBW6", "备用")]
+        [VarComm("DB3.DBW6", "备用")]
         public int Standby9 { get; set; }
 
-        [PlcComm("DB3.DBD10", "工站1_1号桶的位置")]
+        [VarComm("DB3.DBD10", "工站1_1号桶的位置")]
         public float WorkStation1Barrel1Pos { get; set; }
-        [PlcComm("DB3.DBD14", "工站1_2号桶的位置")]
+        [VarComm("DB3.DBD14", "工站1_2号桶的位置")]
         public float WorkStation1Barrel2Pos { get; set; }
-        [PlcComm("DB3.DBD18", "工站1_3号桶的位置")]
+        [VarComm("DB3.DBD18", "工站1_3号桶的位置")]
         public float WorkStation1Barrel3Pos { get; set; }
-        [PlcComm("DB3.DBD22", "工站1_4号桶的位置")]
+        [VarComm("DB3.DBD22", "工站1_4号桶的位置")]
         public float WorkStation1Barrel4Pos { get; set; }
-        [PlcComm("DB3.DBD26", "工站2_1号桶的位置")]
+        [VarComm("DB3.DBD26", "工站2_1号桶的位置")]
         public float WorkStation2Barrel1Pos { get; set; }
-        [PlcComm("DB3.DBD30", "工站2_2号桶的位置")]
+        [VarComm("DB3.DBD30", "工站2_2号桶的位置")]
         public float WorkStation2Barrel2Pos { get; set; }
-        [PlcComm("DB3.DBD34", "工站2_3号桶的位置")]
+        [VarComm("DB3.DBD34", "工站2_3号桶的位置")]
         public float WorkStation2Barrel3Pos { get; set; }
-        [PlcComm("DB3.DBD38", "工站2_4号桶的位置")]
+        [VarComm("DB3.DBD38", "工站2_4号桶的位置")]
         public float WorkStation2Barrel4Pos { get; set; }
 
-        [PlcComm("DB3.DBD42", "备用")]
+        [VarComm("DB3.DBD42", "备用")]
         public int StandBy42 { get; set; }
-        [PlcComm("DB3.DBD46", "备用")]
+        [VarComm("DB3.DBD46", "备用")]
         public int StandBy46 { get; set; }
 
-        [PlcComm("DB3.DBX50.0", "工站1_1号桶允许配料")]
+        [VarComm("DB3.DBX50.0", "工站1_1号桶允许配料")]
         public bool WorkStation1Barrel1AllowDosing { get; set; }
-        [PlcComm("DB3.DB50.1", "工站1_2号桶允许配料")]
+        [VarComm("DB3.DB50.1", "工站1_2号桶允许配料")]
         public bool WorkStation1Barrel2AllowDosing { get; set; }
-        [PlcComm("DB3.DB50.2", "工站1_3号桶允许配料")]
+        [VarComm("DB3.DB50.2", "工站1_3号桶允许配料")]
         public bool WorkStation1Barrel3AllowDosing { get; set; }
-        [PlcComm("DB3.DB50.3", "工站1_4号桶允许配料")]
+        [VarComm("DB3.DB50.3", "工站1_4号桶允许配料")]
         public bool WorkStation1Barrel4AllowDosing { get; set; }
-        [PlcComm("DB3.DB50.4", "工站2_1号桶允许配料")]
+        [VarComm("DB3.DB50.4", "工站2_1号桶允许配料")]
         public bool WorkStation2Barrel1AllowDosing { get; set; }
-        [PlcComm("DB3.DB50.5", "工站2_2号桶允许配料")]
+        [VarComm("DB3.DB50.5", "工站2_2号桶允许配料")]
         public bool WorkStation2Barrel2AllowDosing { get; set; }
-        [PlcComm("DB3.DB50.6", "工站2_3号桶允许配料")]
+        [VarComm("DB3.DB50.6", "工站2_3号桶允许配料")]
         public bool WorkStation2Barrel3AllowDosing { get; set; }
-        [PlcComm("DB3.DB50.7", "工站2_4号桶允许配料")]
+        [VarComm("DB3.DB50.7", "工站2_4号桶允许配料")]
         public bool WorkStation2Barrel4AllowDosing { get; set; }
 
-        [PlcComm("DB3.DBD52", "备用")]
+        [VarComm("DB3.DBD52", "备用")]
         public int Standby15 { get; set; }
-        [PlcComm("DB3.DBD56", "备用")]
+        [VarComm("DB3.DBD56", "备用")]
         public int Standby16 { get; set; }
-        [PlcComm("DB3.DBD60", "备用")]
+        [VarComm("DB3.DBD60", "备用")]
         public int Standby17 { get; set; }
-        [PlcComm("DB3.DBD64", "备用")]
+        [VarComm("DB3.DBD64", "备用")]
         public int Standby18 { get; set; }
-        [PlcComm("DB3.DBD68", "备用")]
+        [VarComm("DB3.DBD68", "备用")]
         public int Standby19 { get; set; }
-        [PlcComm("DB3.DBD72", "备用")]
+        [VarComm("DB3.DBD72", "备用")]
         public int Standby20 { get; set; }
-        [PlcComm("DB3.DBD76", "备用")]
+        [VarComm("DB3.DBD76", "备用")]
         public int Standby21 { get; set; }
-        [PlcComm("DB3.DBD80", "备用")]
+        [VarComm("DB3.DBD80", "备用")]
         public int Standby22 { get; set; }
-        [PlcComm("DB3.DBD84", "备用")]
+        [VarComm("DB3.DBD84", "备用")]
         public int Standby23 { get; set; }
-        [PlcComm("DB3.DBD88", "备用")]
+        [VarComm("DB3.DBD88", "备用")]
         public int Standby24 { get; set; }
-        [PlcComm("DB3.DBD92", "备用")]
+        [VarComm("DB3.DBD92", "备用")]
         public int Standby25 { get; set; }
-        [PlcComm("DB3.DBD96", "备用")]
+        [VarComm("DB3.DBD96", "备用")]
         public int Standby26 { get; set; }
 
-        [PlcComm("DB3.DBX100.0", "机器人运行模式")]
+        [VarComm("DB3.DBX100.0", "机器人运行模式")]
         public bool RobotRunMode { get; set; }
-        [PlcComm("DB3.DBX100.1", "机器人自动运行")]
+        [VarComm("DB3.DBX100.1", "机器人自动运行")]
         public bool RobotAutoRun { get; set; }
-        [PlcComm("DB3.DBX100.2", "机器人停止")]
+        [VarComm("DB3.DBX100.2", "机器人停止")]
         public bool RobotStop { get; set; }
-        [PlcComm("DB3.DBX100.3", "机器人运行")]
+        [VarComm("DB3.DBX100.3", "机器人运行")]
         public bool RobotRun { get; set; }
-        [PlcComm("DB3.DBX100.4", "机器人运行报警")]
+        [VarComm("DB3.DBX100.4", "机器人运行报警")]
         public bool RobotRunAlarm { get; set; }
-        [PlcComm("DB3.DBX100.5", "机器人在原点")]
+        [VarComm("DB3.DBX100.5", "机器人在原点")]
         public bool RobotInHomed { get; set; }
-        [PlcComm("DB3.DBX100.6", "机器人备用")]
+        [VarComm("DB3.DBX100.6", "机器人备用")]
         public bool Standby30 { get; set; }
-        [PlcComm("DB3.DBX100.7", "机器人取空桶完成")]
+        [VarComm("DB3.DBX100.7", "机器人取空桶完成")]
         public bool RobotGetEmptyBarrelComplete { get; set; }
 
-        [PlcComm("DB3.DBX101.0", "机器人放空桶完成")]
+        [VarComm("DB3.DBX101.0", "机器人放空桶完成")]
         public bool RobotPutEmptyBarrelComplete { get; set; }
-        [PlcComm("DB3.DBX101.1", "机器人取满桶完成")]
+        [VarComm("DB3.DBX101.1", "机器人取满桶完成")]
         public bool RobotGetFullBarrelComplete { get; set; }
-        [PlcComm("DB3.DBX101.2", "机器人放满桶完成")]
+        [VarComm("DB3.DBX101.2", "机器人放满桶完成")]
         public bool RobotPutFullBarrelComplete { get; set; }
-        [PlcComm("DB3.DBX101.3", "备用")]
+        [VarComm("DB3.DBX101.3", "备用")]
         public bool Standby31 { get; set; }
-        [PlcComm("DB3.DBX101.4", "备用")]
+        [VarComm("DB3.DBX101.4", "备用")]
         public bool Standby32 { get; set; }
-        [PlcComm("DB3.DBX101.5", "备用")]
+        [VarComm("DB3.DBX101.5", "备用")]
         public bool Standby33 { get; set; }
-        [PlcComm("DB3.DBX101.6", "备用")]
+        [VarComm("DB3.DBX101.6", "备用")]
         public bool Standby34 { get; set; }
-        [PlcComm("DB3.DBX101.7", "备用")]
+        [VarComm("DB3.DBX101.7", "备用")]
         public bool Standby35 { get; set; }
 
-        [PlcComm("DB3.DBB102", "机器人运行的程序号")]
+        [VarComm("DB3.DBB102", "机器人运行的程序号")]
         public byte RobotProgramNum { get; set; }
-        [PlcComm("DB3.DBB103", "备用")]
+        [VarComm("DB3.DBB103", "备用")]
         public byte Standby36 { get; set; }
-        [PlcComm("DB3.DBB104", "备用")]
+        [VarComm("DB3.DBB104", "备用")]
         public byte Standby37 { get; set; }
-        [PlcComm("DB3.DBB105", "备用")]
+        [VarComm("DB3.DBB105", "备用")]
         public byte Standby38 { get; set; }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcWriteAddressDB7.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcWriteAddressDB7.cs
new file mode 100644
index 00000000..e083e60c
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcWriteAddressDB7.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
+{
+    public class PlcWriteAddressDB7
+    {
+        
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index ae5dbfd4..258093e6 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -43,6 +43,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         public SiemensDeviceStatus SiemensDevice = new SiemensDeviceStatus();
         public HKDeviceStatus HKDevice = new HKDeviceStatus();
         public WindSendDeviceStatus WindSendDevice = new WindSendDeviceStatus();
+
+        public ObservableCollection<PlcInfos> CommData { get; set; } = new ObservableCollection<PlcInfos>();
+        public ObservableCollection<PlcInfos> ProcessVar { get; set; } = new ObservableCollection<PlcInfos>();
         XL_Finish_DB RecipeFinishInfo = new XL_Finish_DB();
         /// <summary>
         /// 风送PLC的DB块
@@ -52,6 +55,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// 接收原料数据
         /// </summary>
         public RecipeRawMaterial RawMaterial;
+        public DateTime StockBinAlarmTime = DateTime.Now;
 
         public string? HK_PLC_IP = ConfigurationManager.AppSettings["HKPlc_IP"];
         public string? Siemens_PLC_IP = ConfigurationManager.AppSettings["Siemens_IP"];
@@ -59,8 +63,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
 
         public void Init()
         {
-            plcVarMonitor();
+            PlcVarMonitor();
             StockBinNameWithPos();
+            RawMaterialNameWithCode();
             RegisterInit();
             DeviceConnect();
             //Json<RemoteRecipeDataColl>.Data.Recipes = TestData.GetInstance.Recipes;//添加测试数据
@@ -71,14 +76,24 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     GVL_SmallStation.GetInstance.HeartBeatToPlc = !GVL_SmallStation.GetInstance.HeartBeatToPlc;
                     HKDevice.HK_PLC_S7.Write("DB4.DBX0.0", GVL_SmallStation.GetInstance.HeartBeatToPlc);
                     GVL_SmallStation.GetInstance.HeartBeatFromPlc = HKDevice.HK_PLC_S7.Read<bool>("DB45.DBX0.0");
+                    if (DeviceInquire.GetInstance.devices.Count < 15 && HKDevice.IsConnected && Json<RemoteRecipeDataColl>.Data.Recipes.Count > 0 && GVL_SmallStation.GetInstance.DisEnableStockBinAlarm == false && DateTime.Now.Subtract(StockBinAlarmTime).TotalSeconds >= 60) 
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
+                        App.Current.Dispatcher.Invoke(() =>
+                        {
+                            MessageNotify.GetInstance.ShowDialog($"未读取到15个柔性味魔方料仓", DialogType.Error);
+                            StockBinAlarmTime = DateTime.Now;
+                        });
+                        HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
+                    }
                 }
                 Thread.Sleep(200);
             }), "海科plc通信心跳", true);
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                if (GVL_SmallStation.Order_Cancel)
+                if (GVL_SmallStation.GetInstance.Order_Cancel)
                 {
-                    CancelOrder();//订单取消
+                    CancelOrder();//订单取消,不执行配方流程
                 }
                 else
                 {
@@ -89,20 +104,30 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             }), "小料站流程控制", true);
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                Real_Time_Data();
+                RealTimeData();
+                foreach (var item in Json<DevicePar>.Data.windSendRawMaterial)
+                {
+                    if (GVL_SmallStation.GetInstance.RawMaterialsNameCode.ContainsKey(item.RawMaterialName))
+                    {
+                        item.RawMaterialChineseName = GVL_SmallStation.GetInstance.RawMaterialsNameCode[item.RawMaterialName];
+                    }
+                    else
+                    {
+                        item.RawMaterialChineseName = "";
+                    }
+                }
                 Thread.Sleep(10);
-            }), "西门子PLC和小料站PLC的实时数据", true);
+            }), "西门子PLC和小料站PLC的实时数据交互流程", true);
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                if (HKDevice.IsConnected)
-                {
-                    ManualOpen();
-                    ManualClose();
-                    HKPlcRead();
-                }
+                HKPlcRead();
+                GetStatus();
                 Thread.Sleep(10);
-            }), "手动操作", true);
+            }), "海科PLC实时数据", true);
         }
+        /// <summary>
+        /// 气缸的传感器值
+        /// </summary>
         private void GetStatus()
         {
             for (int i = 0; i < 8; i++)
@@ -111,222 +136,83 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             }
             for (int i = 0; i < 7; i++)
             {
-                GVL_SmallStation.GetInstance.Cylinder_JackInfo[i + 8] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX0." + i);
+                GVL_SmallStation.GetInstance.Cylinder_JackInfo[i + 8] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX1." + i);
             }
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[20] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX3.6");//进料桶气缸
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[21] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX3.7");//出料筒气缸1
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[22] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.0");//出料筒气缸2
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[23] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.1");//出料筒气缸3
+
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[24] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.2");//托盘1_1气缸
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[25] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.3");//托盘1_2气缸
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[26] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.4");//托盘2_1气缸
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[27] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.5");//托盘2_2气缸
         }
-        private void ManualOpen()
-        {
-            ActionManage.GetInstance.Register(new Action<object>((o) =>
-            {
-                if (o != null)
-                {
-                    if (o.ToString().Contains("升降气缸"))
-                    {
-                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
-                        if (index >= 1 && index <= 15)
-                        {
-                            string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
-                            if (index == 8) address = "DB5.DBX0.7";
-                            HKDevice.HK_PLC_S7.Write<bool>(address, true);
-                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：true");
-                        }
-                    }
-                    else if (o.ToString().Contains("阻挡气缸"))
-                    {
-                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
-                        if (index >= 1 && index <= 15)
-                        {
-                            string address = "";
-                            if (index == 1) address = "DB5.DBX1.7";
-                            if (index == 2) address = "DB5.DBX2.0";
-                            if (index == 3) address = "DB5.DBX2.1";
-                            if (index == 4) address = "DB5.DBX2.2";
-                            if (index == 5) address = "DB5.DBX2.3";
-                            if (index == 6) address = "DB5.DBX2.4";
-                            if (index == 7) address = "DB5.DBX2.5";
-                            if (index == 8) address = "DB5.DBX2.6";
-                            if (index == 9) address = "DB5.DBX2.7";
-                            if (index == 10) address = "DB5.DBX3.0";
-                            if (index == 11) address = "DB5.DBX3.1";
-                            if (index == 12) address = "DB5.DBX3.2";
-                            if (index == 13) address = "DB5.DBX3.3";
-                            if (index == 14) address = "DB5.DBX3.4";
-                            if (index == 15) address = "DB5.DBX3.5";
-                            HKDevice.HK_PLC_S7.Write<bool>(address, true);
-                        }
-                    }
-                    else if (o.ToString().Contains("进料桶顶升气缸"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.6", false);//默认顶升
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：false");
-                    }
-                    else if (o.ToString().Contains("出料桶顶升气缸1"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.7", true);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：true");
-                    }
-                    else if (o.ToString().Contains("出料桶顶升气缸2"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.0", true);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：true");
-                    }
-                    else if (o.ToString().Contains("出料桶顶升气缸3"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.1", true);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：true");
-                    }
-                    else if (o.ToString().Contains("托盘气缸1_1"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.2", false);//默认伸出
-                    }
-                    else if (o.ToString().Contains("托盘气缸1_2"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.3", false);
-                    }
-                    else if (o.ToString().Contains("托盘气缸2_1"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.4", false);
-                    }
-                    else if (o.ToString().Contains("托盘气缸2_2"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.5", false);
-                    }
-                }
-            }), "ManualOpen", true);//根据下发的配方ID将 托盘的位置信息添加到配方中
-        }
-        private void ManualClose()
+        /// <summary>
+        /// DB块的变量实时值
+        /// </summary>
+        private void HKPlcRead()
         {
-            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            if (HKDevice.IsConnected)
             {
-                if (o != null)
+                foreach (PropertyInfo item in typeof(PlcReadAddressDB3).GetProperties())
                 {
-                    if (o.ToString().Contains("升降气缸"))
-                    {
-                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
-                        if (index >= 1 && index <= 15)
-                        {
-                            string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
-                            if (index == 8) address = "DB5.DBX0.7";
-                            HKDevice.HK_PLC_S7.Write<bool>(address, false);
-                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：false");
-                        }
-                    }
-                    else if (o.ToString().Contains("阻挡气缸"))
-                    {
-                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
-                        if (index >= 1 && index <= 15)
-                        {
-                            string address = "";
-                            if (index == 1) address = "DB5.DBX1.7";
-                            if (index == 2) address = "DB5.DBX2.0";
-                            if (index == 3) address = "DB5.DBX2.1";
-                            if (index == 4) address = "DB5.DBX2.2";
-                            if (index == 5) address = "DB5.DBX2.3";
-                            if (index == 6) address = "DB5.DBX2.4";
-                            if (index == 7) address = "DB5.DBX2.5";
-                            if (index == 8) address = "DB5.DBX2.6";
-                            if (index == 9) address = "DB5.DBX2.7";
-                            if (index == 10) address = "DB5.DBX3.0";
-                            if (index == 11) address = "DB5.DBX3.1";
-                            if (index == 12) address = "DB5.DBX3.2";
-                            if (index == 13) address = "DB5.DBX3.3";
-                            if (index == 14) address = "DB5.DBX3.4";
-                            if (index == 15) address = "DB5.DBX3.5";
-                            HKDevice.HK_PLC_S7.Write<bool>(address, false);
-                        }
-                    }
-                    else if (o.ToString().Contains("进料桶顶升气缸"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.6", true);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：true");
-                    }
-                    else if (o.ToString().Contains("出料桶顶升气缸1"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.7", false);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：false");
-                    }
-                    else if (o.ToString().Contains("出料桶顶升气缸2"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.0", false);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：false");
-                    }
-                    else if (o.ToString().Contains("出料桶顶升气缸3"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.1", false);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：false");
-                    }
-                    else if (o.ToString().Contains("托盘气缸1_1"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.2", true);
-                    }
-                    else if (o.ToString().Contains("托盘气缸1_2"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.3", true);
-                    }
-                    else if (o.ToString().Contains("托盘气缸2_1"))
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.4", true);
-                    }
-                    else if (o.ToString().Contains("托盘气缸2_2"))
+                    int index = Array.FindIndex(CommData.ToArray(), p => p.Name == item.Name);
+                    if (index >= 0)
                     {
-                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.5", true);
+                        CommData.ElementAt(index).Value = GVL_SmallStation.GetInstance.plcReadDataDB3.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.GetInstance.plcReadDataDB3, null).ToString();
                     }
                 }
-            }), "ManualClose", true);//根据下发的配方ID将 托盘的位置信息添加到配方中
-        }
-        public ObservableCollection<PlcInfos> CommData = new ObservableCollection<PlcInfos>();
-        private void HKPlcRead()
-        {
-            foreach (PropertyInfo item in typeof(PlcReadAddressDB3).GetProperties())
+            }
+            foreach (PropertyInfo item in typeof(GVL_SmallStation).GetProperties())
             {
-                int index = Array.FindIndex(CommData.ToArray(), p => p.Name == item.Name);
+                int index = Array.FindIndex(ProcessVar.ToArray(), p => p.Name == item.Name);
                 if (index >= 0)
                 {
-                    CommData.ElementAt(index).Value = GVL_SmallStation.plcReadDataDB3.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.plcReadDataDB3, null).ToString();
+                    ProcessVar.ElementAt(index).Value = GVL_SmallStation.GetInstance.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.GetInstance, null).ToString();
                 }
             }
         }
         /// <summary>
         /// 小料站和西门子PLC之间的实时数据
         /// </summary>
-        private void Real_Time_Data()
+        private void RealTimeData()
         {
             if (HKDevice.IsConnected)
             {
                 //获取系统状态
-                GVL_SmallStation.SystemStatus = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.0");//系统启停
-                GVL_SmallStation.SystemMode = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.1");//系统模式
-                GVL_SmallStation.SystemRunStatus = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.2");//系统暂停
+                GVL_SmallStation.GetInstance.PlcSystemIsAutoRun = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.0");//系统启停
+                GVL_SmallStation.GetInstance.PlcSystemMode = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.1");//系统模式
+                GVL_SmallStation.GetInstance.PlcSystemIsPause = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.2");//系统暂停
 
-                GVL_SmallStation.Station1HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX0.7");//工站1 有货架
-                GVL_SmallStation.Station2HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.0");//工站2 有货架
-                if (GVL_SmallStation.WindSendDosingComple)
+                GVL_SmallStation.GetInstance.Station1HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX0.7");//工站1 有货架
+                GVL_SmallStation.GetInstance.Station2HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.0");//工站2 有货架
+                if (GVL_SmallStation.GetInstance.WindSendDosingComple)
                 {
                     HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.7", true);
-                    GVL_SmallStation.WindSendDosingComple = false;
+                    GVL_SmallStation.GetInstance.WindSendDosingComple = false;
                     MessageNotify.GetInstance.ShowRunLog("风送配料完成信号，发给产线plc信号");
                 }
                 if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1"))
                 {
                     HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.7", false);
                 }
-                if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.7"))//允许下配方1或者允许下配方2
+                if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.7") || GVL_SmallStation.GetInstance.RequestOrder)//允许下配方1或者允许下配方2
                 {
-                    GVL_SmallStation.IsAllowSiemensSendRecipe = true;
+                    GVL_SmallStation.GetInstance.IsAllowSiemensSendRecipe = true;
                 }
-                GVL_SmallStation.Station1Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.1");
-                GVL_SmallStation.Station2Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.2");
-                GVL_SmallStation.Station1Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.3");
-                GVL_SmallStation.Station2Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.4");
-                GVL_SmallStation.RobotStatus = HKDevice.HK_PLC_S7.Read<ushort>("DB3.DBW100");
-                GVL_SmallStation.RobotProgramNum = HKDevice.HK_PLC_S7.Read<byte>("DB3.DBB102");
-
+                GVL_SmallStation.GetInstance.Station1Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.1");
+                GVL_SmallStation.GetInstance.Station2Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.2");
+                GVL_SmallStation.GetInstance.Station1Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.3");
+                GVL_SmallStation.GetInstance.Station2Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.4");
+                GVL_SmallStation.GetInstance.RobotStatus = HKDevice.HK_PLC_S7.Read<ushort>("DB3.DBW100");
+                GVL_SmallStation.GetInstance.RobotProgramNum = HKDevice.HK_PLC_S7.Read<byte>("DB3.DBB102");
             }
             if (SiemensDevice.IsConnected)
             {
                 ushort TrayCylinder = 0;
                 ushort TraySensor = 0;
-                if (GVL_SmallStation.Station1Sensor)
+                if (GVL_SmallStation.GetInstance.Station1Sensor)
                 {
                     TraySensor = TraySensor.SetBitValue(1, true);
                 }
@@ -334,7 +220,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     TraySensor = TraySensor.SetBitValue(0, false);
                 }
-                if (!GVL_SmallStation.Station1Cylinder)
+                if (!GVL_SmallStation.GetInstance.Station1Cylinder)
                 {
                     TrayCylinder = TrayCylinder.SetBitValue(1, true);
                 }
@@ -342,63 +228,59 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     TrayCylinder = TrayCylinder.SetBitValue(0, false);
                 }
-                this.SiemensDevice.Siemens_PLC_S7.Write<bool>("DB2231.DBX28.4", GVL_SmallStation.WindSendAllowAGVPutGet);
+                this.SiemensDevice.Siemens_PLC_S7.Write<bool>("DB2231.DBX28.4", GVL_SmallStation.GetInstance.WindSendAllowAGVPutGet);
                 this.SiemensDevice.Siemens_PLC_S7.Write<ushort>("DB2231.DBW190", TraySensor);//添加工位传感器的信号
                 this.SiemensDevice.Siemens_PLC_S7.Write<ushort>("DB2231.DBW192", TrayCylinder);//添加工位气缸的信号
                 ushort AGV_Put = (ushort)SiemensDevice.XL_Status.AgvFinishPut;
                 if (AGV_Put.Get16bitValue(1))
                 {
-                    GVL_SmallStation.AGV_PutTray1Finish = true;
+                    GVL_SmallStation.GetInstance.AGV_PutTray1Finish = true;
                 }
                 else
                 {
-                    GVL_SmallStation.AGV_PutTray1Finish = false;
+                    GVL_SmallStation.GetInstance.AGV_PutTray1Finish = false;
                 }
-
-
                 ushort AGV_Get = (ushort)SiemensDevice.XL_Status.AgvFinishGet;
-
-                if (AGV_Get.Get16bitValue(1))
+                if (AGV_Get.Get16bitValue(1)) 
                 {
-                    GVL_SmallStation.AGV_GetTray1Finish = true;
+                    GVL_SmallStation.GetInstance.AGV_GetTray1Finish = true; 
                 }
-                else
+                else 
                 {
-                    GVL_SmallStation.AGV_GetTray1Finish = false;
+                    GVL_SmallStation.GetInstance.AGV_GetTray1Finish = false;
                 }
             }
         }
 
         public void CancelOrder()
         {
-            if (GVL_SmallStation.Order_Cancel) //订单取消
+            if (GVL_SmallStation.GetInstance.Order_Cancel) //订单取消
             {
-                if (!string.IsNullOrEmpty(GVL_SmallStation.Order_CancelRecipeCode))
+                if (!string.IsNullOrEmpty(GVL_SmallStation.GetInstance.Order_CancelRecipeCode))
                 {
-                    string code = GVL_SmallStation.Order_CancelRecipeCode;
+                    string code = GVL_SmallStation.GetInstance.Order_CancelRecipeCode;
                     int index = Array.FindIndex(Json<RemoteRecipeDataColl>.Data.Recipes.ToArray(), p => p.RecipeCode == code);
-
-                    switch (GVL_SmallStation.OrderCancelStep)
+                    switch (GVL_SmallStation.GetInstance.OrderCancelStep)
                     {
                         case 0://前提条件判断
                             if (index == -1)
                             {
-                                GVL_SmallStation.OrderCancelStep = 30;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 30;
                                 MessageNotify.GetInstance.ShowRunLog($"配方中并未找到订单{code}");
                             }
                             else
                             {
-                                if (RecipeQueueTray1.Contains(GVL_SmallStation.Order_CancelRecipeCode))
+                                if (RecipeQueueTray1.Contains(GVL_SmallStation.GetInstance.Order_CancelRecipeCode))
                                 {
-                                    GVL_SmallStation.OrderCancelStep = 1;
+                                    GVL_SmallStation.GetInstance.OrderCancelStep = 1;
                                 }
-                                else if (RecipeQueueTray2.Contains(GVL_SmallStation.Order_CancelRecipeCode))
+                                else if (RecipeQueueTray2.Contains(GVL_SmallStation.GetInstance.Order_CancelRecipeCode))
                                 {
-                                    GVL_SmallStation.OrderCancelStep = 10;
+                                    GVL_SmallStation.GetInstance.OrderCancelStep = 10;
                                 }
                                 else
                                 {
-                                    GVL_SmallStation.OrderCancelStep = 20;
+                                    GVL_SmallStation.GetInstance.OrderCancelStep = 20;
                                 }
                             }
                             break;
@@ -410,34 +292,34 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
                                 HKDevice.HK_PLC_S7.Write("DB4.DBX2.1", true);
                                 MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，正在取消订单：{code}");
-                                GVL_SmallStation.OrderCancelStep = 2;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 2;
                             }
                             else
                             {
                                 MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
-                                GVL_SmallStation.OrderCancelStep = 3;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 3;
                             }
                             break;
                         case 2:
                             if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.5"))
                             {
-                                if (GVL_SmallStation.Station1Cylinder == false) 
+                                if (GVL_SmallStation.GetInstance.Station1Cylinder == false) 
                                 {
                                     GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
-                                    GVL_SmallStation.OrderCancelStep = 3;
+                                    GVL_SmallStation.GetInstance.OrderCancelStep = 3;
                                     MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
                                 }
                             }
                             break;
                         case 3:
                             SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
-                            GVL_SmallStation.OrderCancelStep = 4;
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 4;
                             break;
                         case 4:
                             if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
                             {
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
-                                GVL_SmallStation.OrderCancelStep = 9;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 9;
                                 MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
                             }
                             break;
@@ -447,34 +329,32 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
                             });
                             RecipeQueueTray1.TryDequeue(out code);
-                            GVL_SmallStation.Tray1LogicFinish = 0;
-                            GVL_SmallStation.Order_Cancel = false;
-                            GVL_SmallStation.Order_CancelRecipeCode = "";
-                            GVL_SmallStation.OrderCancelStep = 0;
+                            GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
+                            GVL_SmallStation.GetInstance.Order_Cancel = false;
+                            GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 0;
                             break;
-
-
                         case 10:
                             if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 != 0)
                             {
                                 GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
                                 HKDevice.HK_PLC_S7.Write("DB4.DBX2.2", true);
                                 MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，正在取消订单：{code}");
-                                GVL_SmallStation.OrderCancelStep = 11;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 11;
                             }
                             else
                             {
                                 MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
-                                GVL_SmallStation.OrderCancelStep = 12;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 12;
                             }
                             break;
                         case 11:
                             if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.6"))
                             {
-                                if (GVL_SmallStation.Station2Cylinder == false)
+                                if (GVL_SmallStation.GetInstance.Station2Cylinder == false)
                                 {
                                     GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
-                                    GVL_SmallStation.OrderCancelStep = 12;
+                                    GVL_SmallStation.GetInstance.OrderCancelStep = 12;
                                     MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
                                 }
                             }
@@ -482,13 +362,13 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
 
                         case 12:
                             SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
-                            GVL_SmallStation.OrderCancelStep = 13;
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 13;
                             break;
                         case 13:
                             if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
                             {
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
-                                GVL_SmallStation.OrderCancelStep = 14;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 14;
                                 MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
                             }
                             break;
@@ -498,22 +378,22 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
                             });
                             RecipeQueueTray2.TryDequeue(out code);
-                            GVL_SmallStation.Order_Cancel = false;
-                            GVL_SmallStation.Tray2LogicFinish = 0;
-                            GVL_SmallStation.Order_CancelRecipeCode = "";
-                            GVL_SmallStation.OrderCancelStep = 0;
+                            GVL_SmallStation.GetInstance.Order_Cancel = false;
+                            GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;
+                            GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 0;
                             break;
 
                         //20-29为订单还未下发至PLC
                         case 20:
                             SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
-                            GVL_SmallStation.OrderCancelStep = 21;
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 21;
                             break;
                         case 21:
                             if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
                             {
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
-                                GVL_SmallStation.OrderCancelStep = 29;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 29;
                                 MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
                             }
                             break;
@@ -522,29 +402,29 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             {
                                 Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
                             });
-                            GVL_SmallStation.Order_Cancel = false;
-                            GVL_SmallStation.Order_CancelRecipeCode = "";
-                            GVL_SmallStation.SiemensSendRecipeStatus = 0;
-                            GVL_SmallStation.OrderCancelStep = 0;
+                            GVL_SmallStation.GetInstance.Order_Cancel = false;
+                            GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 0;
                             break;
 
                         //30-39为订单还未下发至上位机
                         case 30:
                             SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
-                            GVL_SmallStation.OrderCancelStep = 31;
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 31;
                             break;
                         case 31:
                             if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
                             {
                                 SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
-                                GVL_SmallStation.OrderCancelStep = 39;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 39;
                                 MessageNotify.GetInstance.ShowRunLog($"西门子取消订单完成，订单号：{code}");
                             }
                             break;
                         case 39:
-                            GVL_SmallStation.Order_Cancel = false;
-                            GVL_SmallStation.Order_CancelRecipeCode = "";
-                            GVL_SmallStation.OrderCancelStep = 0;
+                            GVL_SmallStation.GetInstance.Order_Cancel = false;
+                            GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 0;
                             break;
                     }
                 }
@@ -568,12 +448,12 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             {
                                 if (SiemensDevice.XL_Status is XL_Status_DB status)
                                 {
-                                    switch (GVL_SmallStation.SiemensSendRecipeStatus)
+                                    switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus)
                                     {
                                         case 3:
                                             SiemensDevice.Siemens_PLC_S7.WriteString(2231, data.RecipeCode, 10);
                                             SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", true);
-                                            GVL_SmallStation.SiemensSendRecipeStatus = 4;
+                                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 4;
                                             MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，请求配料");
                                             break;
                                         case 4:
@@ -581,20 +461,20 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                             {
                                                 SiemensDevice.Siemens_PLC_S7.WriteString(2231, "", 10);//复位字符串
                                                 SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", false);
-                                                GVL_SmallStation.SiemensSendRecipeStatus = 5;
+                                                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 5;
                                                 MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料");
                                             }
                                             break;
                                         case 5:
                                             if (SiemensDevice.XL_Status.Dosing_Confirm == false)
                                             {
-                                                GVL_SmallStation.SiemensSendRecipeStatus = 6;
+                                                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 6;
                                                 MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料信号复位完成");
                                             }
                                             break;
                                         case 6:
                                             RecipeQueueTray1.Enqueue(data.RecipeCode);
-                                            GVL_SmallStation.SiemensSendRecipeStatus = 0;
+                                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
                                             MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，加入队列");
                                             break;
                                         default:
@@ -609,12 +489,12 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             {
                                 if (SiemensDevice.XL_Status is XL_Status_DB status)
                                 {
-                                    switch (GVL_SmallStation.SiemensSendRecipeStatus)
+                                    switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus)
                                     {
                                         case 3:
                                             SiemensDevice.Siemens_PLC_S7.WriteString(2231, data.RecipeCode, 10);
                                             SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", true);
-                                            GVL_SmallStation.SiemensSendRecipeStatus = 4;
+                                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 4;
                                             MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，请求配料");
                                             break;
                                         case 4:
@@ -622,20 +502,20 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                             {
                                                 SiemensDevice.Siemens_PLC_S7.WriteString(2231, "", 10);//复位字符串
                                                 SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", false);
-                                                GVL_SmallStation.SiemensSendRecipeStatus = 5;
+                                                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 5;
                                                 MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料");
                                             }
                                             break;
                                         case 5:
                                             if (SiemensDevice.XL_Status.Dosing_Confirm == false)
                                             {
-                                                GVL_SmallStation.SiemensSendRecipeStatus = 6;
+                                                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 6;
                                                 MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料信号复位完成");
                                             }
                                             break;
                                         case 6:
                                             RecipeQueueTray2.Enqueue(data.RecipeCode);
-                                            GVL_SmallStation.SiemensSendRecipeStatus = 0;
+                                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
                                             MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，加入队列");
                                             break;
                                         default:
@@ -650,8 +530,8 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     RecipeQueueTray1.Clear();
                     RecipeQueueTray2.Clear();
-                    /*GVL_SmallStation.Tray1LogicFinish = 0;
-                    GVL_SmallStation.Tray2LogicFinish = 0;*/
+                    /*GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
+                    GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;*/
                     GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
                     GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
                 }
@@ -683,14 +563,8 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     RecipeQueueTray1.Clear();
                     RecipeQueueTray2.Clear();
-                    /*GVL_SmallStation.Tray1LogicFinish = 0;
-                    GVL_SmallStation.Tray2LogicFinish = 0;*/
-
-                    GVL_SmallStation.GetInstance.DosingTray1 = false;
-                    GVL_SmallStation.GetInstance.DosingTray1Loc = 0;
-
-                    GVL_SmallStation.GetInstance.DosingTray2 = false;
-                    GVL_SmallStation.GetInstance.DosingTray2Loc = 0;
+                    /*GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
+                    GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;*/
 
                     GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
                     GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
@@ -702,29 +576,29 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         private void RecipeInfoToHKPLC()
         {
-            switch (GVL_SmallStation.Tray1LogicFinish)
+            switch (GVL_SmallStation.GetInstance.Tray1LogicFinish)
             {
                 case 0:
-                    if (GVL_SmallStation.AGV_PutTray1Finish && RecipeQueueTray1.Count > 0)
+                    if (GVL_SmallStation.GetInstance.AGV_PutTray1Finish && RecipeQueueTray1.Count > 0 && !GVL_SmallStation.GetInstance.NotUseSmallDosing)
                     {
                         HKDevice.HK_PLC_S7.Write("DB4.DBX0.7", true);
-                        GVL_SmallStation.AGV_PutTray1Finish = false;
-                        GVL_SmallStation.Tray1LogicFinish = 1;
+                        GVL_SmallStation.GetInstance.AGV_PutTray1Finish = false;
+                        GVL_SmallStation.GetInstance.Tray1LogicFinish = 1;
                         MessageNotify.GetInstance.ShowRunLog("AGV到位 发送到位信号给plc");
                     }
                     break;
                 case 1:
-                    if (GVL_SmallStation.Station1HaveTray)
+                    if (GVL_SmallStation.GetInstance.Station1HaveTray)
                     {
                         HKDevice.HK_PLC_S7.Write("DB4.DBX0.7", false);
-                        GVL_SmallStation.Tray1LogicFinish = 2;
+                        GVL_SmallStation.GetInstance.Tray1LogicFinish = 2;
                         MessageNotify.GetInstance.ShowRunLog("托盘1有货架");
                     }
                     else
                     {
                         if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.5") == true)
                         {
-                            if (GVL_SmallStation.CylinderReset)
+                            if (GVL_SmallStation.GetInstance.CylinderReset)
                             {
                                 HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.5", true);
                             }
@@ -732,54 +606,55 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         }
                         else
                         {
-                            GVL_SmallStation.Tray1LogicFinish = 1;
+                            GVL_SmallStation.GetInstance.Tray1LogicFinish = 1;
                             HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.5", false);
                         }
                     }
                     break;
                 case 2:
-                    if (GVL_SmallStation.AGV_GetTray1Finish && GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 0)
+                    if (GVL_SmallStation.GetInstance.AGV_GetTray1Finish && GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 0)
                     {
                         HKDevice.HK_PLC_S7.Write("DB4.DBX1.1", true);
-                        GVL_SmallStation.Tray1LogicFinish = 3;
-                        MessageNotify.GetInstance.ShowRunLog("AGV取托盘完成");
+                        GVL_SmallStation.GetInstance.Tray1LogicFinish = 3;
+                        MessageNotify.GetInstance.ShowRunLog("AGV取托盘1完成,发送给海科信号后1s后复位");
                     }
                     break;
                 case 3:
-                    if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.7") == true)
+                    if (HKDevice.HK_PLC_S7.Read<bool>("DB4.DBX1.1") == true)
                     {
+                        Thread.Sleep(1000);
                         HKDevice.HK_PLC_S7.Write("DB4.DBX1.1", false);
-                        GVL_SmallStation.Tray1LogicFinish = 0;
-                        GVL_SmallStation.AGV_GetTray1Finish = false;
-                        MessageNotify.GetInstance.ShowRunLog("plc允许下配方，复位取托盘完成信号");
+                        GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
+                        GVL_SmallStation.GetInstance.AGV_GetTray1Finish = false;
+                        MessageNotify.GetInstance.ShowRunLog("AGV取托盘1完成，信号复位");
                     }
                     break;
                 default:
                     break;
             }
-            switch (GVL_SmallStation.Tray2LogicFinish)
+            switch (GVL_SmallStation.GetInstance.Tray2LogicFinish)
             {
                 case 0:
-                    if (GVL_SmallStation.AGV_PutTray2Finish)
+                    if (GVL_SmallStation.GetInstance.AGV_PutTray2Finish)
                     {
                         HKDevice.HK_PLC_S7.Write("DB4.DBX1.0", true);
-                        GVL_SmallStation.AGV_PutTray2Finish = false;
-                        GVL_SmallStation.Tray2LogicFinish = 1;
+                        GVL_SmallStation.GetInstance.AGV_PutTray2Finish = false;
+                        GVL_SmallStation.GetInstance.Tray2LogicFinish = 1;
                         MessageNotify.GetInstance.ShowRunLog("AGV到位 发送到位信号给plc");
                     }
                     break;
                 case 1:
-                    if (GVL_SmallStation.Station2HaveTray)
+                    if (GVL_SmallStation.GetInstance.Station2HaveTray)
                     {
                         HKDevice.HK_PLC_S7.Write("DB4.DBX1.0", false);
-                        GVL_SmallStation.Tray2LogicFinish = 2;
+                        GVL_SmallStation.GetInstance.Tray2LogicFinish = 2;
                         MessageNotify.GetInstance.ShowRunLog("托盘1有货架");
                     }
                     else
                     {
                         if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.6") == true)
                         {
-                            if (GVL_SmallStation.CylinderReset)
+                            if (GVL_SmallStation.GetInstance.CylinderReset)
                             {
                                 HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.6", true);
                             }
@@ -787,30 +662,32 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         }
                         else
                         {
-                            GVL_SmallStation.Tray2LogicFinish = 1;
+                            GVL_SmallStation.GetInstance.Tray2LogicFinish = 1;
                             HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.6", false);
                         }
                     }
                     break;
                 case 2:
-                    if (GVL_SmallStation.AGV_GetTray2Finish && GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 0)
+                    if (GVL_SmallStation.GetInstance.AGV_GetTray2Finish && GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 0)
                     {
                         HKDevice.HK_PLC_S7.Write("DB4.DBX1.2", true);
-                        GVL_SmallStation.Tray2LogicFinish = 3;
+                        GVL_SmallStation.GetInstance.Tray2LogicFinish = 3;
                     }
                     break;
                 case 3:
-                    if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.7") == true)
+                    if (HKDevice.HK_PLC_S7.Read<bool>("DB4.DBX1.2") == true)
                     {
+                        Thread.Sleep(1000);
                         HKDevice.HK_PLC_S7.Write("DB4.DBX1.2", false);
-                        GVL_SmallStation.Tray2LogicFinish = 0;
-                        GVL_SmallStation.AGV_GetTray2Finish = false;
+                        GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;
+                        GVL_SmallStation.GetInstance.AGV_GetTray2Finish = false;
                     }
                     break;
                 default:
                     break;
             }
-            if (RecipeQueueTray1.Count > 0 && GVL_SmallStation.Tray1LogicFinish == 2)
+            #region 托盘1配料
+            if (RecipeQueueTray1.Count > 0) /*&& GVL_SmallStation.GetInstance.Tray1LogicFinish == 2*/   //不需要等待AGV到位，就给PLC下发配方
             {
                 int index = Array.FindIndex(RemoteRecipes.ToArray(), p => p.RecipeCode == RecipeQueueTray1.ElementAt(0));
                 if (index >= 0 && index < RemoteRecipes.Count)
@@ -821,11 +698,59 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     string windSend = RemoteRecipes.ElementAt(index).ToString();
                     if (trayCode == 1)
                     {
-                        if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 0)
+                        if (GVL_SmallStation.GetInstance.NotUseSmallDosing)
+                        {
+                            if (GVL_SmallStation.GetInstance.AGV_PutTray1Finish)
+                            {
+                                Thread.Sleep(5000);
+                                var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
+                                if (SiemensDevice.IsConnected && !GVL_SmallStation.GetInstance.IsUseLocalRecipe)
+                                {
+                                    RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
+                                    RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
+                                    RecipeFinishInfo.Job_No = (short)trayCode;
+                                    for (int i = 0; i < 20; i++)
+                                    {
+                                        RecipeFinishInfo.Material[i] = new UDT1();
+                                    }
+                                    for (int i = 0; i < 10; i++)
+                                    {
+                                        RecipeFinishInfo.Powder[i] = new UDT2();
+                                    }
+                                    for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
+                                    {
+                                        RecipeFinishInfo.Material[i].Material_Name = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
+                                        RecipeFinishInfo.Material[i].Material_BarrelNum = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
+                                        RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight * (float)0.001;
+                                    }
+                                    for (int i = 0; i < RemoteRecipes.ElementAt(index).WindSend.Count; i++)
+                                    {
+                                        RecipeFinishInfo.Powder[i].Powder_Weight = RemoteRecipes.ElementAt(index).WindSend.ElementAt(i).DosingCompleWeight;
+                                    }
+                                    RecipeFinishInfo.Ask_For_Finish = true;
+                                    RecipeFinishInfo.DosingTime = 0;
+                                    SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
+
+                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据反馈给西门子");
+                                }
+                                else
+                                {
+                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据无法反馈给西门子，西门子设备未连接或处于本地配方");
+                                }
+                                GVL_SmallStation.GetInstance.WindSendDosing = false;
+                                App.Current.Dispatcher.Invoke(() =>
+                                {
+                                    Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
+                                });
+                                RecipeQueueTray1.TryDequeue(out code);
+                            }
+                        }
+                        else
                         {
-                            StockBinInit();
-                            if (GVL_SmallStation.GetInstance.IsUseWindSend)
+                            //粉料仓下发配方
+                            if (GVL_SmallStation.GetInstance.IsUseWindSend && GVL_SmallStation.GetInstance.Tray1LogicFinish == 2 && GVL_SmallStation.GetInstance.WindSendDosing == false)
                             {
+                                GVL_SmallStation.GetInstance.WindSendDosing = true;
                                 WindSendData.TargetRecipeCode = code;
                                 WindSendData.IsAllowDosing = true;
                                 foreach (var item in RemoteRecipes.ElementAt(index).WindSend)
@@ -853,388 +778,467 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 }
                                 WindSendDevice.Siemens_PLC_S7.WriteClass<WindSend_Write>(WindSendData, 95);
                             }
-                            foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
-                            {
-                                HKDevice.StockBinPar((uint)item.RawMaterialBarrelNum, (ushort)item.RawMaterialLocation);
-                            }
-                            HKDevice.HK_PLC_S7.Write("DB4.DBX1.3", true);
-                            GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 1;
-                            MessageNotify.GetInstance.ShowRunLog($"托盘1,配方：{recipeName}，下发完成");
-                            GVL_SmallStation.GetInstance.time1 = DateTime.Now;
-                        }
-
-                        if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.3") && GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 1)
-                        {
-                            HKDevice.HK_PLC_S7.Write("DB4.DBX1.3", false);
-                            GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 2;
-                            MessageNotify.GetInstance.ShowRunLog($"托盘1,{ recipeName}plc端 配方接收完成");
-                        }
-                        if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 2)
-                        {
-                            if (RTrig.GetInstance("DB3.DBX50.0").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.0")))
-                            {
-                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD10");
-                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{res}料仓，允许配料");
-                                if (res > 0 && res is float loc)
-                                {
-                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                    float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;//单位g转换kg
-                                    if (loc_index >= 0)
-                                    {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//根据料仓编号 启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-                                    }
-                                    else
-                                    {
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，错误没有找到{(int)loc}号仓的配方");
-                                    }
-                                    GVL_SmallStation.GetInstance.DosingTray1 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{(int)loc}号仓，正在配料");
-                                }
-                            }
-                            else if (RTrig.GetInstance("DB3.DBX50.1").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.1")))
+                            if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 0)
                             {
-                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD14");
-                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{res}料仓，允许配料");
-                                if (res > 0 && res is float loc)
+                                StockBinInit();
+                                GVL_SmallStation.GetInstance.StockBinDosing = 0;
+                                foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
                                 {
-                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                    float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
-                                    if (loc_index >= 0)
-                                    {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-                                    }
-                                    else
-                                    {
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，错误没有找到{(int)loc}号仓的配方");
-                                    }
-                                    GVL_SmallStation.GetInstance.DosingTray1 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{(int)loc}号仓，正在配料");
+                                    HKDevice.StockBinPar((uint)item.RawMaterialBarrelNum, (ushort)item.RawMaterialLocation);
+                                    GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)item.RawMaterialLocation, true);//哪些仓位需要配料写入
                                 }
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX1.3", true);
+                                GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 1;
+                                MessageNotify.GetInstance.ShowRunLog($"托盘1,配方：{recipeName}，下发完成");
+                                GVL_SmallStation.GetInstance.time1 = DateTime.Now;
                             }
-                            else if (RTrig.GetInstance("DB3.DBX50.2").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.2")))
+                            bool recipeReceviceFinish = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.3");
+                            if (recipeReceviceFinish && GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 1)
                             {
-                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD18");
-                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{res}料仓，允许配料");
-                                if (res > 0 && res is float loc)
-                                {
-                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                    float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
-                                    if (loc_index >= 0)
-                                    {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-                                    }
-                                    else
-                                    {
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，错误没有找到{(int)loc}号仓的配方");
-                                    }
-                                    GVL_SmallStation.GetInstance.DosingTray1 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{(int)loc}号仓，正在配料");
-                                }
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX1.3", false);
+                                GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 2;
+                                MessageNotify.GetInstance.ShowRunLog($"托盘1,{ recipeName}plc端 配方接收完成");
                             }
-                            else if (RTrig.GetInstance("DB3.DBX50.3").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.3")))
+                            if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 2)
                             {
-                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD22");
-                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{res}料仓，允许配料");
-                                if (res > 0 && res is float loc)
+                                if (RTrig.GetInstance("DB3.DBX50.0").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.0")))
                                 {
-                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                    float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
-                                    if (loc_index >= 0)
+                                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD10");
+                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{res}料仓，允许配料");
+                                    if (res > 0 && res is float loc)
                                     {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-                                    }
-                                    else
-                                    {
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，错误没有找到{(int)loc}号仓的配方");
+                                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+                                        float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;//单位g转换kg
+                                        if (weight <= 0)
+                                        {
+                                            int i = (int)loc;
+                                            if (i >= 1 && i <= 8)
+                                            {
+                                                string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+                                                MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                            }
+                                            else if (i >= 9 && i <= 15)
+                                            {
+                                                string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+                                                MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                            }
+                                            GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
+                                        }
+                                        else
+                                        {
+                                            if (loc_index >= 0)
+                                            {
+                                                DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//根据料仓编号 启动并写入每个原料重量
+                                                GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                            }
+                                            else
+                                            {
+                                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，错误没有找到{(int)loc}号仓的配方");
+                                            }
+                                        }
+                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{(int)loc}号仓，正在配料");
                                     }
-                                    GVL_SmallStation.GetInstance.DosingTray1 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{(int)loc}号仓，正在配料");
                                 }
-                            }
-                            /* if (GVL_SmallStation.GetInstance.DosingTray1 && GVL_SmallStation.GetInstance.DosingTray1Loc > 0 && GVL_SmallStation.GetInstance.DosingTray1Loc < 16)
-                             {
-                                 int i = GVL_SmallStation.GetInstance.DosingTray1Loc;*/
-                            for (int i = 1; i < 16; i++)
-                            {
-                                if (DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3)
+                                else if (RTrig.GetInstance("DB3.DBX50.1").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.1")))
                                 {
-                                    int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
-                                    if (res >= 0)
+                                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD14");
+                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{res}料仓，允许配料");
+                                    if (res > 0 && res is float loc)
                                     {
-                                        Thread.Sleep(GVL_SmallStation.Time);
-                                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成");
-                                        RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
-                                        bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
-                                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，下料完成重量：{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}");
-                                        float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000);
-                                        int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
-                                        if (iIndex >= 0)
+                                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+                                        float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
+                                        if (weight <= 0)
                                         {
-                                            if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
+                                            int i = (int)loc;
+                                            if (i >= 1 && i <= 8)
                                             {
-                                                HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
-                                                App.Current.Dispatcher.Invoke(() =>
-                                                {
-                                                    MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
-                                                    HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
-                                                });
+                                                string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+                                                MessageNotify.GetInstance.ShowRunLog(commInfo);
                                             }
-                                        }
-                                        /*if (info)
-                                        {
-                                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送成功");
+                                            else if (i >= 9 && i <= 15)
+                                            {
+                                                string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+                                                MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                            }
+                                            GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
                                         }
                                         else
                                         {
-                                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送失败");
-                                        }*/
-                                        if (i >= 1 && i <= 8)
-                                        {
-                                            string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
-                                            MessageNotify.GetInstance.ShowRunLog(commInfo);
-                                        }
-                                        else if (i >= 9 && i <= 15)
-                                        {
-                                            string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
-                                            MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                            if (loc_index >= 0)
+                                            {
+                                                DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+                                                GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                            }
+                                            else
+                                            {
+                                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，错误没有找到{(int)loc}号仓的配方");
+                                            }
                                         }
-                                        GVL_SmallStation.GetInstance.DosingTray1 = false;
-                                        GVL_SmallStation.GetInstance.DosingTray1Loc = 0;
+                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{(int)loc}号仓，正在配料");
                                     }
                                 }
-                            }
-                            if ((RTrig.GetInstance("配方配料完成").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1"))))
-                            {
-                                var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
-                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成");
-                                foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
-                                {
-                                    MessageNotify.GetInstance.ShowRunLog($"{item.RawMaterialName},下料重量：{item.Laying_Off_Weight}g");
-                                }
-                                if (SiemensDevice.IsConnected)
+                                else if (RTrig.GetInstance("DB3.DBX50.2").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.2")))
                                 {
-                                    RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
-                                    RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
-                                    RecipeFinishInfo.Job_No = (short)trayCode;
-                                    for (int i = 0; i < 20; i++)
-                                    {
-                                        RecipeFinishInfo.Material[i] = new UDT1();
-                                    }
-                                    for (int i = 0; i < 10; i++)
-                                    {
-                                        RecipeFinishInfo.Powder[i] = new UDT2();
-                                    }
-                                    for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
-                                    {
-                                        RecipeFinishInfo.Material[i].Material_Name = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
-                                        RecipeFinishInfo.Material[i].Material_BarrelNum = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
-                                        RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight * (float)0.001;
-                                    }
-                                    for (int i = 0; i < RemoteRecipes.ElementAt(index).WindSend.Count; i++)
+                                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD18");
+                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{res}料仓，允许配料");
+                                    if (res > 0 && res is float loc)
                                     {
-                                        RecipeFinishInfo.Powder[i].Powder_Weight = RemoteRecipes.ElementAt(index).WindSend.ElementAt(i).DosingCompleWeight;
+                                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+                                        float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
+                                        if (weight <= 0)
+                                        {
+                                            int i = (int)loc;
+                                            if (i >= 1 && i <= 8)
+                                            {
+                                                string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+                                                MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                            }
+                                            else if (i >= 9 && i <= 15)
+                                            {
+                                                string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+                                                MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                            }
+                                            GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
+                                        }
+                                        else
+                                        {
+                                            if (loc_index >= 0)
+                                            {
+                                                DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+                                                GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                            }
+                                            else
+                                            {
+                                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，错误没有找到{(int)loc}号仓的配方");
+                                            }
+                                        }
+                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{(int)loc}号仓，正在配料");
                                     }
-                                    double a = DateTime.Now.Subtract(GVL_SmallStation.GetInstance.time1).TotalSeconds;
-                                    RecipeFinishInfo.Ask_For_Finish = true;
-                                    RecipeFinishInfo.DosingTime = Convert.ToInt16(a);
-                                    SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
                                 }
-                                App.Current.Dispatcher.Invoke(() =>
+                                else if (RTrig.GetInstance("DB3.DBX50.3").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.3")))
                                 {
-                                    Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
-                                });
-                                RecipeQueueTray1.TryDequeue(out code);
-                                HKDevice.HK_PLC_S7.Write("DB3.DBX1.1", false);
-                                GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
-                            }
-                        }
-                    }
-                }
-            }
-            if (RecipeQueueTray2.Count > 0 && GVL_SmallStation.Tray2LogicFinish == 2)
-            {
-                int index = Array.FindIndex(RemoteRecipes.ToArray(), p => p.RecipeCode == RecipeQueueTray2.ElementAt(0));
-                if (index >= 0 && index < RemoteRecipes.Count)
-                {
-                    string code = RemoteRecipes.ElementAt(index).RecipeCode;
-                    int trayCode = RemoteRecipes.ElementAt(index).TrayCode;
-                    string recipeName = RemoteRecipes.ElementAt(index).RecipeName;
-                    if (trayCode == 2)
-                    {
-                        if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 0)
-                        {
-                            StockBinInit();
-                            MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，初始化");
-                            foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
-                            {
-                                HKDevice.StockBinPar((uint)item.RawMaterialBarrelNum, (ushort)item.RawMaterialLocation, 2);
-                            }
-                            HKDevice.HK_PLC_S7.Write("DB4.DBX1.4", true);
-                            GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 1;
-                            MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，下发完成");
-                        }
-
-                        if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.4") && GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 1)
-                        {
-                            HKDevice.HK_PLC_S7.Write("DB3.DBX1.4", false);
-                            GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 2;
-                            MessageNotify.GetInstance.ShowRunLog($"配方：{recipeName}，plc端 配方接收完成");
-                        }
-                        if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 2)
-                        {
-                            if (RTrig.GetInstance("DB3.DBX50.4").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.4")))
-                            {
-                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD26");
-                                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，1号桶，{res}料仓，允许配料");
-                                if (res > 0 && res is float loc)
-                                {
-                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                    double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
-                                    if (loc_index >= 0)
+                                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD22");
+                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{res}料仓，允许配料");
+                                    if (res > 0 && res is float loc)
                                     {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//根据料仓编号 启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+                                        float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
+                                        if (weight <= 0)
+                                        {
+                                            int i = (int)loc;
+                                            if (i >= 1 && i <= 8)
+                                            {
+                                                string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+                                                MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                            }
+                                            else if (i >= 9 && i <= 15)
+                                            {
+                                                string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+                                                MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                            }
+                                            GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
+                                        }
+                                        else
+                                        {
+                                            if (loc_index >= 0)
+                                            {
+                                                DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
+                                                GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                            }
+                                            else
+                                            {
+                                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，错误没有找到{(int)loc}号仓的配方");
+                                            }
+                                        }
+                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{(int)loc}号仓，正在配料");
                                     }
-                                    GVL_SmallStation.GetInstance.DosingTray2 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，1号桶，{(int)loc}号仓，配料完成");
                                 }
-                            }
-                            else if (RTrig.GetInstance("DB3.DBX50.5").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.5")))
-                            {
-                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD30");
-                                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，2号桶，{res}料仓，允许配料");
-                                if (res > 0 && res is float loc)
+                                for (int i = 1; i < 16; i++)
                                 {
-                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                    double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
-                                    if (loc_index >= 0)
+                                    if ((DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3) && GVL_SmallStation.GetInstance.StockBinDosing.Get16bitValue((byte)i))
                                     {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                        int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
+                                        if (res >= 0)
+                                        {
+                                            Thread.Sleep(GVL_SmallStation.GetInstance.Time);
+                                            RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
+                                            bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
+                                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成,下料完成重量：{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}");
+                                            float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000);
+                                            int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
+                                            if (iIndex >= 0)
+                                            {
+                                                if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
+                                                {
+                                                    HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
+                                                    App.Current.Dispatcher.Invoke(() =>
+                                                    {
+                                                        MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
+                                                        HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
+                                                    });
+                                                }
+                                            }
+                                            if (i >= 1 && i <= 8)
+                                            {
+                                                string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+                                                MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                            }
+                                            else if (i >= 9 && i <= 15)
+                                            {
+                                                string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+                                                MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                            }
+                                        }
+                                        GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
                                     }
-                                    GVL_SmallStation.GetInstance.DosingTray2 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，2号桶，{(int)loc}号仓，配料完成");
                                 }
-                            }
-                            else if (RTrig.GetInstance("DB3.DBX50.6").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.6")))
-                            {
-                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD34");
-                                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，3号桶，{res}料仓，允许配料");
-                                if (res > 0 && res is float loc)
+                                if ((RTrig.GetInstance("配方配料完成").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1"))))
                                 {
-                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                    double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
-                                    if (loc_index >= 0)
+                                    if (GVL_SmallStation.GetInstance.StockBinDosing > 0)
                                     {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                        for (int i = 1; i < 17; i++)
+                                        {
+                                            if (GVL_SmallStation.GetInstance.StockBinDosing.Get16bitValue((byte)i))
+                                            {
+                                                MessageNotify.GetInstance.ShowRunLog($"料仓配料完成，但存在料仓未配料:{i}号仓");
+                                            }
+                                        }
                                     }
-                                    GVL_SmallStation.GetInstance.DosingTray2 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，3号桶，{(int)loc}号仓，配料完成");
-                                }
-                            }
-                            else if (RTrig.GetInstance("DB3.DBX50.7").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.7")))
-                            {
-                                var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD38");
-                                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，4号桶，{res}料仓，允许配料");
-                                if (res > 0 && res is float loc)
-                                {
-                                    int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                    double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
-                                    if (loc_index >= 0)
+                                    var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
+                                    foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
                                     {
-                                        DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
-                                        GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                        MessageNotify.GetInstance.ShowRunLog($"{item.RawMaterialName},下料重量：{item.Laying_Off_Weight}g");
                                     }
-                                    GVL_SmallStation.GetInstance.DosingTray2 = true;
-                                    GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，4号桶，{(int)loc}号仓，配料完成");
-                                }
-                            }
-                            if (GVL_SmallStation.GetInstance.DosingTray2 == true && GVL_SmallStation.GetInstance.DosingTray1 == false && GVL_SmallStation.GetInstance.DosingTray2Loc > 0 && GVL_SmallStation.GetInstance.DosingTray2Loc < 16)
-                            {
-                                Thread.Sleep(GVL_SmallStation.Time);
-                                int i = GVL_SmallStation.GetInstance.DosingTray2Loc;
-                                if (RTrig.GetInstance("Tray2StatusDevice" + i).Start(DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3))
-                                {
-                                    MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘2,配方：{recipeName},{i}号仓，配料完成");
-                                    int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
-                                    RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
-                                    bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
-                                    float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight);
-                                    int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
-                                    if (iIndex >= 0)
+                                    if (SiemensDevice.IsConnected && !GVL_SmallStation.GetInstance.IsUseLocalRecipe)
                                     {
-                                        if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
+                                        RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
+                                        RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
+                                        RecipeFinishInfo.Job_No = (short)trayCode;
+                                        for (int i = 0; i < 20; i++)
                                         {
-                                            HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
-                                            MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
-                                            HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
+                                            RecipeFinishInfo.Material[i] = new UDT1();
                                         }
-                                    }
-                                    if (info)
-                                    {
-                                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送成功");
+                                        for (int i = 0; i < 10; i++)
+                                        {
+                                            RecipeFinishInfo.Powder[i] = new UDT2();
+                                        }
+                                        for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
+                                        {
+                                            RecipeFinishInfo.Material[i].Material_Name = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
+                                            RecipeFinishInfo.Material[i].Material_BarrelNum = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
+                                            RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight * (float)0.001;
+                                        }
+                                        for (int i = 0; i < RemoteRecipes.ElementAt(index).WindSend.Count; i++)
+                                        {
+                                            RecipeFinishInfo.Powder[i].Powder_Weight = RemoteRecipes.ElementAt(index).WindSend.ElementAt(i).DosingCompleWeight;
+                                        }
+                                        double a = DateTime.Now.Subtract(GVL_SmallStation.GetInstance.time1).TotalSeconds;
+                                        RecipeFinishInfo.Ask_For_Finish = true;
+                                        RecipeFinishInfo.DosingTime = Convert.ToInt16(a);
+                                        SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
+
+                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据反馈给西门子");
                                     }
                                     else
                                     {
-                                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送失败");
+                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据无法反馈给西门子，西门子设备未连接或处于本地配方");
                                     }
-                                    if (i >= 1 && i <= 8)
+                                    GVL_SmallStation.GetInstance.WindSendDosing = false;
+                                    App.Current.Dispatcher.Invoke(() =>
                                     {
-                                        string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
-                                        MessageNotify.GetInstance.ShowRunLog(commInfo);
-                                    }
-                                    else if (i >= 9 && i <= 15)
-                                    {
-                                        string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
-                                        MessageNotify.GetInstance.ShowRunLog(commInfo1);
-                                    }
-                                    GVL_SmallStation.GetInstance.DosingTray2 = false;
-                                    GVL_SmallStation.GetInstance.DosingTray2Loc = 0;
+                                        Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
+                                    });
+                                    RecipeQueueTray1.TryDequeue(out code);
+                                    HKDevice.HK_PLC_S7.Write("DB3.DBX1.1", false);
+                                    GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
                                 }
                             }
-                            if (RTrig.GetInstance("DB3.DBX1.2").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.2")))
-                            {
-                                var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
-                                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方{res.RecipeName},配料完成");
-                                RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
-                                RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
-                                for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
-                                {
-                                    RecipeFinishInfo.Material[i] = new UDT1();
-                                    RecipeFinishInfo.Material[i].Material_Name = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
-                                    RecipeFinishInfo.Material[i].Material_BarrelNum = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
-                                    RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight;
-                                }
-                                if (SiemensDevice.IsConnected)
-                                {
-                                    RecipeFinishInfo.Ask_For_Finish = true;
-                                    SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
-                                }
-                                App.Current.Dispatcher.Invoke(() =>
-                                {
-                                    Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
-                                });
-                                RecipeQueueTray2.TryDequeue(out code);
-                                HKDevice.HK_PLC_S7.Write("DB3.DBX1.2", false);
-                                GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
-                            }
                         }
                     }
                 }
             }
+            #endregion
+            #region 托盘2配料 ---硬件不具备条件，不使用
+            //if (RecipeQueueTray2.Count > 0 && GVL_SmallStation.GetInstance.Tray2LogicFinish == 2)
+            //{
+            //    int index = Array.FindIndex(RemoteRecipes.ToArray(), p => p.RecipeCode == RecipeQueueTray2.ElementAt(0));
+            //    if (index >= 0 && index < RemoteRecipes.Count)
+            //    {
+            //        string code = RemoteRecipes.ElementAt(index).RecipeCode;
+            //        int trayCode = RemoteRecipes.ElementAt(index).TrayCode;
+            //        string recipeName = RemoteRecipes.ElementAt(index).RecipeName;
+            //        if (trayCode == 2)
+            //        {
+            //            if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 0)
+            //            {
+            //                StockBinInit();
+            //                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，初始化");
+            //                foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
+            //                {
+            //                    HKDevice.StockBinPar((uint)item.RawMaterialBarrelNum, (ushort)item.RawMaterialLocation, 2);
+            //                }
+            //                HKDevice.HK_PLC_S7.Write("DB4.DBX1.4", true);
+            //                GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 1;
+            //                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，下发完成");
+            //            }
+
+            //            if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.4") && GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 1)
+            //            {
+            //                HKDevice.HK_PLC_S7.Write("DB3.DBX1.4", false);
+            //                GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 2;
+            //                MessageNotify.GetInstance.ShowRunLog($"配方：{recipeName}，plc端 配方接收完成");
+            //            }
+            //            if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 2)
+            //            {
+            //                if (RTrig.GetInstance("DB3.DBX50.4").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.4")))
+            //                {
+            //                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD26");
+            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，1号桶，{res}料仓，允许配料");
+            //                    if (res > 0 && res is float loc)
+            //                    {
+            //                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                        double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
+            //                        if (loc_index >= 0)
+            //                        {
+            //                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//根据料仓编号 启动并写入每个原料重量
+            //                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                        }
+            //                        GVL_SmallStation.GetInstance.DosingTray2 = true;
+            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，1号桶，{(int)loc}号仓，配料完成");
+            //                    }
+            //                }
+            //                else if (RTrig.GetInstance("DB3.DBX50.5").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.5")))
+            //                {
+            //                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD30");
+            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，2号桶，{res}料仓，允许配料");
+            //                    if (res > 0 && res is float loc)
+            //                    {
+            //                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                        double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
+            //                        if (loc_index >= 0)
+            //                        {
+            //                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
+            //                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                        }
+            //                        GVL_SmallStation.GetInstance.DosingTray2 = true;
+            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，2号桶，{(int)loc}号仓，配料完成");
+            //                    }
+            //                }
+            //                else if (RTrig.GetInstance("DB3.DBX50.6").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.6")))
+            //                {
+            //                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD34");
+            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，3号桶，{res}料仓，允许配料");
+            //                    if (res > 0 && res is float loc)
+            //                    {
+            //                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                        double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
+            //                        if (loc_index >= 0)
+            //                        {
+            //                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
+            //                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                        }
+            //                        GVL_SmallStation.GetInstance.DosingTray2 = true;
+            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，3号桶，{(int)loc}号仓，配料完成");
+            //                    }
+            //                }
+            //                else if (RTrig.GetInstance("DB3.DBX50.7").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.7")))
+            //                {
+            //                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD38");
+            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，4号桶，{res}料仓，允许配料");
+            //                    if (res > 0 && res is float loc)
+            //                    {
+            //                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+            //                        double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
+            //                        if (loc_index >= 0)
+            //                        {
+            //                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
+            //                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+            //                        }
+            //                        GVL_SmallStation.GetInstance.DosingTray2 = true;
+            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
+            //                        MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，4号桶，{(int)loc}号仓，配料完成");
+            //                    }
+            //                }
+            //                if (GVL_SmallStation.GetInstance.DosingTray2 == true && GVL_SmallStation.GetInstance.DosingTray1 == false && GVL_SmallStation.GetInstance.DosingTray2Loc > 0 && GVL_SmallStation.GetInstance.DosingTray2Loc < 16)
+            //                {
+            //                    Thread.Sleep(GVL_SmallStation.GetInstance.Time);
+            //                    int i = GVL_SmallStation.GetInstance.DosingTray2Loc;
+            //                    if (RTrig.GetInstance("Tray2StatusDevice" + i).Start(DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3))
+            //                    {
+            //                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘2,配方：{recipeName},{i}号仓，配料完成");
+            //                        int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
+            //                        RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
+            //                        bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
+            //                        float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight);
+            //                        int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
+            //                        if (iIndex >= 0)
+            //                        {
+            //                            if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
+            //                            {
+            //                                HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
+            //                                App.Current.Dispatcher.Invoke(() =>
+            //                                {
+            //                                    MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
+            //                                    HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
+            //                                });
+            //                            }
+            //                        }
+            //                        if (info)
+            //                        {
+            //                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送成功");
+            //                        }
+            //                        else
+            //                        {
+            //                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送失败");
+            //                        }
+            //                        if (i >= 1 && i <= 8)
+            //                        {
+            //                            string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
+            //                            MessageNotify.GetInstance.ShowRunLog(commInfo);
+            //                        }
+            //                        else if (i >= 9 && i <= 15)
+            //                        {
+            //                            string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
+            //                            MessageNotify.GetInstance.ShowRunLog(commInfo1);
+            //                        }
+            //                        GVL_SmallStation.GetInstance.DosingTray2 = false;
+            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = 0;
+            //                    }
+            //                }
+            //                if (RTrig.GetInstance("DB3.DBX1.2").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.2")))
+            //                {
+            //                    var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
+            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方{res.RecipeName},配料完成");
+            //                    RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
+            //                    RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
+            //                    for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
+            //                    {
+            //                        RecipeFinishInfo.Material[i] = new UDT1();
+            //                        RecipeFinishInfo.Material[i].Material_Name = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
+            //                        RecipeFinishInfo.Material[i].Material_BarrelNum = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
+            //                        RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight;
+            //                    }
+            //                    if (SiemensDevice.IsConnected)
+            //                    {
+            //                        RecipeFinishInfo.Ask_For_Finish = true;
+            //                        SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
+            //                    }
+            //                    App.Current.Dispatcher.Invoke(() =>
+            //                    {
+            //                        Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
+            //                    });
+            //                    RecipeQueueTray2.TryDequeue(out code);
+            //                    HKDevice.HK_PLC_S7.Write("DB3.DBX1.2", false);
+            //                    GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
+            //                }
+            //            }
+            //        }
+            //    }
+            //}
+            #endregion
         }
         private void StockBinInit()
         {
@@ -1246,24 +1250,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }
         }
-        private void DosingDevice(int Index, int DeviceID)
-        {
-            if (RTrig.GetInstance("Tray2StatusDevice" + DeviceID).Start(DeviceInquire.GetInstance.GetDevice(DeviceID).deviceStatus.RunStatus == 3))
-            {
-                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘2,配方：{RemoteRecipes.ElementAt(Index).RecipeName},{DeviceID}号仓，配料完成");
-                int res = Array.FindIndex(RemoteRecipes.ElementAt(Index).RawMaterial.ToArray(), p => p.RawMaterialLocation == DeviceID);
-                RemoteRecipes.ElementAt(Index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(DeviceID).deviceStatus.CutWeightFeedback;
-                DeviceInquire.GetInstance.GetDevice(DeviceID).StatusReset();
-                if (DeviceID >= 1 && DeviceID <= 8)
-                {
-                    HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (DeviceID - 1), true);
-                }
-                else if (DeviceID >= 9 && DeviceID <= 15)
-                {
-                    HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (DeviceID - 9), true);
-                }
-            }
-        }
         /// <summary>
         /// 料仓的位置和原料名称的对应
         /// </summary>
@@ -1281,23 +1267,212 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }
         }
-        public void plcVarMonitor() 
+        /// <summary>
+        /// PLC的DB3变量列表
+        /// </summary>
+        public void PlcVarMonitor()
         {
             foreach (PropertyInfo item in typeof(PlcReadAddressDB3).GetProperties())
             {
-                CommData.Add(new PlcInfos()
+                if (Attribute.IsDefined(item, typeof(VarCommAttribute)))
                 {
-                    Count = CommData.Count + 1,
-                    Name = item.Name,
-                    Address = GVL_SmallStation.plcReadDataDB3.GetType().GetProperty(item.Name).GetCustomAttribute<PlcCommAttribute>().Address,
-                    Type = item.PropertyType.ToString(),
-                    Describe = GVL_SmallStation.plcReadDataDB3.GetType().GetProperty(item.Name).GetCustomAttribute<PlcCommAttribute>().Describe,
-                    Value = GVL_SmallStation.plcReadDataDB3.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.plcReadDataDB3, null).ToString()
-                });
+                    CommData.Add(new PlcInfos()
+                    {
+                        Count = CommData.Count + 1,
+                        Name = item.Name,
+                        Address = item.GetCustomAttribute<VarCommAttribute>().Address,
+                        Type = item.PropertyType.ToString(),
+                        Describe = item.GetCustomAttribute<VarCommAttribute>().Describe,
+                        Value = item.GetValue(GVL_SmallStation.GetInstance.plcReadDataDB3).ToString(),
+                    });
+                }
+            }
+
+            foreach (PropertyInfo item in typeof(GVL_SmallStation).GetProperties())
+            {
+                if (Attribute.IsDefined(item, typeof(VarCommAttribute)))
+                {
+                    ProcessVar.Add(new PlcInfos()
+                    {
+                        Count = ProcessVar.Count + 1,
+                        Name = item.Name,
+                        Type = item.PropertyType.ToString(),
+                        Address = item.GetCustomAttribute<VarCommAttribute>().Address,
+                        Describe = item.GetCustomAttribute<VarCommAttribute>().Describe,
+                        Value = item.GetValue(GVL_SmallStation.GetInstance).ToString()
+                    });
+                }
             }
         }
         public void RegisterInit() 
         {
+            //手动控制气缸 DB5.DBX0.0~DB5.DBX4.5
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null)
+                {
+                    if (o.ToString().Contains("升降气缸"))
+                    {
+                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
+                        if (index >= 1 && index <= 15)
+                        {
+                            string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
+                            if (index == 8) address = "DB5.DBX0.7";
+                            HKDevice.HK_PLC_S7.Write<bool>(address, true);
+                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：true");
+                        }
+                    }
+                    else if (o.ToString().Contains("阻挡气缸"))
+                    {
+                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
+                        if (index >= 1 && index <= 15)
+                        {
+                            string address = "";
+                            if (index == 1) address = "DB5.DBX1.7";
+                            if (index == 2) address = "DB5.DBX2.0";
+                            if (index == 3) address = "DB5.DBX2.1";
+                            if (index == 4) address = "DB5.DBX2.2";
+                            if (index == 5) address = "DB5.DBX2.3";
+                            if (index == 6) address = "DB5.DBX2.4";
+                            if (index == 7) address = "DB5.DBX2.5";
+                            if (index == 8) address = "DB5.DBX2.6";
+                            if (index == 9) address = "DB5.DBX2.7";
+                            if (index == 10) address = "DB5.DBX3.0";
+                            if (index == 11) address = "DB5.DBX3.1";
+                            if (index == 12) address = "DB5.DBX3.2";
+                            if (index == 13) address = "DB5.DBX3.3";
+                            if (index == 14) address = "DB5.DBX3.4";
+                            if (index == 15) address = "DB5.DBX3.5";
+                            HKDevice.HK_PLC_S7.Write<bool>(address, true);
+                        }
+                    }
+                    else if (o.ToString().Contains("进料桶顶升气缸"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.6", false);//默认顶升
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：false");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.7", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：true");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.0", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：true");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸3"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.1", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：true");
+                    }
+                    else if (o.ToString().Contains("托盘气缸1_1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.2", false);//默认伸出
+                    }
+                    else if (o.ToString().Contains("托盘气缸1_2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.3", false);
+                    }
+                    else if (o.ToString().Contains("托盘气缸2_1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.4", false);
+                    }
+                    else if (o.ToString().Contains("托盘气缸2_2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.5", false);
+                    }
+                }
+            }), "ManualOpen", true);//根据下发的配方ID将 托盘的位置信息添加到配方中
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null)
+                {
+                    if (o.ToString().Contains("升降气缸"))
+                    {
+                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
+                        if (index >= 1 && index <= 15)
+                        {
+                            string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
+                            if (index == 8) address = "DB5.DBX0.7";
+                            HKDevice.HK_PLC_S7.Write<bool>(address, false);
+                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：false");
+                        }
+                    }
+                    else if (o.ToString().Contains("阻挡气缸"))
+                    {
+                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
+                        if (index >= 1 && index <= 15)
+                        {
+                            string address = "";
+                            if (index == 1) address = "DB5.DBX1.7";
+                            if (index == 2) address = "DB5.DBX2.0";
+                            if (index == 3) address = "DB5.DBX2.1";
+                            if (index == 4) address = "DB5.DBX2.2";
+                            if (index == 5) address = "DB5.DBX2.3";
+                            if (index == 6) address = "DB5.DBX2.4";
+                            if (index == 7) address = "DB5.DBX2.5";
+                            if (index == 8) address = "DB5.DBX2.6";
+                            if (index == 9) address = "DB5.DBX2.7";
+                            if (index == 10) address = "DB5.DBX3.0";
+                            if (index == 11) address = "DB5.DBX3.1";
+                            if (index == 12) address = "DB5.DBX3.2";
+                            if (index == 13) address = "DB5.DBX3.3";
+                            if (index == 14) address = "DB5.DBX3.4";
+                            if (index == 15) address = "DB5.DBX3.5";
+                            HKDevice.HK_PLC_S7.Write<bool>(address, false);
+                        }
+                    }
+                    else if (o.ToString().Contains("进料桶顶升气缸"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.6", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：true");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.7", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：false");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.0", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：false");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸3"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.1", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：false");
+                    }
+                    else if (o.ToString().Contains("托盘气缸1_1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.2", true);
+                    }
+                    else if (o.ToString().Contains("托盘气缸1_2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.3", true);
+                    }
+                    else if (o.ToString().Contains("托盘气缸2_1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.4", true);
+                    }
+                    else if (o.ToString().Contains("托盘气缸2_2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.5", true);
+                    }
+                }
+            }), "ManualClose", true);//根据下发的配方ID将 托盘的位置信息添加到配方中
+            //手动控制电机轴 DB5.DBX4.6~DB5.DBX5.2
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", true); }), "StartAxisLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", false); }), "StopAxisLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", true); }), "StartAxisMidCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", false); }), "StopAxisMidCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", true); }), "StartAxisUnLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", false); }), "StopAxisUnLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", true); }), "StartAxis1Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", false); }), "StopAxis1Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", true); }), "StartAxis2Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", false); }), "StopAxis2Command", true);
+
             //西门子配方处理
             ActionManage.GetInstance.Register(new Action<object>((res) =>
             {
@@ -1385,15 +1560,17 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             //                RecipeFinishInfo.Powder[i].Powder_Name = recipe.RawMaterial.ElementAt(i).RawMaterialName;
             //                RecipeFinishInfo.Powder[i].Powder_Weight = recipe.RawMaterial.ElementAt(i).Laying_Off_Weight;
             //            }
-            //            if (GVL_SmallStation.SiemensSendRecipeStatus == 6)
+            //            if (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus == 6)
             //            {
-            //                GVL_SmallStation.SiemensSendRecipeStatus = 7;
+            //                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 7;
             //                RecipeFinishInfo.Ask_For_Finish = true;
             //                SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
             //            }
             //        }
             //    }
             }), "SiemensRecipeFinish", true);
+
+            //将本地配方发送到西门子配方里，执行配料
             ActionManage.GetInstance.Register(new Action<Object>((res) =>
             {
                 if (res != null && res is RemoteRecipeData recipe)
@@ -1401,12 +1578,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     Json<RemoteRecipeDataColl>.Data.Recipes.Add(recipe);
                 }
             }), "LocalSimulationRecipeIssue", true);
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
-                GVL_SmallStation.SiemensSendRecipeStatus = 0;
-                MessageNotify.GetInstance.ShowRunLog("系统流程复位，等待西门子重新下发订单");
-            }), "BPASystemReset", true);
+            
             //手动控制系统模式
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", true); }), "SystemStart", true);
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", false); }), "SystemStop", true);
@@ -1418,37 +1590,78 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.3", true); }), "ManualSystemReset", true);
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.4", true); }), "CLearRecipeInfo", true);
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX0.7", true); }), "AGVPutTrayFinish", true);
-            //手动控制电机轴
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", true); }), "StartAxisLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", false); }), "StopAxisLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", true); }), "StartAxisMidCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", false); }), "StopAxisMidCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", true); }), "StartAxisUnLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", false); }), "StopAxisUnLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", true); }), "StartAxis1Command", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", false); }), "StopAxis1Command", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", true); }), "StartAxis2Command", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", false); }), "StopAxis2Command", true);
+            ActionManage.GetInstance.Register(new Action(() =>
+            {
+                Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
+                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
+
+                GVL_SmallStation.GetInstance.Order_Cancel = false;
+                GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
+                GVL_SmallStation.GetInstance.OrderCancelStep = 0;
+
+                RecipeQueueTray1.Clear();
+                RecipeQueueTray2.Clear();
+                GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
+                GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
+                GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
+                GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;
+                StockBinInit(); 
+                MessageNotify.GetInstance.ShowRunLog("系统流程复位，等待西门子重新下发订单");
+            }), "BPASystemReset", true);
+
+            //往海科PLC写值
+            ActionManage.GetInstance.Register(new Action<Object>((o) => 
+            {
+                if (o != null && o is HKDeviceWrite data) 
+                {
+                    if (data.PlcVarType == PlcVarType.Bool) 
+                    {
+                        bool value = (bool)data.Value;
+                        HKDevice.HK_PLC_S7.Write<bool>(data.Address , value);
+                    }
+                    else if (data.PlcVarType == PlcVarType.Byte)
+                    {
+                        byte value = (byte)data.Value;
+                        HKDevice.HK_PLC_S7.Write<byte>(data.Address, value);
+                    }
+                    else if (data.PlcVarType == PlcVarType.Int)
+                    {
+                        short value = (short)data.Value;
+                        HKDevice.HK_PLC_S7.Write<short>(data.Address, value);
+                    }
+                    else if (data.PlcVarType == PlcVarType.Dint)
+                    {
+                        int value = (int)data.Value;
+                        HKDevice.HK_PLC_S7.Write<int>(data.Address, value);
+                    }
+                    else if (data.PlcVarType == PlcVarType.Real)
+                    {
+                        float value = (float)data.Value;
+                        HKDevice.HK_PLC_S7.Write<float>(data.Address, value);
+                    }
+                }
+            }), "PLCWrite", true);
+
             //电机速度
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
                 if (o != null && o is short value)
                 {
-                    HKDevice.HK_PLC_S7.Write("DB47.DBD8", value);
+                    HKDevice.HK_PLC_S7.Write("DB47.DBW8", value);
                 }
             }), "AxisLoadSpeedSet", true);
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
                 if (o != null && o is short value)
                 {
-                    HKDevice.HK_PLC_S7.Write("DB47.DBD10", value);
+                    HKDevice.HK_PLC_S7.Write("DB47.DBW10", value);
                 }
             }), "AxisMidSpeedSet", true);
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
                 if (o != null && o is short value)
                 {
-                    HKDevice.HK_PLC_S7.Write("DB47.DBD12", value);
+                    HKDevice.HK_PLC_S7.Write("DB47.DBW12", value);
                 }
             }), "AxisUnLoadSpeedSet", true);
             ActionManage.GetInstance.Register(new Action<object>((o) =>
@@ -1466,7 +1679,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }), "Axis2SpeedSet", true);
 
-
+            //机器人的操作
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
                 if (o != null && o is string address)
@@ -1581,5 +1794,88 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 Thread.Sleep(50);
             }), "设备连接", true);
         }
+
+        private void DosingDevice(int Index, int DeviceID)
+        {
+            if (RTrig.GetInstance("Tray2StatusDevice" + DeviceID).Start(DeviceInquire.GetInstance.GetDevice(DeviceID).deviceStatus.RunStatus == 3))
+            {
+                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘2,配方：{RemoteRecipes.ElementAt(Index).RecipeName},{DeviceID}号仓，配料完成");
+                int res = Array.FindIndex(RemoteRecipes.ElementAt(Index).RawMaterial.ToArray(), p => p.RawMaterialLocation == DeviceID);
+                RemoteRecipes.ElementAt(Index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(DeviceID).deviceStatus.CutWeightFeedback;
+                DeviceInquire.GetInstance.GetDevice(DeviceID).StatusReset();
+                if (DeviceID >= 1 && DeviceID <= 8)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (DeviceID - 1), true);
+                }
+                else if (DeviceID >= 9 && DeviceID <= 15)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (DeviceID - 9), true);
+                }
+            }
+        }
+        public void RawMaterialNameWithCode()
+        {
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.Clear();
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0001", "色拉油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0002", "一级菜油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0003", "菜籽油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0004", "青花椒油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0005", "卤牛肉丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0006", "冻鸡肉丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0007", "香菇丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0008", "高水分糍粑海椒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0009", "低水分糍粑海椒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0010", "辣豆瓣");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0011", "整豆豉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0012", "豆豉细粒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0013", "卤黄豆");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0014", "野山椒粒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0015", "竹笋丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0016", "香辣酱辣椒酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0017", "芽菜粒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0018", "榨菜丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0019", "盐菜");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0020", "洋葱丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0021", "番茄酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0022", "甜豆瓣");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0023", "甜面酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0024", "芝麻酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0025", "炸花生");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0026", "盐渍青椒丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0027", "备料剁红椒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0028", "萝卜丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0029", "油芝麻");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0030", "生姜");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0031", "大蒜");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0032", "榨菜酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0033", "炸碗豆");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0034", "大头菜丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0035", "酱油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0036", "I+G");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0037", "味精");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0038", "白糖");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0039", "食盐");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0040", "花椒酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0041", "调味膏2");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0042", "调味膏5");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0043", "十三香调味膏");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0044", "酱香膏");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0045", "芽菜香料粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0046", "香料Ａ");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0047", "香料Ｄ");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0048", "猪肉精膏");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0049", "调味膏3");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0050", "柠檬酸粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0051", "辣椒红");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0052", "辣椒油树脂");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0053", "水态混和酸");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0054", "加水稀释后防腐剂");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0055", "异维Ｃ钠粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0056", "琼脂粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0057", "香葱油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0058", "水态甜味剂");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0059", "孜然粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0060", "孜然油");
+        }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
index 382c3ef4..22963a6b 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
@@ -52,7 +52,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         BottomDeviceCurrentStatuses.ElementAt(BottomIndex).DeviceNum = DeviceLists.ElementAt(i).Value.deviceStatus.DeviceNum;
                         BottomDeviceCurrentStatuses.ElementAt(BottomIndex).RunStatus = DeviceLists.ElementAt(i).Value.deviceStatus.RunStatus;
                     }
-
                     int deviceIndex = Array.FindIndex(devices.ToArray(), p => p.IpAddress == DeviceLists.ElementAt(i).Key && p.DeviceName != DeviceLists.ElementAt(i).Value.DeviceName);
                     if (deviceIndex >= 0 && deviceIndex < devices.Count)
                     {
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs
index ad7a8237..c8facaf5 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs
@@ -7,6 +7,7 @@ using Microsoft.Toolkit.Mvvm.ComponentModel;
 using System.Collections.ObjectModel;
 using BPASmartClient.JXJFoodSmallStation.Model.Par;
 using BPASmartClient.JXJFoodSmallStation.Model.RawMaterial;
+using BPASmartClient.JXJFoodSmallStation.Model.Bom;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model
 {
@@ -17,6 +18,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         private ConnectParMode _mdeviceConnectPar = new ConnectParMode();
         public ObservableCollection<RawMaterialStockBin> rawMaterialStockBin { get; set; } = new ObservableCollection<RawMaterialStockBin>();
         public ObservableCollection<WindSendRawMaterial> windSendRawMaterial { get; set; } = new ObservableCollection<WindSendRawMaterial>();
+        public ObservableCollection<BomMaterial> BomMaterial { get; set; } = new ObservableCollection<BomMaterial>();
 
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs
index 825041db..5c2c6cea 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs
@@ -29,13 +29,13 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.Siemens
                     //var DataColl = this.Siemens_PLC_S7.ReadClass<XL_DataColl_DB>(2291);
                     if (Start != null && Start is XL_Start_DB st)
                     {
-                        switch (GVL_SmallStation.SiemensSendRecipeStatus) 
+                        switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus) 
                         {
                             case 0:
-                                if (GVL_SmallStation.IsAllowSiemensSendRecipe)
+                                if (GVL_SmallStation.GetInstance.IsAllowSiemensSendRecipe)
                                 {
                                     this.Siemens_PLC_S7.Write("DB2201.DBX450.0", true);
-                                    GVL_SmallStation.SiemensSendRecipeStatus = 1;
+                                    GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 1;
                                 }
                                 break;
                             case 1:
@@ -43,7 +43,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.Siemens
                                 {
                                     if (!string.IsNullOrEmpty(st.RecipeCode))
                                     {
-                                        GVL_SmallStation.SiemensSendRecipeStatus = 2;
+                                        GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 2;
                                         ActionManage.GetInstance.Send("SiemensRecipeRecive", st);
                                         this.Siemens_PLC_S7.Write("DB2201.DBX450.0", false);
                                     }
@@ -52,23 +52,23 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.Siemens
                             case 2:
                                 if (Start.Order_Request_ACK == false)
                                 {
-                                    GVL_SmallStation.IsAllowSiemensSendRecipe = false;
-                                    GVL_SmallStation.SiemensSendRecipeStatus = 3;
+                                    GVL_SmallStation.GetInstance.IsAllowSiemensSendRecipe = false;
+                                    GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 3;
                                 }
                                 break;
                         }
                         if (RTrig.GetInstance("Order_Cancel").Start(st.Order_Cancel)) //订单取消
                         {
-                            if (GVL_SmallStation.Order_Cancel == false)
+                            if (GVL_SmallStation.GetInstance.Order_Cancel == false)
                             {
-                                GVL_SmallStation.Order_Cancel = true;
-                                GVL_SmallStation.Order_CancelRecipeCode = st.RecipeCode;
-                                GVL_SmallStation.OrderCancelStep = 0;
+                                GVL_SmallStation.GetInstance.Order_Cancel = true;
+                                GVL_SmallStation.GetInstance.Order_CancelRecipeCode = st.RecipeCode;
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 0;
                                 MessageNotify.GetInstance.ShowRunLog($"西门子下发取消工单指令:{st.RecipeName}");
                             }
                             else 
                             {
-                                MessageNotify.GetInstance.ShowRunLog($"订单正在取消,请等待订单{ GVL_SmallStation.Order_CancelRecipeCode}取消完成，再取消订单:{st.RecipeName}");
+                                MessageNotify.GetInstance.ShowRunLog($"订单正在取消,请等待订单{ GVL_SmallStation.GetInstance.Order_CancelRecipeCode}取消完成，再取消订单:{st.RecipeName}");
                             }
                         }
                     }
@@ -101,6 +101,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.Siemens
                         XL_Status = state;
                     }
 
+                    //从海科plc的数采 发送给西门子plc
                     var res = ProcessControl.GetInstance.HKDevice.DeviceStatus;
                     if (res != null)
                     {
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
index ce06670e..2d24260c 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
@@ -27,15 +27,15 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     var res1 = this.Siemens_PLC_S7.ReadClass<WindSend_Read>(94);
                     if (res1 != null && res1 is WindSend_Read readData)
                     {
-                        GVL_SmallStation.WindSendAllowAGVPutGet = readData.HoodLiftInPlace;
-                        Siemens_PLC_S7.Write<bool>("DB95.DBX38.2", GVL_SmallStation.Station1HaveTray);//工站1有托盘
+                        GVL_SmallStation.GetInstance.WindSendAllowAGVPutGet = readData.HoodLiftInPlace;
+                        Siemens_PLC_S7.Write<bool>("DB95.DBX38.2", GVL_SmallStation.GetInstance.Station1HaveTray);//工站1有托盘
                         if (res1.RecipeReceiveFinish)
                         {
                             Siemens_PLC_S7.Write<bool>("DB95.DBX38.0", false);
                         }
                         if (RTrig.GetInstance("CurrentCompleteSign").Start(readData.CurrentCompleteSign))
                         {
-                            GVL_SmallStation.WindSendDosingComple = true;
+                            GVL_SmallStation.GetInstance.WindSendDosingComple = true;
                             Siemens_PLC_S7.Write("DB95.DBX38.1", true);
                         }
                         if (TTrig.GetInstance("CurrentCompleteSign").Start(readData.CurrentCompleteSign))
@@ -108,6 +108,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     }
                     Thread.Sleep(10);*/
                 }
+                Thread.Sleep(10);
             }),"监听粉料数据",true);
             
         }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs
index 8878fd96..7d48cee8 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs
@@ -16,10 +16,10 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         private int _mLocation;
 
         public string RawMaterialChineseName { get { return _mRawMaterialChineseName; } set { _mRawMaterialChineseName = value; OnPropertyChanged(); } }
-        private string _mRawMaterialChineseName;
+        private string _mRawMaterialChineseName = "";
 
         public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } }
-        private string _mRawMaterialName;
+        private string _mRawMaterialName = "";
         /// <summary>
         /// 需要原料重量
         /// </summary>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml b/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml
new file mode 100644
index 00000000..a3b512d6
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml
@@ -0,0 +1,250 @@
+<UserControl x:Class="BPASmartClient.JXJFoodSmallStation.View.BomOfMaterialView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+            xmlns:con="clr-namespace:BPASmartClient.JXJFoodSmallStation.Converter"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920">
+    <UserControl.DataContext>
+        <vm:BomOfMaterialViewModel />
+    </UserControl.DataContext>
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="tabColor" Color="#FF2AB2E7" />
+        <!--<SolidColorBrush x:Key="bordColor" Color="#33ffffff" />-->
+        <SolidColorBrush x:Key="bordColor" Color="#332AB2E7" />
+        <con:DataTableRedundantConverter x:Key="tabConvert" />
+
+        <Style x:Key="RowRadioButtonStyle" TargetType="{x:Type RadioButton}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type RadioButton}">
+                        <Border
+                            x:Name="NvaBor"
+                            Background="Transparent"
+                            BorderBrush="#FF2AB2E7"
+                            BorderThickness="0">
+                            <ContentControl
+                                Margin="10,4"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Content="{TemplateBinding Content}"
+                                FontSize="16" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
+                                <Setter TargetName="NvaBor" Property="BorderThickness" Value="0" />
+                            </Trigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsChecked" Value="false" />
+                                    <Condition Property="IsMouseOver" Value="True" />
+                                </MultiTrigger.Conditions>
+                                <MultiTrigger.Setters>
+                                    <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
+                                </MultiTrigger.Setters>
+                            </MultiTrigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="InputTextboxStyle" TargetType="TextBox">
+            <Setter Property="Margin" Value="5,0,0,0" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="Width" Value="150" />
+            <Setter Property="Height" Value="40" />
+            <Setter Property="CaretBrush" Value="{StaticResource TitleBorderColor}" />
+            <Setter Property="Foreground" Value="{StaticResource TitleBorderColor}" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="14" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+
+        <Style x:Key="ControlButtonStyle" TargetType="Button">
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="Foreground" Value="#FFF53F62" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+            <Setter Property="FontFamily" Value="楷体" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border
+                            Name="TitleBarBr"
+                            BorderBrush="#00c2f4"
+                            BorderThickness="0"
+                            CornerRadius="0"
+                            Opacity="0.8">
+
+                            <ContentPresenter
+                                Margin="{TemplateBinding Margin}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                            <Border.Background>
+                                <ImageBrush
+                                    ImageSource="/BPASmartClient.CustomResource;component/Image/组合边框1.1.png"
+                                    Opacity="0.8"
+                                    Stretch="Fill" />
+                            </Border.Background>
+
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="TitleBarBr" Property="Opacity" Value="1" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="TitleTextblockStyle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="16" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Foreground" Value="{StaticResource tabColor}" />
+            <Setter Property="FontFamily" Value="楷体" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+        </Style>
+
+    </UserControl.Resources>
+    
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="60" />
+            <RowDefinition Height="40" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <!--#region 表格标题栏设置-->
+        <Grid>
+            <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                <Button
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding GetBomMaterialData}"
+                    Content="拉取本地数据"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource ImageButtonStyle}" />
+                <Button
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding DeleteAllMaterial}"
+                    Content="删除所有数据"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource ImageButtonStyle}" />
+                <Button
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding AddMaterial}"
+                    Content="新增数据"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource ImageButtonStyle}" />
+                <Button
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding SaveMaterials}"
+                    Content="保存参数"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource ImageButtonStyle}" />
+            </StackPanel>
+            
+        </Grid>
+        <Grid
+            Grid.Row="1"
+            Margin="0,10,0,0"
+            Background="#ff0C255F">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid Grid.Column="0">
+                <TextBlock  Text="序号" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"/>
+                <!--<Border BorderThickness="1,1,1,1" Cursor="SizeWE" 
+                    BorderBrush="{StaticResource bordColor}"  />-->
+            </Grid>
+            <TextBlock  Grid.Column="1" FontSize="24" Text="原料编号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <TextBlock  Grid.Column="2" FontSize="24" Text="原料名称" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <TextBlock  Grid.Column="3" FontSize="24" Text="操作" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+        </Grid>
+        <Grid Grid.Row="2">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Visible"  >
+                <ItemsControl ItemsSource="{Binding RawMaterialInfo}" Foreground="Aqua">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid Name="gr" >
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Grid Grid.Column="0" Margin="5">
+                                    <TextBlock
+                                        FontSize="16"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding Count}" />
+                                </Grid>
+                                <Grid Grid.Column="1" Margin="5">
+                                    <TextBox
+                                        Width="50"
+                                        FontSize="16"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center" 
+                                        Text="{Binding MaterialCode}" />
+                                </Grid>
+                                <Grid Grid.Column="2" Margin="5">
+                                    <TextBox
+                                        Width="200"
+                                        FontSize="16"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center" 
+                                        Text="{Binding MaterialName}" />
+                                </Grid>
+                                <Grid Grid.Column="3" Margin="5">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                        <pry:IcoButton
+                                            Margin="3,4,4,0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Background="#11F53F62"
+                                            BorderThickness="0"
+                                            Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                            CommandParameter="{Binding Count}"
+                                            Content="删除"
+                                            EnterBackground="#22F53F62"
+                                            Foreground="#FFF53F62"
+                                            IcoText="&#xe68e;"
+                                            Style="{StaticResource IcoButtonStyle}" />
+                                    </StackPanel>
+                                </Grid>
+                            </Grid>
+                            
+                            <DataTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                </Trigger>
+                            </DataTemplate.Triggers>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml.cs
new file mode 100644
index 00000000..a36f05ed
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.JXJFoodSmallStation.View
+{
+    /// <summary>
+    /// HKPlcCommMonitor.xaml 的交互逻辑
+    /// </summary>
+    public partial class BomOfMaterialView : UserControl
+    {
+        public BomOfMaterialView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
index 2c2a6d12..45257ee7 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
@@ -9,8 +9,9 @@
              d:DesignHeight="1080" d:DesignWidth="1920">
     <UserControl.DataContext>
         <vm:ManualFlowViewModel />
+
     </UserControl.DataContext>
-    
+
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="100" />
@@ -23,7 +24,7 @@
                 <Button
                     Width="200"
                     Height="40"
-                    Margin="5,0,5,0"
+                    Margin="5"
                     Command="{Binding Test1Command}"
                     Content="AGV送托盘完成"
                     FontSize="20"
@@ -32,7 +33,7 @@
                 <Button
                     Width="200"
                     Height="40"
-                    Margin="5,0,5,0"
+                    Margin="5"
                     Command="{Binding Test2Command}"
                     Content="粉料仓配料完成"
                     FontSize="20"
@@ -41,7 +42,7 @@
                 <Button
                     Width="200"
                     Height="40"
-                    Margin="5,0,5,0"
+                    Margin="5"
                     Command="{Binding Test3Command}"
                     Content="AGV取托盘完成"
                     FontSize="20"
@@ -50,7 +51,7 @@
                 <Button
                     Width="200"
                     Height="40"
-                    Margin="5,0,5,0"
+                    Margin="5"
                     Command="{Binding Test4Command}"
                     Content="气缸收紧错位复位"
                     FontSize="20"
@@ -59,7 +60,7 @@
                 <Button
                     Width="200"
                     Height="40"
-                    Margin="5,0,5,0"
+                    Margin="5"
                     Command="{Binding Test5Command}"
                     Content="粉料仓提升到位"
                     FontSize="20"
@@ -68,7 +69,7 @@
                 <Button
                     Width="200"
                     Height="40"
-                    Margin="5,0,5,0"
+                    Margin="5"
                     Command="{Binding Test6Command}"
                     Content="AGV放货架流程完成"
                     FontSize="20"
@@ -77,15 +78,12 @@
                 <Button
                     Width="200"
                     Height="40"
-                    Margin="50,0,50,0"
+                    Margin="5"
                     Command="{Binding BPAResetCommand}"
                     Content="上位机初始化"
                     FontSize="20"
-                    Panel.ZIndex="0"
                     Style="{StaticResource ImageButtonStyle}"></Button>
             </StackPanel>
-            
-           
         </Grid>
         <Grid Grid.Row="1">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center">
@@ -103,7 +101,7 @@
                     Height="40"
                     Margin="5,0,5,0"
                     Command="{Binding CLearRecipeInfo}"
-                    Content="配方清零"
+                    Content="PLC配方清零"
                     FontSize="20"
                     Panel.ZIndex="0"
                     Style="{StaticResource ImageButtonStyle}"></Button>
@@ -114,10 +112,10 @@
         <Grid Grid.Row="2">
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition></RowDefinition>
@@ -127,17 +125,25 @@
                     <RowDefinition></RowDefinition>
                 </Grid.RowDefinitions>
 
-                <WrapPanel>
-                    <TextBlock Text="心跳：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                <WrapPanel Grid.Column="1">
+                    <TextBlock Text="海科plc心跳：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
                     <TextBlock Text="{Binding Heartbeat}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
                 </WrapPanel>
-                <WrapPanel Grid.Row="1">
+                <WrapPanel Grid.Row="0">
+                    <TextBlock Text="西门子 连接状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding SiemensIsConnect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="海科plc连接状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding HKPlcIsConnect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock Text="风送plc连接状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding WindSendIsConnect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
+                <WrapPanel Grid.Row="2">
                     <TextBlock Text="当前下发配方状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
                     <TextBlock Text="{Binding OrderStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
                     <TextBlock Text="当前配料状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
                     <TextBlock Text="{Binding OrderDosingStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
                 </WrapPanel>
-                <WrapPanel Grid.Row="2">
+                <WrapPanel Grid.Row="4">
                     <TextBlock Text="柔性味魔方配料完成，延迟复位时间：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
                     <TextBox Text="{Binding time}" Width="150"  HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBox>
                     <TextBlock Text="ms" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
@@ -151,6 +157,11 @@
                         Panel.ZIndex="0"
                         Style="{StaticResource ImageButtonStyle}"></Button>
                 </WrapPanel>
+
+                <WrapPanel Grid.Column="1" Grid.Row="2">
+                    <TextBlock Text="配料情况：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Text="{Binding DosingComplete}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                </WrapPanel>
             </Grid>
         </Grid>
     </Grid>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml.cs
index ad990fd8..3ea0ccf0 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml.cs
@@ -24,5 +24,10 @@ namespace BPASmartClient.JXJFoodSmallStation.View
         {
             InitializeComponent();
         }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml b/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
index f5cb142b..767e68be 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
@@ -55,7 +55,7 @@
                     <ItemsControl ItemsSource="{Binding plcInfos}" Foreground="Aqua">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
-                                <Grid>
+                                <Grid Name="gr">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="3*"></ColumnDefinition>
                                         <ColumnDefinition Width="8*"></ColumnDefinition>
@@ -89,6 +89,11 @@
                                         <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
                                     </Grid>
                                 </Grid>
+                                <DataTemplate.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="true">
+                                        <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                    </Trigger>
+                                </DataTemplate.Triggers>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml
new file mode 100644
index 00000000..b671f871
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml
@@ -0,0 +1,90 @@
+<UserControl x:Class="BPASmartClient.JXJFoodSmallStation.View.ProcessMonitorView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:BPASmartClient.JXJFoodSmallStation.View"
+             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920">
+    <UserControl.DataContext>
+        <vm:ProcessMonitorViewModel />
+    </UserControl.DataContext>
+    <Border BorderThickness="0" BorderBrush="{StaticResource bordColor}">
+        <Grid Margin="0,10">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="60"></RowDefinition>
+                <RowDefinition></RowDefinition>
+            </Grid.RowDefinitions>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*"></ColumnDefinition>
+                    <ColumnDefinition Width="4*"></ColumnDefinition>
+                    <ColumnDefinition Width="4*"></ColumnDefinition>
+                    <ColumnDefinition Width="14*"></ColumnDefinition>
+                    <ColumnDefinition Width="4*"></ColumnDefinition>
+                    <ColumnDefinition Width="17"></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid>
+                    <TextBlock Text="序号" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+                <Grid Grid.Column="1">
+                    <TextBlock Text="名称" FontSize="32"  HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+                <Grid Grid.Column="2">
+                    <TextBlock Text="类型" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+                <Grid Grid.Column="3">
+                    <TextBlock Text="描述" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+                <Grid Grid.Column="4">
+                    <TextBlock Text="当前值" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                </Grid>
+            </Grid>
+            <Grid Grid.Row="1">
+                <ScrollViewer>
+                    <ItemsControl ItemsSource="{Binding plcInfos}" Foreground="Aqua">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="2*"></ColumnDefinition>
+                                        <ColumnDefinition Width="4*"></ColumnDefinition>
+                                        <ColumnDefinition Width="4*"></ColumnDefinition>
+                                        <ColumnDefinition Width="14*"></ColumnDefinition>
+                                        <ColumnDefinition Width="4*"></ColumnDefinition>
+                                    </Grid.ColumnDefinitions>
+                                    <Grid>
+                                        <TextBlock  Margin="5" Text="{Binding Count}" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                    <Grid Grid.Column="1">
+                                        <TextBlock  Margin="5" Text="{Binding Name}" FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                    <Grid Grid.Column="2">
+                                        <TextBlock Margin="5"  Text="{Binding Type}" FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                    <Grid Grid.Column="3">
+                                        <TextBlock  Margin="5" Text="{Binding Describe}" FontSize="14" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                    <Grid Grid.Column="4">
+                                        <TextBlock Margin="5" Text="{Binding Value}" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
+                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                    </Grid>
+                                </Grid>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </ScrollViewer>
+            </Grid>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml.cs
new file mode 100644
index 00000000..f9bf69f3
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.JXJFoodSmallStation.View
+{
+    /// <summary>
+    /// ProcessMonitorView.xaml 的交互逻辑
+    /// </summary>
+    public partial class ProcessMonitorView : UserControl
+    {
+        public ProcessMonitorView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
index 37d65ea5..d670c417 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
@@ -49,17 +49,33 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+            <CheckBox
+                x:Name="AskRecipeFormSiemens"
+                Margin="0,0,10,0"
+                Content="向西门子请求订单"
+                FontFamily="楷体"
+                VerticalAlignment="Center"
+                Foreground="Aqua"
+                IsChecked="{Binding AskRecipeFormSiemens}" />
+            <CheckBox
+                x:Name="NotUseSmallDosing"
+                Margin="0,0,10,0"
+                Content="不使用小料仓配料"
+                FontFamily="楷体"
+                VerticalAlignment="Center"
+                Foreground="Aqua"
+                IsChecked="{Binding NotUseSmallDosing}" />
             <CheckBox
                 x:Name="IsUseWindSend"
                 Margin="0,0,10,0"
-                Content="使用粉料仓配料模拟"
+                Content="使用粉料仓配料"
                 FontFamily="楷体"
                 VerticalAlignment="Center"
                 Foreground="Aqua"
                 IsChecked="{Binding IsUseWindSendDosing}" />
             <CheckBox
                 x:Name="IsUseStockBin"
-                Content="本地小料仓配方模拟"
+                Content="本地小料仓配方配料"
                 FontFamily="楷体"
                 VerticalAlignment="Center"
                 Foreground="Aqua"
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml.cs
index 468cf30e..8e820597 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml.cs
@@ -25,8 +25,10 @@ namespace BPASmartClient.JXJFoodSmallStation.View
         public RecipeReceiveView()
         {
             InitializeComponent();
+            this.AskRecipeFormSiemens.Click += (o, e) => { GVL_SmallStation.GetInstance.RequestOrder = (bool)AskRecipeFormSiemens.IsChecked; };
             this.IsUseWindSend.Click += (o, e) => { GVL_SmallStation.GetInstance.IsUseWindSend = (bool)IsUseWindSend.IsChecked; };
             this.IsUseStockBin.Click += (o, e) => { GVL_SmallStation.GetInstance.IsUseLocalRecipe = (bool)IsUseStockBin.IsChecked; };
+            this.NotUseSmallDosing.Click += (o, e) => { GVL_SmallStation.GetInstance.NotUseSmallDosing = (bool)NotUseSmallDosing.IsChecked; };
         }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
index 2916d04d..3f88eec8 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
@@ -180,11 +180,9 @@
                 </Grid>
                 <Button
                     Grid.Row="2"
-                    Grid.ColumnSpan="2"
-                    Margin="20,15"
+                    Margin="20,5"
                     Command="{Binding TestRobotRun}"
                     Content="测试抓桶程序"
-                    Width="300"
                     FontSize="32"
                     Style="{StaticResource ImageButtonStyle}"></Button>
             </Grid>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml b/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml
index 87c2680a..6da027df 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml
@@ -20,20 +20,22 @@
         <!--#region 表格标题栏设置-->
         <Grid>
             <StackPanel HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
-                <pry:IcoButton
-                    Margin="10"
+                <Button
+                    Height="50"
+                    Margin="5"
                     Command="{Binding UpdateRawMaterial}"
                     Content="新增数据"
                     FontSize="28"
                     Foreground="Aqua"
-                    Style="{StaticResource IcoButtonStyle}" />
-                <pry:IcoButton
-                    Margin="10"
+                    Style="{StaticResource ImageButtonStyle}"  />
+                <Button
+                    Height="50"
+                    Margin="5"
                     Command="{Binding SaveRawMaterialPara}"
                     Content="保存参数"
                     FontSize="28"
                     Foreground="Aqua"
-                    Style="{StaticResource IcoButtonStyle}" />
+                    Style="{StaticResource ImageButtonStyle}"/>
             </StackPanel>
             
         </Grid>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml b/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml
index 4937284d..85e2a6f7 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml
@@ -101,18 +101,18 @@
                                 </Grid>
                                 <Grid Grid.Column="2" Margin="5">
                                     <TextBox
+                                        Name="name"
                                         Width="50"
                                         FontSize="16"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center" 
-                                        Text="{Binding  RawMaterialName}" />
+                                        Text="{Binding  RawMaterialName}"/>
                                     <Border
                                         BorderThickness="1,0,1,0"
                                         Cursor="SizeWE"  />
                                 </Grid>
                                 <Grid Grid.Column="3" Margin="5">
-                                    <TextBox
-                                        Width="50"
+                                    <TextBlock
                                         FontSize="16"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center" 
diff --git a/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml.cs
index df3cdaa9..72705aca 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.JXJFoodSmallStation.Model;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs
new file mode 100644
index 00000000..6d957daf
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs
@@ -0,0 +1,85 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.Helper;
+using BPASmartClient.JXJFoodSmallStation.Model;
+using BPASmartClient.JXJFoodSmallStation.Model.Bom;
+using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.ViewModel
+{
+    public class BomOfMaterialViewModel : ObservableObject
+    {
+        public BomOfMaterialViewModel()
+        {
+            RawMaterialInfo = Json<DevicePar>.Data.BomMaterial;
+            AddMaterial = new RelayCommand(() => 
+            {
+                RawMaterialInfo.Add(new BomMaterial() 
+                {
+                    Count = Json<DevicePar>.Data.BomMaterial.Count +1 ,
+                });
+            });
+            SaveMaterials = new RelayCommand(() =>
+            {
+                if (MessageNotify.GetInstance.ShowDialog("请确认是否保存！") == true)
+                {
+                    Json<DevicePar>.Save();
+                    MessageNotify.GetInstance.ShowUserLog($"西门子物料清单保存成功");
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"原料与料仓对应关系保存成功");
+                }
+            });
+            GetBomMaterialData = new RelayCommand(() => 
+            {
+                Json<DevicePar>.Data.BomMaterial.Clear();
+                ProcessControl.GetInstance.RawMaterialNameWithCode();//原料的名称和编码对应 ：西门子mes定义的物料编码
+                foreach (var item in GVL_SmallStation.GetInstance.RawMaterialsNameCode)
+                {
+                    Json<DevicePar>.Data.BomMaterial.Add(new BomMaterial() { Count = Json<DevicePar>.Data.BomMaterial.Count + 1, MaterialCode = item.Key, MaterialName = item.Value });
+                }
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"读取程序的Bom清单");
+            });
+            DeleteAllMaterial = new RelayCommand(() =>
+            {
+                if (MessageNotify.GetInstance.ShowDialog("请确认是否删除所有原料数据！") == true)
+                {
+                    Json<DevicePar>.Data.BomMaterial.Clear();
+                    MessageNotify.GetInstance.ShowUserLog($"西门子物料清单删除完成");
+                }
+            });
+            RemoveCommand = new RelayCommand<int>((Count) =>
+            {
+                if (Count is int cnt)
+                {
+                    var res = RawMaterialInfo.FirstOrDefault(p => p.Count == cnt);
+                    if (res != null)
+                    {
+                        if (MessageNotify.GetInstance.ShowDialog($"请确认是否删除[{res.MaterialCode}]，[{res.MaterialName}]！") == true)
+                        {
+                            RawMaterialInfo.Remove(res);
+                            NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"删除成功");
+                        }
+                    }
+                }
+            });
+        }
+        public ObservableCollection<BomMaterial> RawMaterialInfo { get; set; } = new ObservableCollection<BomMaterial>();
+        public RelayCommand AddMaterial { get; set; }
+        public RelayCommand SaveMaterials { get; set; }
+        public RelayCommand<int> RemoveCommand { get; set; }
+        public RelayCommand GetBomMaterialData { get; set; }
+        public RelayCommand DeleteAllMaterial { get; set; }
+        
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/HardwareStatusViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/HardwareStatusViewModel.cs
index 11b897d5..f3d59291 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/HardwareStatusViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/HardwareStatusViewModel.cs
@@ -21,9 +21,9 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 
             BottomDeviceCurrentStatuses = DeviceInquire.GetInstance.BottomDeviceCurrentStatuses;
 
-            TopDeviceCurrentStatuses = new ObservableCollection<DeviceCurrentStatus>(TopDeviceCurrentStatuses.OrderByDescending(item => item.DeviceNum));
+            /*TopDeviceCurrentStatuses = new ObservableCollection<DeviceCurrentStatus>(TopDeviceCurrentStatuses.OrderByDescending(item => item.DeviceNum));
 
-            BottomDeviceCurrentStatuses = new ObservableCollection<DeviceCurrentStatus>(BottomDeviceCurrentStatuses.OrderBy(item => item.DeviceNum));
+            BottomDeviceCurrentStatuses = new ObservableCollection<DeviceCurrentStatus>(BottomDeviceCurrentStatuses.OrderBy(item => item.DeviceNum));*/
         }
 
         public ObservableCollection<DeviceCurrentStatus> TopDeviceCurrentStatuses { get; set; }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
index ad281348..c72321b9 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
@@ -11,6 +11,8 @@ using BPASmartClient.JXJFoodSmallStation.Model;
 using System.Threading;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.CustomResource.UserControls;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -20,10 +22,10 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         {
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                SystemMode = GVL_SmallStation.SystemMode ? "手动" : "自动";
-                if (GVL_SmallStation.SystemStatus)
+                SystemMode = GVL_SmallStation.GetInstance.PlcSystemMode ? "手动" : "自动";
+                if (GVL_SmallStation.GetInstance.PlcSystemIsAutoRun)
                 {
-                    if (GVL_SmallStation.SystemRunStatus)
+                    if (GVL_SmallStation.GetInstance.PlcSystemIsPause)
                     {
                         SystemStatus = "暂停";
                     }
@@ -36,56 +38,182 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 {
                     SystemStatus = "停止";
                 }
+                for (int i = 0; i < 15; i++)
+                {
+                    if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[i])
+                    {
+                        cylinderModels.ElementAt(i).LeftTog = true;
+                        cylinderModels.ElementAt(i).RightTog = false;
+                    }
+                    else
+                    {
+                        cylinderModels.ElementAt(i).LeftTog = false;
+                        cylinderModels.ElementAt(i).RightTog = true;
+                    }
+                }
+                foreach (var item in PalletCylinders)
+                {
+                    if (item.Name == "进料桶顶升气缸")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[20])
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                        else
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                    }
+                    if (item.Name == "出料桶顶升气缸1")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[21])
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                        else
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                    }
+                    if (item.Name == "出料桶顶升气缸2")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[22])
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                        else
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                    }
+                    if (item.Name == "出料桶顶升气缸3")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[23])
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                        else
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                    }
+                    if (item.Name == "托盘气缸1_1")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[24])
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                        else
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                    }
+                    if (item.Name == "托盘气缸1_2")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[25])
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                        else
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                    }
+                    if (item.Name == "托盘气缸2_1")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[26])
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                        else
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                    }
+                    if (item.Name == "托盘气缸2_2")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[27])
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                        else
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                    }
+                }
                 Thread.Sleep(200);
             }), "获取系统状态", true);
-            for (int i = 0; i < 15; i++)
+            if (cylinderModels.Count < 15)
             {
-                cylinderModels.Add(new CylinderModel()
+                for (int i = 0; i < 15; i++)
                 {
-                    Name = $"升降气缸 {i + 1}",
-                    LeftTog = false,
-                    RightTog = false,
-                });
+                    cylinderModels.Add(new CylinderModel()
+                    {
+                        Name = $"升降气缸 {i + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
 
-                BlockCylinders.Add(new CylinderModel()
-                {
-                    Name = $"阻挡气缸 {i + 1}",
-                    LeftTog = false,
-                    RightTog = false,
-                });
+                    BlockCylinders.Add(new CylinderModel()
+                    {
+                        Name = $"阻挡气缸 {i + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
+                }
             }
-            for (int i = 1; i < 3; i++)
+            if (PalletCylinders.Count < 8)
             {
-                PalletCylinders.Add(new CylinderModel()
+                for (int i = 1; i < 3; i++)
                 {
-                    Name = $"托盘气缸1_{(i + 1)%2 +1}",
-                    LeftTog = false,
-                    RightTog = false,
-                });
-            }
-            for (int i = 1; i < 3; i++)
-            {
-                PalletCylinders.Add(new CylinderModel()
+                    PalletCylinders.Add(new CylinderModel()
+                    {
+                        Name = $"托盘气缸1_{(i + 1) % 2 + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
+                }
+                for (int i = 1; i < 3; i++)
                 {
-                    Name = $"托盘气缸2_{(i + 1) % 2 + 1}",
-                    LeftTog = false,
-                    RightTog = false,
-                });
-            }
-            PalletCylinders.Add(new CylinderModel()
-            {
-                Name = $"进料桶顶升气缸",
-                LeftTog = false,
-                RightTog = false,
-            });
-            for (int i = 0; i < 3; i++)
-            {
+                    PalletCylinders.Add(new CylinderModel()
+                    {
+                        Name = $"托盘气缸2_{(i + 1) % 2 + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
+                }
                 PalletCylinders.Add(new CylinderModel()
                 {
-                    Name = $"出料桶顶升气缸{i+1}",
+                    Name = $"进料桶顶升气缸",
                     LeftTog = false,
                     RightTog = false,
                 });
+                for (int i = 0; i < 3; i++)
+                {
+                    PalletCylinders.Add(new CylinderModel()
+                    {
+                        Name = $"出料桶顶升气缸{i + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
+                }
             }
             Open = new RelayCommand<object>((o) =>
             {
@@ -139,18 +267,22 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             SystemStartCommand = new RelayCommand(() => 
             {
                 ActionManage.GetInstance.Send("SystemStart");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"系统启动!");
             });
             SystemStopCommand = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("SystemStop");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"系统停止!");
             });
             SystemPauseCommand = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("SystemPause");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"系统暂停!");
             });
             SystemResetCommand = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("SystemReset");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"系统暂停后复位!");
             });
             DebugMode = new RelayCommand(() =>
             {
@@ -165,17 +297,17 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         /// <summary>
         /// 升降气缸
         /// </summary>
-        public ObservableCollection<CylinderModel> cylinderModels { get; set; } = new ObservableCollection<CylinderModel>();
+        public static ObservableCollection<CylinderModel> cylinderModels { get; set; } = new ObservableCollection<CylinderModel>();
 
         /// <summary>
         /// 阻挡气缸
         /// </summary>
-        public ObservableCollection<CylinderModel> BlockCylinders { get; set; } = new ObservableCollection<CylinderModel>();
+        public static ObservableCollection<CylinderModel> BlockCylinders { get; set; } = new ObservableCollection<CylinderModel>();
 
         /// <summary>
         /// 托盘气缸
         /// </summary>
-        public ObservableCollection<CylinderModel> PalletCylinders { get; set; } = new ObservableCollection<CylinderModel>();
+        public static ObservableCollection<CylinderModel> PalletCylinders { get; set; } = new ObservableCollection<CylinderModel>();
         public static string SystemMode { get { return _mSystemMode; } set { _mSystemMode = value; OnStaticPropertyChanged(); } }
         private static string _mSystemMode =String.Empty;
 
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
index f367620c..596292e7 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
@@ -24,30 +24,38 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
     {
         public ManualFlowViewModel()
         {
-            time = GVL_SmallStation.Time;
+            time = GVL_SmallStation.GetInstance.Time;
             Test1Command = new RelayCommand(() =>
             {
-                GVL_SmallStation.AGV_PutTray1Finish = true;
-                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV送托盘完成");
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX0.7", PlcVarType = PlcVarType.Bool, Value = true });
+                //GVL_SmallStation.GetInstance.AGV_PutTray1Finish = true;
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV送托盘完成"); 
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV送托盘完成");
             });
             Test2Command = new RelayCommand(() =>
             {
-                GVL_SmallStation.WindSendDosingComple = true;
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX1.7", PlcVarType = PlcVarType.Bool, Value = true });
+                //GVL_SmallStation.GetInstance.WindSendDosingComple = true;
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，粉料仓配料完成");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，粉料仓配料完成");
             });
             Test3Command = new RelayCommand(() =>
             {
-                GVL_SmallStation.AGV_GetTray1Finish = true;
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX1.1", PlcVarType = PlcVarType.Bool, Value = true });
+                //GVL_SmallStation.GetInstance.AGV_GetTray1Finish = true;
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV取托盘完成");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV取托盘完成");
             });
             Test4Command = new RelayCommand(() =>
             {
-                GVL_SmallStation.CylinderReset = true;
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX1.5", PlcVarType = PlcVarType.Bool, Value = true });
+                //GVL_SmallStation.GetInstance.CylinderReset = true;
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，气缸收紧错位复位");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，气缸收紧错位复位");
             });
             Test5Command = new RelayCommand(() =>
             {
-                GVL_SmallStation.WindSendAllowAGVPutGet = true;
+                GVL_SmallStation.GetInstance.WindSendAllowAGVPutGet = true;
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，粉料仓提升到位");
             });
             Test6Command = new RelayCommand(() =>
@@ -72,8 +80,9 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             });
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
+                DosingComplete = GVL_SmallStation.GetInstance.StockBinDosing.ToBinString();
                 Heartbeat = GVL_SmallStation.GetInstance.HeartBeatFromPlc;
-                switch (GVL_SmallStation.SiemensSendRecipeStatus) 
+                switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus) 
                 {
                     case 0:
                         OrderStatus = IssueRecipeCondition.等待小料站PLC允许下配方.ToString();
@@ -118,10 +127,13 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             }), "流程手动设备状态读取",true);
             TimeSet = new RelayCommand(() =>
             {
-                GVL_SmallStation.Time = time;
+                GVL_SmallStation.GetInstance.Time = time;
                 MessageNotify.GetInstance.ShowUserLog($"设置柔性味魔方复位时间：{time}s");
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{time.ToString()}：设置成功!");
             });
+            SiemensIsConnect = ProcessControl.GetInstance.SiemensDevice.IsConnected;
+            HKPlcIsConnect = ProcessControl.GetInstance.HKDevice.IsConnected;
+            WindSendIsConnect = ProcessControl.GetInstance.WindSendDevice.IsConnected;
         }
         public RelayCommand Test1Command { get; set; }
         public RelayCommand Test2Command { get; set; }
@@ -132,7 +144,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public RelayCommand TimeSet { get; set; }
         public static bool Heartbeat { get { return _mHeartbeat; } set { _mHeartbeat = value; OnStaticPropertyChanged(); } }
         private static bool _mHeartbeat;
-
+        
         public int time { get { return _mtime; } set { _mtime = value; OnStaticPropertyChanged(); } }
         private int _mtime;
         public static string OrderStatus { get { return _mOrderStatus; } set { _mOrderStatus = value; OnStaticPropertyChanged(); } }
@@ -147,5 +159,14 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public RelayCommand CLearRecipeInfo { get; set; }
         public RelayCommand SystemReset { get; set; }
         public RelayCommand BPAResetCommand { get; set; }
+        private bool _SiemensIsConnect { get; set; } 
+        public bool SiemensIsConnect { get { return _SiemensIsConnect; } set { _SiemensIsConnect = value; OnPropertyChanged(); } } 
+        private bool _HKPlcIsConnect { get; set; }
+        public bool HKPlcIsConnect { get { return _HKPlcIsConnect; } set { _HKPlcIsConnect = value; OnPropertyChanged(); } }
+        private bool _WindSendIsConnect { get; set; }
+        public bool WindSendIsConnect { get { return _WindSendIsConnect; } set { _WindSendIsConnect = value; OnPropertyChanged(); } }
+
+        private static string _DosingComplete { get; set; }
+        public static string DosingComplete { get { return _DosingComplete; } set { _DosingComplete = value; OnStaticPropertyChanged(); } }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ProcessMonitorViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ProcessMonitorViewModel.cs
new file mode 100644
index 00000000..5d49ee44
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ProcessMonitorViewModel.cs
@@ -0,0 +1,23 @@
+using BPASmartClient.JXJFoodSmallStation.Model;
+using BPASmartClient.JXJFoodSmallStation.Model.GVL;
+using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.ViewModel
+{
+    public class ProcessMonitorViewModel : ObservableObject
+    {
+        public ProcessMonitorViewModel() 
+        {
+            
+        }
+        public ObservableCollection<PlcInfos> plcInfos => ProcessControl.GetInstance.ProcessVar;
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
index 8cc9cb38..d330e421 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
@@ -27,6 +27,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         //ObservableCollection<RemoteRecipeRawMaterial> RawMaterials { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>();
         public RecipeReceiveViewModel()
         {
+            AskRecipeFormSiemens = GVL_SmallStation.GetInstance.RequestOrder;
+            NotUseSmallDosing = GVL_SmallStation.GetInstance.NotUseSmallDosing;
             IsUseLocalRecipe = GVL_SmallStation.GetInstance.IsUseLocalRecipe;
             IsUseWindSendDosing = GVL_SmallStation.GetInstance.IsUseWindSend;
             Recipes = Json<LocalRecipeDataColl>.Data.Recipes;
@@ -150,9 +152,19 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public bool IsUseLocalRecipe { get { return _mIsUseLocalRecipe; }set { _mIsUseLocalRecipe = value; OnPropertyChanged(); } }
         private bool _mIsUseLocalRecipe ;
 
+
+        public bool NotUseSmallDosing { get { return _mNotUseSmallDosing; } set { _mNotUseSmallDosing = value; OnPropertyChanged(); } }
+        private bool _mNotUseSmallDosing;
+
+        
         public bool IsUseWindSendDosing { get { return _mIsUseWindSendDosing; } set { _mIsUseWindSendDosing = value;OnPropertyChanged(); } }
         private bool _mIsUseWindSendDosing ;
 
+
+        public bool AskRecipeFormSiemens { get { return _mAskRecipeFormSiemens; } set { _mAskRecipeFormSiemens = value; OnPropertyChanged(); } }
+        private bool _mAskRecipeFormSiemens;
+
+
         public RelayCommand<object> DetailsCommand { get; set; }
         public RelayCommand<object> IssueRecipe { get; set; }
         public RelayCommand<object> RemoveRecipe { get; set; }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs
index 7910aae8..0be4f19e 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs
@@ -25,17 +25,19 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         {
             ThreadManage.GetInstance().StartLong(() => 
             {
-                IsRunProgramNum = GVL_SmallStation.RobotProgramNum;
-                RobotIsAutoMode = GVL_SmallStation.RobotStatus.GetBitValue(1);
-                RobotIsAutoRun = GVL_SmallStation.RobotStatus.GetBitValue(2);
-                RobotIsStop = GVL_SmallStation.RobotStatus.GetBitValue(3);
-                RobotIsRun = GVL_SmallStation.RobotStatus.GetBitValue(4);
-                RobotIsAlarm = GVL_SmallStation.RobotStatus.GetBitValue(5);
-                RobotIsHomed = GVL_SmallStation.RobotStatus.GetBitValue(6);
-                RobotGetEmptyBarrelComplete = GVL_SmallStation.RobotStatus.GetBitValue(8);
-                RobotPutEmptyBarrelComplete = GVL_SmallStation.RobotStatus.GetBitValue(9);
-                RobotGetFullBarrelComplete = GVL_SmallStation.RobotStatus.GetBitValue(10);
-                RobotPutFullBarrelComplete = GVL_SmallStation.RobotStatus.GetBitValue(11);
+                IsRunProgramNum = GVL_SmallStation.GetInstance.RobotProgramNum;
+                RobotIsAutoMode = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(1);
+                RobotIsAutoRun = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(2);
+                RobotIsStop = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(3);
+                RobotIsRun = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(4);
+                RobotIsAlarm = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(5);
+                RobotIsHomed = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(6);
+                RobotGetEmptyBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(8);
+                RobotPutEmptyBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(9);
+                RobotGetFullBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(10);
+                RobotPutFullBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(11);
+
+                Thread.Sleep(10);
 
             },"机器人状态",true);
             SystemStart = new RelayCommand(() => {
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs
index 5c207fa2..530031de 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs
@@ -13,6 +13,7 @@ using BPASmartClient.CustomResource.UserControls;
 using System.Diagnostics;
 using BPASmartClient.JXJFoodSmallStation.Model.WindSend;
 using BPASmartClient.JXJFoodSmallStation.Model.Par;
+using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -45,11 +46,17 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             });
             SetParCommand = new RelayCommand(() =>
             {
-                ActionManage.GetInstance.Send("AxisLoadSpeedSet", AxisLoadSpeed);
-                ActionManage.GetInstance.Send("AxisMidSpeedSet", AxisMidSpeed);
-                ActionManage.GetInstance.Send("AxisUnLoadSpeedSet", AxisUnLoadSpeed);
-                ActionManage.GetInstance.Send("Axis1SpeedSet", Axis1Speed);
-                ActionManage.GetInstance.Send("Axis2SpeedSet", Axis2Speed);
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBD0", PlcVarType = PlcVarType.Real, Value = Axis1Speed });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBD4", PlcVarType = PlcVarType.Real, Value = Axis2Speed });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBW8", PlcVarType = PlcVarType.Int, Value = AxisLoadSpeed });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBW10", PlcVarType = PlcVarType.Int, Value = AxisMidSpeed });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBW12", PlcVarType = PlcVarType.Int, Value = AxisUnLoadSpeed });
+
+                //ActionManage.GetInstance.Send("AxisLoadSpeedSet", AxisLoadSpeed);
+                //ActionManage.GetInstance.Send("AxisMidSpeedSet", AxisMidSpeed);
+                //ActionManage.GetInstance.Send("AxisUnLoadSpeedSet", AxisUnLoadSpeed);
+                //ActionManage.GetInstance.Send("Axis1SpeedSet", Axis1Speed);
+                //ActionManage.GetInstance.Send("Axis2SpeedSet", Axis2Speed);
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"参数设置成功!");
             });
         }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs
index c9e38fd0..bcd9a7f0 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs
@@ -12,6 +12,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.CustomResource.UserControls;
 using System.Diagnostics;
 using BPASmartClient.JXJFoodSmallStation.Model.WindSend;
+using System.Threading;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -30,14 +31,14 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     });
                 }
             }
-            SaveCommand = new RelayCommand(() =>
+            SaveRawMaterialPara = new RelayCommand(() =>
             {
                 Json<DevicePar>.Save();
             });
         }
 
         public ObservableCollection<WindSendRawMaterial> WindSendRawMaterial => Json<DevicePar>.Data.windSendRawMaterial;
-        public RelayCommand SaveCommand { get; set; }
+        public RelayCommand SaveRawMaterialPara { get; set; }
 
     }
 }
diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index 69be784d..41e0aa39 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -316,7 +316,7 @@ namespace BPASmartClient.MorkS
         private void DataParse()
         {
             EventBus.EventBus.GetInstance().Subscribe<DoOrderEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBackHandle)
-             {
+            {
                  if (@event == null) return;
                  if (@event is DoOrderEvent order)
                  {
@@ -404,6 +404,10 @@ namespace BPASmartClient.MorkS
 
             WriteControl("M260.0", data.ToArray());
 
+            OrderChange(mORKS.OutMealId, ORDER_STATUS.COOKING);
+
+            OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_COOK);
+
         }
 
         private void BowlControl(OrderLocInfo orderLocInfo)
@@ -697,7 +701,8 @@ namespace BPASmartClient.MorkS
 
             mORKS.PriorityJudgment = Delay.GetInstance("取餐优先级判断").Start(mORKS.TurntableLocLists.Count > 0 && !mORKS.TurntableLowerLimit, 4);
             //mORKS.RobotTaskInterlock = OutMealRequstCount > 0 && mORKS.AllowFallNoodle && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
-            mORKS.RobotTaskInterlock = isok && mORKS.AllowFallNoodle && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
+            mORKS.InvertedNoodlesOpenBusy = Json<MorksPar>.Data.InvertedNoodles_OpenBusyNum;
+            mORKS.RobotTaskInterlock = isok && mORKS.AllowFallNoodle && (mlCount >= mORKS.InvertedNoodlesOpenBusy || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment) && !mORKS.TakeMealDetect;//加个取餐口检测判断是否去面
 
 
         }
diff --git a/BPASmartClient.MorkS/GVL_MORKS.cs b/BPASmartClient.MorkS/GVL_MORKS.cs
index 5a16dc8c..7270d656 100644
--- a/BPASmartClient.MorkS/GVL_MORKS.cs
+++ b/BPASmartClient.MorkS/GVL_MORKS.cs
@@ -324,6 +324,9 @@ namespace BPASmartClient.MorkS
         [VariableMonitor("制作完成标志")]
         public bool CookCompleteFlatBit { get; set; }
 
+        [VariableMonitor("到面条件,煮面口忙碌数量")]
+        public int InvertedNoodlesOpenBusy { get; set; } = 5;
+
 
         #region 订单ID记录
         /// <summary>
diff --git a/BPASmartClient.MorkS/Model/MorksPar.cs b/BPASmartClient.MorkS/Model/MorksPar.cs
index 77b6eb6d..a085e187 100644
--- a/BPASmartClient.MorkS/Model/MorksPar.cs
+++ b/BPASmartClient.MorkS/Model/MorksPar.cs
@@ -17,5 +17,9 @@ namespace BPASmartClient.MorkS.Model
         /// 加汤时间，单位秒
         /// </summary>
         public float AddSoupTime { get; set; } = 2;
+        /// <summary>
+        /// 倒面条件 煮面口忙碌数量
+        /// </summary>
+        public int InvertedNoodles_OpenBusyNum { get; set; } = 5;
     }
 }
diff --git a/BPASmartClient.MorkS/View/ParSet.xaml b/BPASmartClient.MorkS/View/ParSet.xaml
index 9f5734e7..8cfaca7b 100644
--- a/BPASmartClient.MorkS/View/ParSet.xaml
+++ b/BPASmartClient.MorkS/View/ParSet.xaml
@@ -78,7 +78,7 @@
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>
                 <RowDefinition />
-                <RowDefinition Height="50" />
+                <RowDefinition Height="150" />
             </Grid.RowDefinitions>
 
             <ItemsControl Grid.Row="0" ItemsSource="{Binding parSets}">
@@ -130,7 +130,7 @@
             <StackPanel Grid.Row="1" Orientation="Horizontal">
                 <TextBlock
                     FontSize="21"
-                     Margin="40 0 0 0"
+                        Margin="40 0 0 0"
                     Style="{StaticResource TextBlockStyle}"
                     Text="加汤时间:" />
                 <TextBox
@@ -151,7 +151,7 @@
                     Text="(秒)" />
                 <TextBlock
                     FontSize="21"
-                     Margin="40 0 0 0"
+                        Margin="40 0 0 0"
                     Style="{StaticResource TextBlockStyle}"
                     Text="清洗加汤管道时间:" />
                 <TextBox
@@ -172,6 +172,27 @@
                     Text="(秒)" />
                 <Button Content="启动"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5" Foreground="Aqua" 
                     Style="{StaticResource ButtonStyle}" Command="{Binding CommandStart}" />
+                <TextBlock
+                    FontSize="21"
+                        Margin="40 0 0 0"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="倒面条件，煮面口使用数量:" />
+                <TextBox
+                    Width="100"
+                    Margin="10,0,0,0"
+                    VerticalAlignment="Center"
+                    Background="Transparent"
+                    BorderBrush="#FF23CACA"
+                    CaretBrush="Aqua"
+                    FontFamily="楷体"
+                    FontSize="21"
+                    Foreground="#ff34f7f7"
+                    Text="{Binding OpenUseNumber}" />
+                <TextBlock
+                    FontSize="21"
+                    Margin="10 0 0 0"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="(个)" />
             </StackPanel>
         </Grid>
 
diff --git a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
index d4a7edbd..3de1399b 100644
--- a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
+++ b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
@@ -36,9 +36,13 @@ namespace BPASmartClient.MorkS.ViewModel
         /// 加汤时间设置
         /// </summary>
         public float AddSoup { get { return Json<MorksPar>.Data.AddSoupTime; } set { Json<MorksPar>.Data.AddSoupTime = value; OnPropertyChanged(); } }
+        public int OpenUseNumber { get { return Json<MorksPar>.Data.InvertedNoodles_OpenBusyNum; } set { Json<MorksPar>.Data.InvertedNoodles_OpenBusyNum = value; OnPropertyChanged(); } }
+        
         public float DelayTime { get { return _DelayTime; } set { _DelayTime = value; OnPropertyChanged(); } }
         private float _DelayTime;
 
+
+
         private void SaveSettingData()
         {
             List<ushort> values = new List<ushort>();
diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index 9c45fe12..618157de 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -7,9 +7,9 @@
     <add key="IsEnableTest" value="false"/>
 
     <!--测试环境-->
-    <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
+    <add key="apollouri" value="http://10.2.1.21:28080/"/>
     <add key="AppId" value="test1_HostComputer"/>
-    <add key ="Namespaces" value="DEV.test1.Config"/>-->
+    <add key ="Namespaces" value="DEV.test1.Config"/>
 
     <!--开发环境-->
     <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
@@ -17,9 +17,9 @@
     <add key ="Namespaces" value="DEV.Config"/>-->
 
     <!--正式环境-->
-    <add key="apollouri" value="http://47.108.65.220:28080/"/>
+    <!--<add key="apollouri" value="http://47.108.65.220:28080/"/>
     <add key="appid" value="hostcomputer"/>
-    <add key ="namespaces" value="test1.config"/>
+    <add key ="namespaces" value="test1.config"/>-->
 
     <!--阿里云上报启动方式:API 或者 LOCAL-->
     <!--API  :通过客户端ID,调用接口查询“设备连接信息”-->
diff --git a/DosingSystem/Model/par/LocaPar.cs b/DosingSystem/Model/par/LocaPar.cs
new file mode 100644
index 00000000..992f898f
--- /dev/null
+++ b/DosingSystem/Model/par/LocaPar.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Collections.ObjectModel;
+using BPASmartClient.DosingSystem.ViewModel;
+using BPASmartClient.Model;
+
+namespace BPASmartClient.DosingSystem
+{
+    public class LocaPar
+    {
+        public ObservableCollection<RecipeModel> Recipes { get; set; } = new ObservableCollection<RecipeModel>();
+
+
+    }
+}
diff --git a/DosingSystem/ViewModel/RecipeControlViewModel.cs b/DosingSystem/ViewModel/RecipeControlViewModel.cs
index f5667637..86cefcf6 100644
--- a/DosingSystem/ViewModel/RecipeControlViewModel.cs
+++ b/DosingSystem/ViewModel/RecipeControlViewModel.cs
@@ -308,273 +308,100 @@ namespace BPASmartClient.DosingSystem.ViewModel
                                 }
                                 for (int j = 0; j < GlobalDevice.PlcData.IsAllowIngredients.Length; j++)
                                 {
-                                    //if (GlobalDevice.PlcData.IsAllowIngredients[j])
-                                    //{
-                                    //    int barrel = j + 1;//桶号
-                                    //    int cnt = GlobalDevice.PlcData.LocationFeedback[j];//允许配料的位置 0~6
-                                    //    if (RTrig.GetInstance("a").Start(GlobalDevice.PlcData.IsAllowIngredients[j])) 
-                                    //    {
-                                    //        MessageNotify.GetInstance.ShowRunLog($"桶号：{barrel}，位置：{cnt}，允许配料");
-                                    //    }
-                                    //    int Location1 = 0;
-                                    //    int Location2 = 0;
-                                    //    if (cnt == -1)
-                                    //    {
-                                    //        MessageNotify.GetInstance.ShowRunLog("错误");
-                                    //        return;
-                                    //    }
-                                    //    else
-                                    //    {
-                                    //        switch (cnt)
-                                    //        {
-                                    //            case 1:
-                                    //                int a1 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 1);
-                                    //                int b1 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 2);
-                                    //                if (a1 >= 0)
-                                    //                {
-                                    //                    Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a1).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                if (b1 >= 0)
-                                    //                {
-                                    //                    Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b1).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                break;
-                                    //            case 2:
-                                    //                int a2 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 3);
-                                    //                int b2 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 4);
-                                    //                if (a2 >= 0)
-                                    //                {
-                                    //                    Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a2).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                if (b2 >= 0)
-                                    //                {
-                                    //                    Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b2).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                break;
-                                    //            case 3:
-                                    //                int a3 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 5);
-                                    //                int b3 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 6);
-                                    //                if (a3 >= 0)
-                                    //                {
-                                    //                    Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a3).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                if (b3 >= 0)
-                                    //                {
-                                    //                    Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b3).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                break;
-                                    //            case 4:
-                                    //                int a4 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 7);
-                                    //                int b4 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 8);
-                                    //                if (a4 >= 0)
-                                    //                {
-                                    //                    Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a4).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                if (b4 >= 0)
-                                    //                {
-                                    //                    Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b4).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                break;
-                                    //            case 5:
-                                    //                int a5 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 9);
-                                    //                int b5 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 10);
-                                    //                if (a5 >= 0)
-                                    //                {
-                                    //                    Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a5).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                if (b5 >= 0)
-                                    //                {
-                                    //                    Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b5).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                break;
-                                    //            case 6:
-                                    //                int a6 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 11);
-                                    //                int b6 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 12);
-                                    //                if (a6 >= 0)
-                                    //                {
-                                    //                    Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a6).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                if (b6 >= 0)
-                                    //                {
-                                    //                    Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b6).DeviceName && p.Loc == barrel);
-                                    //                }
-                                    //                break;
-                                    //            default:
-                                    //                break;
-                                    //        }
-                                    //    }
-                                    //    if (Location1 >= 0)
-                                    //    {
-                                    //        string RawName = Recipes.ElementAt(i).RawMaterials.ElementAt(Location1).RawMaterialName;
-                                    //        int abc = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceName == RawName);
-                                    //        int DeviceNum = DeviceInquire.GetInstance.devices.ElementAt(abc).DeviceNum;
-                                    //        if (DeviceNum > 0)
-                                    //        {
-                                    //            float weight = Recipes.ElementAt(i).RawMaterials.ElementAt(Location1).RawMaterialWeight;
-                                    //            int loc = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == RawName);
-                                    //            if (loc >= 0 && RawName != null && weight >= 0)
-                                    //            {
-                                    //                int St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
-                                    //                if (St_index < 0)
-                                    //                {
-                                    //                    StockStatus.Add(new StockStatusModel()
-                                    //                    {
-                                    //                        MaterialName = RawName,
-                                    //                        IssueWeight = weight,
-                                    //                        IssueStatus = 0,
-                                    //                    });
-                                    //                }
-                                    //                St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
-                                    //                if (St_index >= 0)
-                                    //                {
-                                    //                    if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 1 && StockStatus.ElementAt(St_index).IssueStatus == 0)
-                                    //                    {
-                                    //                        StockStatus.ElementAt(St_index).IssueStatus = 1;
-                                    //                        DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).Start(weight);
-                                    //                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},开始出料");
-                                    //                    }
-                                    //                    if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 3 && StockStatus.ElementAt(St_index).IssueStatus == 1)
-                                    //                    {
-                                    //                        //GlobalDevice.PlcData.IsAllowIngredients[j] = false;//测试使用
-                                    //                        StockStatus.ElementAt(St_index).IssueStatus = 2;
-                                    //                        DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).StatusReset();
-                                    //                        int a = 0.SetBitValue((byte)(DeviceNum), true);
-                                    //                        byte[] test1 = a.ToBytes(BPA.Helper.DataFormat.ABCD);
-                                    //                        int item = test1.ToInt();
-                                    //                        string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item,2);
-                                    //                        MessageNotify.GetInstance.ShowRunLog($"{res}");
-                                    //                        MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");
-                                    //                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
-                                    //                    }
-                                    //                }
-                                    //            }
-                                    //        }
-                                    //    }
-                                    //    if (Location1 >= 0)
-                                    //    {
-
-                                    //        string RawName111 = Recipes.ElementAt(i).RawMaterials.ElementAt(Location1).RawMaterialName;
-                                    //        int St_index111 = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName111);
-                                    //        if (Location2 >= 0 && ((Location1 >= 0 && StockStatus.ElementAt(St_index111).IssueStatus == 2)))
-                                    //        {
-                                    //            string RawName = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialName;
-                                    //            int abc = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceName == RawName);
-                                    //            int DeviceNum = DeviceInquire.GetInstance.devices.ElementAt(abc).DeviceNum;
-                                    //            if (DeviceNum > 0)
-                                    //            {
-                                    //                float weight = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialWeight;
-                                    //                int loc = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == RawName);
-                                    //                if (loc >= 0 && RawName != null && weight >= 0)
-                                    //                {
-                                    //                    int St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
-                                    //                    if (St_index < 0)
-                                    //                    {
-                                    //                        StockStatus.Add(new StockStatusModel()
-                                    //                        {
-                                    //                            MaterialName = RawName,
-                                    //                            IssueWeight = weight,
-                                    //                            IssueStatus = 0,
-                                    //                        });
-                                    //                    }
-                                    //                    St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
-                                    //                    if (St_index >= 0)
-                                    //                    {
-                                    //                        if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 1 && StockStatus.ElementAt(St_index).IssueStatus == 0)
-                                    //                        {
-                                    //                            StockStatus.ElementAt(St_index).IssueStatus = 1;
-                                    //                            DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).Start(weight);
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},开始出料");
-                                    //                        }
-                                    //                        if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 3 && StockStatus.ElementAt(St_index).IssueStatus == 1)
-                                    //                        {
-                                    //                            //GlobalDevice.PlcData.IsAllowIngredients[j] = false;//测试使用
-                                    //                            StockStatus.ElementAt(St_index).IssueStatus = 2;
-                                    //                            DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).StatusReset();
-                                    //                            int a = 0.SetBitValue((byte)(DeviceNum), true);
-                                    //                            byte[] test1 = a.ToBytes(BPA.Helper.DataFormat.ABCD);
-                                    //                            int item = test1.ToInt();
-                                    //                            string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item, 5);
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"{res}");
-                                    //                            //MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item}");
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
-                                    //                        }
-                                    //                    }
-                                    //                }
-                                    //            }
-                                    //        }
-                                    //    }
-                                    //    else
-                                    //    {
-                                    //        if (Location2 >= 0)
-                                    //        {
-                                    //            string RawName = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialName;
-                                    //            int abc = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceName == RawName);
-                                    //            int DeviceNum = DeviceInquire.GetInstance.devices.ElementAt(abc).DeviceNum;
-                                    //            if (DeviceNum >= 0)
-                                    //            {
-                                    //                float weight = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialWeight;
-                                    //                int loc = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == RawName);
-                                    //                if (cnt > 0 && loc >= 0 && RawName != null && weight >= 0)
-                                    //                {
-                                    //                    int St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
-                                    //                    if (St_index < 0)
-                                    //                    {
-                                    //                        StockStatus.Add(new StockStatusModel()
-                                    //                        {
-                                    //                            MaterialName = RawName,
-                                    //                            IssueWeight = weight,
-                                    //                            IssueStatus = 0,
-                                    //                        });
-                                    //                    }
-                                    //                    St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
-                                    //                    if (St_index >= 0)
-                                    //                    {
-                                    //                        if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 1 && StockStatus.ElementAt(St_index).IssueStatus == 0)
-                                    //                        {
-                                    //                            StockStatus.ElementAt(St_index).IssueStatus = 1;
-                                    //                            DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).Start(weight);
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},开始出料");
-                                    //                        }
-                                    //                        if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 3 && StockStatus.ElementAt(St_index).IssueStatus == 1)
-                                    //                        {
-                                    //                            //GlobalDevice.PlcData.IsAllowIngredients[j] = false;//测试使用
-                                    //                            StockStatus.ElementAt(St_index).IssueStatus = 2;
-                                    //                            DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).StatusReset();
-                                    //                            int a = 0.SetBitValue((byte)(DeviceNum), true);
-                                    //                            byte[] test1 = a.ToBytes(BPA.Helper.DataFormat.ABCD);
-                                    //                            int item = test1.ToInt();
-                                    //                            string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item, 5);
-                                    //                            recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).UpLimtWeightFeedback = DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).deviceStatus.NowWeightFeedback;
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"{res}");
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");
-                                    //                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
-                                    //                        }
-                                    //                    }
-                                    //                }
-                                    //            }
-                                    //        }
-                                    //    }
-                                    //}
-                                    //508配料项目代码
                                     if (GlobalDevice.PlcData.IsAllowIngredients[j])
                                     {
                                         int barrel = j + 1;//桶号
-                                        int cnt = GlobalDevice.PlcData.LocationFeedback[j];//允许配料的位置 1~10
+                                        int cnt = GlobalDevice.PlcData.LocationFeedback[j];//允许配料的位置 0~6
                                         if (RTrig.GetInstance("a").Start(GlobalDevice.PlcData.IsAllowIngredients[j]))
                                         {
                                             MessageNotify.GetInstance.ShowRunLog($"桶号：{barrel}，位置：{cnt}，允许配料");
                                         }
                                         int Location1 = 0;
+                                        int Location2 = 0;
                                         if (cnt == -1)
                                         {
-                                            MessageNotify.GetInstance.ShowRunLog("没有读取到配料的位置");
+                                            MessageNotify.GetInstance.ShowRunLog("错误");
                                             return;
                                         }
                                         else
                                         {
-                                            int a1 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == cnt);
-                                            Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a1).DeviceName && p.Loc == barrel);
+                                            switch (cnt)
+                                            {
+                                                case 1:
+                                                    int a1 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 1);
+                                                    int b1 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 2);
+                                                    if (a1 >= 0)
+                                                    {
+                                                        Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a1).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    if (b1 >= 0)
+                                                    {
+                                                        Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b1).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    break;
+                                                case 2:
+                                                    int a2 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 3);
+                                                    int b2 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 4);
+                                                    if (a2 >= 0)
+                                                    {
+                                                        Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a2).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    if (b2 >= 0)
+                                                    {
+                                                        Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b2).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    break;
+                                                case 3:
+                                                    int a3 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 5);
+                                                    int b3 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 6);
+                                                    if (a3 >= 0)
+                                                    {
+                                                        Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a3).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    if (b3 >= 0)
+                                                    {
+                                                        Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b3).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    break;
+                                                case 4:
+                                                    int a4 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 7);
+                                                    int b4 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 8);
+                                                    if (a4 >= 0)
+                                                    {
+                                                        Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a4).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    if (b4 >= 0)
+                                                    {
+                                                        Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b4).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    break;
+                                                case 5:
+                                                    int a5 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 9);
+                                                    int b5 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 10);
+                                                    if (a5 >= 0)
+                                                    {
+                                                        Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a5).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    if (b5 >= 0)
+                                                    {
+                                                        Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b5).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    break;
+                                                case 6:
+                                                    int a6 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 11);
+                                                    int b6 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == 12);
+                                                    if (a6 >= 0)
+                                                    {
+                                                        Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a6).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    if (b6 >= 0)
+                                                    {
+                                                        Location2 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(b6).DeviceName && p.Loc == barrel);
+                                                    }
+                                                    break;
+                                                default:
+                                                    break;
+                                            }
                                         }
                                         if (Location1 >= 0)
                                         {
@@ -611,34 +438,207 @@ namespace BPASmartClient.DosingSystem.ViewModel
                                                             //GlobalDevice.PlcData.IsAllowIngredients[j] = false;//测试使用
                                                             StockStatus.ElementAt(St_index).IssueStatus = 2;
                                                             DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).StatusReset();
-                                                            /*int a = 0.SetBitValue((byte)(DeviceNum), true);
+                                                            int a = 0.SetBitValue((byte)(DeviceNum), true);
                                                             byte[] test1 = a.ToBytes(BPA.Helper.DataFormat.ABCD);
-                                                            int item = test1.ToInt();*/
-                                                            if (DeviceNum >= 1 && DeviceNum <= 8) 
+                                                            int item = test1.ToInt();
+                                                            string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item, 2);
+                                                            MessageNotify.GetInstance.ShowRunLog($"{res}");
+                                                            MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");
+                                                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        if (Location1 >= 0)
+                                        {
+
+                                            string RawName111 = Recipes.ElementAt(i).RawMaterials.ElementAt(Location1).RawMaterialName;
+                                            int St_index111 = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName111);
+                                            if (Location2 >= 0 && ((Location1 >= 0 && StockStatus.ElementAt(St_index111).IssueStatus == 2)))
+                                            {
+                                                string RawName = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialName;
+                                                int abc = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceName == RawName);
+                                                int DeviceNum = DeviceInquire.GetInstance.devices.ElementAt(abc).DeviceNum;
+                                                if (DeviceNum > 0)
+                                                {
+                                                    float weight = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialWeight;
+                                                    int loc = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == RawName);
+                                                    if (loc >= 0 && RawName != null && weight >= 0)
+                                                    {
+                                                        int St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
+                                                        if (St_index < 0)
+                                                        {
+                                                            StockStatus.Add(new StockStatusModel()
                                                             {
-                                                                SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX130." + (DeviceNum - 1), true);
-                                                            }else if (DeviceNum >= 9 && DeviceNum <= 16)
+                                                                MaterialName = RawName,
+                                                                IssueWeight = weight,
+                                                                IssueStatus = 0,
+                                                            });
+                                                        }
+                                                        St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
+                                                        if (St_index >= 0)
+                                                        {
+                                                            if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 1 && StockStatus.ElementAt(St_index).IssueStatus == 0)
                                                             {
-                                                                SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX131." + (DeviceNum - 9), true);
+                                                                StockStatus.ElementAt(St_index).IssueStatus = 1;
+                                                                DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).Start(weight);
+                                                                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},开始出料");
                                                             }
-                                                            else if (DeviceNum >=17 && DeviceNum <= 24)
+                                                            if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 3 && StockStatus.ElementAt(St_index).IssueStatus == 1)
                                                             {
-                                                                SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX132." + (DeviceNum - 17), true);
-                                                            }else if (DeviceNum >= 25 && DeviceNum <= 32)
+                                                                //GlobalDevice.PlcData.IsAllowIngredients[j] = false;//测试使用
+                                                                StockStatus.ElementAt(St_index).IssueStatus = 2;
+                                                                DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).StatusReset();
+                                                                int a = 0.SetBitValue((byte)(DeviceNum), true);
+                                                                byte[] test1 = a.ToBytes(BPA.Helper.DataFormat.ABCD);
+                                                                int item = test1.ToInt();
+                                                                string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item, 5);
+                                                                MessageNotify.GetInstance.ShowRunLog($"{res}");
+                                                                //MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");
+                                                                MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item}");
+                                                                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        else
+                                        {
+                                            if (Location2 >= 0)
+                                            {
+                                                string RawName = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialName;
+                                                int abc = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceName == RawName);
+                                                int DeviceNum = DeviceInquire.GetInstance.devices.ElementAt(abc).DeviceNum;
+                                                if (DeviceNum >= 0)
+                                                {
+                                                    float weight = Recipes.ElementAt(i).RawMaterials.ElementAt(Location2).RawMaterialWeight;
+                                                    int loc = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == RawName);
+                                                    if (cnt > 0 && loc >= 0 && RawName != null && weight >= 0)
+                                                    {
+                                                        int St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
+                                                        if (St_index < 0)
+                                                        {
+                                                            StockStatus.Add(new StockStatusModel()
+                                                            {
+                                                                MaterialName = RawName,
+                                                                IssueWeight = weight,
+                                                                IssueStatus = 0,
+                                                            });
+                                                        }
+                                                        St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
+                                                        if (St_index >= 0)
+                                                        {
+                                                            if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 1 && StockStatus.ElementAt(St_index).IssueStatus == 0)
                                                             {
-                                                                SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX133." + (DeviceNum - 25), true);
+                                                                StockStatus.ElementAt(St_index).IssueStatus = 1;
+                                                                DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).Start(weight);
+                                                                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},开始出料");
+                                                            }
+                                                            if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 3 && StockStatus.ElementAt(St_index).IssueStatus == 1)
+                                                            {
+                                                                //GlobalDevice.PlcData.IsAllowIngredients[j] = false;//测试使用
+                                                                StockStatus.ElementAt(St_index).IssueStatus = 2;
+                                                                DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).StatusReset();
+                                                                int a = 0.SetBitValue((byte)(DeviceNum), true);
+                                                                byte[] test1 = a.ToBytes(BPA.Helper.DataFormat.ABCD);
+                                                                int item = test1.ToInt();
+                                                                string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item, 5);
+                                                                recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).UpLimtWeightFeedback = DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).deviceStatus.NowWeightFeedback;
+                                                                MessageNotify.GetInstance.ShowRunLog($"{res}");
+                                                                MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");
+                                                                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
                                                             }
-                                                            MessageNotify.GetInstance.ShowRunLog($"料仓：{DeviceNum}，配料完成");
-                                                            /*string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item, 2);
-                                                            MessageNotify.GetInstance.ShowRunLog($"{res}");
-                                                            MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");*/
-                                                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
                                                         }
                                                     }
                                                 }
                                             }
                                         }
                                     }
+                                    //508配料项目代码
+                                    //if (GlobalDevice.PlcData.IsAllowIngredients[j])
+                                    //{
+                                    //    int barrel = j + 1;//桶号
+                                    //    int cnt = GlobalDevice.PlcData.LocationFeedback[j];//允许配料的位置 1~10
+                                    //    if (RTrig.GetInstance("a").Start(GlobalDevice.PlcData.IsAllowIngredients[j]))
+                                    //    {
+                                    //        MessageNotify.GetInstance.ShowRunLog($"桶号：{barrel}，位置：{cnt}，允许配料");
+                                    //    }
+                                    //    int Location1 = 0;
+                                    //    if (cnt == -1)
+                                    //    {
+                                    //        MessageNotify.GetInstance.ShowRunLog("没有读取到配料的位置");
+                                    //        return;
+                                    //    }
+                                    //    else
+                                    //    {
+                                    //        int a1 = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceNum == cnt);
+                                    //        Location1 = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(a1).DeviceName && p.Loc == barrel);
+                                    //    }
+                                    //    if (Location1 >= 0)
+                                    //    {
+                                    //        string RawName = Recipes.ElementAt(i).RawMaterials.ElementAt(Location1).RawMaterialName;
+                                    //        int abc = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.DeviceName == RawName);
+                                    //        int DeviceNum = DeviceInquire.GetInstance.devices.ElementAt(abc).DeviceNum;
+                                    //        if (DeviceNum > 0)
+                                    //        {
+                                    //            float weight = Recipes.ElementAt(i).RawMaterials.ElementAt(Location1).RawMaterialWeight;
+                                    //            int loc = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == RawName);
+                                    //            if (loc >= 0 && RawName != null && weight >= 0)
+                                    //            {
+                                    //                int St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
+                                    //                if (St_index < 0)
+                                    //                {
+                                    //                    StockStatus.Add(new StockStatusModel()
+                                    //                    {
+                                    //                        MaterialName = RawName,
+                                    //                        IssueWeight = weight,
+                                    //                        IssueStatus = 0,
+                                    //                    });
+                                    //                }
+                                    //                St_index = Array.FindIndex(StockStatus.ToArray(), p => p.MaterialName == RawName);
+                                    //                if (St_index >= 0)
+                                    //                {
+                                    //                    if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 1 && StockStatus.ElementAt(St_index).IssueStatus == 0)
+                                    //                    {
+                                    //                        StockStatus.ElementAt(St_index).IssueStatus = 1;
+                                    //                        DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).Start(weight);
+                                    //                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},开始出料");
+                                    //                    }
+                                    //                    if (recipeProcesses.ElementAt(recIndex).RawMaterials.ElementAt(loc).RecipeStatus == 3 && StockStatus.ElementAt(St_index).IssueStatus == 1)
+                                    //                    {
+                                    //                        //GlobalDevice.PlcData.IsAllowIngredients[j] = false;//测试使用
+                                    //                        StockStatus.ElementAt(St_index).IssueStatus = 2;
+                                    //                        DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp).StatusReset();
+                                    //                        /*int a = 0.SetBitValue((byte)(DeviceNum), true);
+                                    //                        byte[] test1 = a.ToBytes(BPA.Helper.DataFormat.ABCD);
+                                    //                        int item = test1.ToInt();*/
+                                    //                        if (DeviceNum >= 1 && DeviceNum <= 8) 
+                                    //                        {
+                                    //                            SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX130." + (DeviceNum - 1), true);
+                                    //                        }else if (DeviceNum >= 9 && DeviceNum <= 16)
+                                    //                        {
+                                    //                            SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX131." + (DeviceNum - 9), true);
+                                    //                        }
+                                    //                        else if (DeviceNum >=17 && DeviceNum <= 24)
+                                    //                        {
+                                    //                            SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX132." + (DeviceNum - 17), true);
+                                    //                        }else if (DeviceNum >= 25 && DeviceNum <= 32)
+                                    //                        {
+                                    //                            SiemensDevice.GetInstance.MySiemens.Write("DB4.DBX133." + (DeviceNum - 25), true);
+                                    //                        }
+                                    //                        MessageNotify.GetInstance.ShowRunLog($"料仓：{DeviceNum}，配料完成");
+                                    //                        /*string res = SiemensDevice.GetInstance.MySiemens.Write("DB4.DBD130", item, 2);
+                                    //                        MessageNotify.GetInstance.ShowRunLog($"{res}");
+                                    //                        MessageNotify.GetInstance.ShowRunLog($"DB4.DBD130:{item.ToBinString()}");*/
+                                    //                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方{Recipes.ElementAt(i).RawMaterials.ElementAt(loc).DeviceIp},出料完成，状态复位");
+                                    //                    }
+                                    //                }
+                                    //            }
+                                    //        }
+                                    //    }
+                                    //}
                                 }
                                 int Finish_Count = StockStatus.Where(s => s.IssueStatus == 2).Count();
                                 if (StockStatus.Count >= Recipes.ElementAt(i).RawMaterials.Count && Finish_Count >= Recipes.ElementAt(i).RawMaterials.Count) //配方配料完成

From 4c00ed8748c5348b62375454a45602305b1ae498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Fri, 14 Apr 2023 19:35:30 +0800
Subject: [PATCH 21/96] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=92=AD=E6=8A=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BPASmartClient.CustomResource.csproj      |  48 ++++++
 .../Pages/Model/VoiceAPI.cs                   |  86 ++++++++++
 BPASmartClient.CustomResource/Vioce/0.wav     | Bin 0 -> 17294 bytes
 BPASmartClient.CustomResource/Vioce/1.wav     | Bin 0 -> 17294 bytes
 BPASmartClient.CustomResource/Vioce/2.wav     | Bin 0 -> 17294 bytes
 BPASmartClient.CustomResource/Vioce/3.wav     | Bin 0 -> 17294 bytes
 BPASmartClient.CustomResource/Vioce/4.wav     | Bin 0 -> 17294 bytes
 BPASmartClient.CustomResource/Vioce/5.wav     | Bin 0 -> 19278 bytes
 BPASmartClient.CustomResource/Vioce/6.wav     | Bin 0 -> 19278 bytes
 BPASmartClient.CustomResource/Vioce/7.wav     | Bin 0 -> 19278 bytes
 BPASmartClient.CustomResource/Vioce/8.wav     | Bin 0 -> 19278 bytes
 BPASmartClient.CustomResource/Vioce/9.wav     | Bin 0 -> 19278 bytes
 .../Vioce/号用户取餐.wav                 | Bin 0 -> 48078 bytes
 BPASmartClient.CustomResource/Vioce/请.wav   | Bin 0 -> 17294 bytes
 .../BPASmartClient.Device.csproj              |   1 +
 BPASmartClient.Device/Speech.cs               |  72 +++++++++
 BPASmartClient.MorkS/Control_Morks.cs         | 146 ++++++++---------
 BPASmartClient.MorkS/VoiceAPI.cs              | 123 ++++++++++-----
 .../Control_MorkSUpgradedVer.cs               |   3 +
 BPASmartClient/App.xaml.cs                    |   5 +
 WpfApp1/MainWindow.xaml                       |   1 +
 WpfApp1/MainWindow.xaml.cs                    |  21 ++-
 WpfApp1/Speech.cs                             | 149 ++++++++++++++++++
 WpfApp1/WpfApp1.csproj                        |   4 +
 24 files changed, 539 insertions(+), 120 deletions(-)
 create mode 100644 BPASmartClient.CustomResource/Pages/Model/VoiceAPI.cs
 create mode 100644 BPASmartClient.CustomResource/Vioce/0.wav
 create mode 100644 BPASmartClient.CustomResource/Vioce/1.wav
 create mode 100644 BPASmartClient.CustomResource/Vioce/2.wav
 create mode 100644 BPASmartClient.CustomResource/Vioce/3.wav
 create mode 100644 BPASmartClient.CustomResource/Vioce/4.wav
 create mode 100644 BPASmartClient.CustomResource/Vioce/5.wav
 create mode 100644 BPASmartClient.CustomResource/Vioce/6.wav
 create mode 100644 BPASmartClient.CustomResource/Vioce/7.wav
 create mode 100644 BPASmartClient.CustomResource/Vioce/8.wav
 create mode 100644 BPASmartClient.CustomResource/Vioce/9.wav
 create mode 100644 BPASmartClient.CustomResource/Vioce/号用户取餐.wav
 create mode 100644 BPASmartClient.CustomResource/Vioce/请.wav
 create mode 100644 BPASmartClient.Device/Speech.cs
 create mode 100644 WpfApp1/Speech.cs

diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
index 86047719..da3d3ed2 100644
--- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
+++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
@@ -266,8 +266,20 @@
     <None Remove="Image\顶部线条.png" />
     <None Remove="Image\顶部背景.png" />
     <None Remove="Image\黑菠萝科技.png" />
+    <None Remove="Vioce\0.wav" />
+    <None Remove="Vioce\1.wav" />
+    <None Remove="Vioce\2.wav" />
+    <None Remove="Vioce\3.wav" />
+    <None Remove="Vioce\4.wav" />
+    <None Remove="Vioce\5.wav" />
+    <None Remove="Vioce\6.wav" />
+    <None Remove="Vioce\7.wav" />
+    <None Remove="Vioce\8.wav" />
+    <None Remove="Vioce\9.wav" />
     <None Remove="Vioce\取餐通知.wav" />
+    <None Remove="Vioce\号用户取餐.wav" />
     <None Remove="Vioce\电子提示音.wav" />
+    <None Remove="Vioce\请.wav" />
   </ItemGroup>
 
   <ItemGroup>
@@ -550,6 +562,42 @@
     <Resource Include="Image\顶部线条.png" />
     <Resource Include="Image\顶部背景.png" />
     <Resource Include="Image\黑菠萝科技.png" />
+    <EmbeddedResource Include="Vioce\0.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Vioce\1.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Vioce\2.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Vioce\3.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Vioce\4.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Vioce\5.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Vioce\6.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Vioce\7.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Vioce\8.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Vioce\9.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Vioce\号用户取餐.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Vioce\请.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BPASmartClient.CustomResource/Pages/Model/VoiceAPI.cs b/BPASmartClient.CustomResource/Pages/Model/VoiceAPI.cs
new file mode 100644
index 00000000..c6330f28
--- /dev/null
+++ b/BPASmartClient.CustomResource/Pages/Model/VoiceAPI.cs
@@ -0,0 +1,86 @@
+using BPASmartClient.Message;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.CustomResource
+{
+    public class VoiceAPI
+    {
+        public VoiceAPI()
+        {
+
+        }
+
+        static VoiceAPI()
+        {
+            BPA.Helper.ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                while (msg.Count > 0)
+                {
+                    if (msg.TryDequeue(out string str))
+                    {
+                        WaitMeaLSpeak(str);
+                    }
+                }
+
+                Thread.Sleep(1000);
+
+            }), "语音播报", true);
+        }
+
+        [DllImport("winmm.dll")]
+        public static extern bool PlaySound(string pszSound, int hmod, int fdwSound);
+
+        private static ConcurrentQueue<string> msg { get; set; } = new ConcurrentQueue<string>();
+
+
+        public static void Speak(string s) => msg.Enqueue(s);
+
+
+        // 系统播放wav格式的文件
+        private static void m_SystemPlayWav(string strPlayFile)
+        {
+            try
+            {
+                if (strPlayFile.Trim() == "")
+                { return; }//为空不放
+
+                string strPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
+                strPath = strPath + strPlayFile;
+
+                int SND_FILENAME = 0x00020000;
+                int SND_ASYNC = 0x0001;
+                PlaySound(strPath, 0, SND_ASYNC | SND_FILENAME);//播放音乐
+            }
+            catch (Exception ex)
+            {
+                MessageLog.GetInstance.ShowEx(ex.Message);
+            }
+        }
+
+        private static void WaitMeaLSpeak(string meal, int count = 1, int IntervalTime = 1000)
+        {
+            m_SystemPlayWav(@"Vioce\电子提示音.wav");
+            Thread.Sleep(1000);
+            for (int m = 0; m < count; m++)
+            {
+                m_SystemPlayWav(@"Vioce\请.wav");
+                Thread.Sleep(500);
+                for (int i = 0; i < meal.Length; i++)
+                {
+                    string name = meal.Substring(i, 1);
+                    m_SystemPlayWav($"Vioce\\{name}.wav");
+                    Thread.Sleep(500);
+                }
+                m_SystemPlayWav(@"Vioce\号用户取餐.wav");
+                Thread.Sleep(1500 + IntervalTime);
+            }
+        }
+    }
+}
diff --git a/BPASmartClient.CustomResource/Vioce/0.wav b/BPASmartClient.CustomResource/Vioce/0.wav
new file mode 100644
index 0000000000000000000000000000000000000000..6f7f4a886a151e7f1d0c787c22f064174736e807
GIT binary patch
literal 17294
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

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Vioce/1.wav b/BPASmartClient.CustomResource/Vioce/1.wav
new file mode 100644
index 0000000000000000000000000000000000000000..91fc805924c3eb1adf3dbf0947f750e9ff162e8e
GIT binary patch
literal 17294
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

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Vioce/2.wav b/BPASmartClient.CustomResource/Vioce/2.wav
new file mode 100644
index 0000000000000000000000000000000000000000..b5273f5323b98ec3c03d2a313428cf687f937ef0
GIT binary patch
literal 17294
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

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Vioce/3.wav b/BPASmartClient.CustomResource/Vioce/3.wav
new file mode 100644
index 0000000000000000000000000000000000000000..bf8303726a7a40d999f8c3b1e1b847d9f3839ffd
GIT binary patch
literal 17294
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
P2M9bs-~j^vXA$^+uo~k&

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Vioce/4.wav b/BPASmartClient.CustomResource/Vioce/4.wav
new file mode 100644
index 0000000000000000000000000000000000000000..4f13363bf54e280f6ab54c831a1af1b2129de102
GIT binary patch
literal 17294
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
BK^Xu5

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Vioce/5.wav b/BPASmartClient.CustomResource/Vioce/5.wav
new file mode 100644
index 0000000000000000000000000000000000000000..ee49ad3db8b0514834350b47372b2c7bd1f5cf82
GIT binary patch
literal 19278
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

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Vioce/6.wav b/BPASmartClient.CustomResource/Vioce/6.wav
new file mode 100644
index 0000000000000000000000000000000000000000..f13dc26296a624623915eb46171077f3ba83dbff
GIT binary patch
literal 19278
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

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Vioce/7.wav b/BPASmartClient.CustomResource/Vioce/7.wav
new file mode 100644
index 0000000000000000000000000000000000000000..6ed2439b96cb5cdd1867bad22ac808486b0c705b
GIT binary patch
literal 19278
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
YGXl*BG$YWAKr;f(2s9(`{{sU511HloHUIzs

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Vioce/8.wav b/BPASmartClient.CustomResource/Vioce/8.wav
new file mode 100644
index 0000000000000000000000000000000000000000..b3112554b064bbc4706c84860f9f9dc76d619925
GIT binary patch
literal 19278
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

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Vioce/9.wav b/BPASmartClient.CustomResource/Vioce/9.wav
new file mode 100644
index 0000000000000000000000000000000000000000..3bf21ce64d5af5b350f6e55b5443cb11e98003c9
GIT binary patch
literal 19278
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

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Vioce/号用户取餐.wav b/BPASmartClient.CustomResource/Vioce/号用户取餐.wav
new file mode 100644
index 0000000000000000000000000000000000000000..1c2c42976a21e30cbba7391d2062982fddc00f23
GIT binary patch
literal 48078
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
Ut_5-}kZXZl3*=hh{|gKJFDXjN8UO$Q

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Vioce/请.wav b/BPASmartClient.CustomResource/Vioce/请.wav
new file mode 100644
index 0000000000000000000000000000000000000000..d87f370df391ca76e1fdad70fe3190f45ce2d22c
GIT binary patch
literal 17294
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
a;41@P8TiV;R|dW^@RfnD4E+Di!2be%P^y{$

literal 0
HcmV?d00001

diff --git a/BPASmartClient.Device/BPASmartClient.Device.csproj b/BPASmartClient.Device/BPASmartClient.Device.csproj
index 2cc1541a..f1da1ba7 100644
--- a/BPASmartClient.Device/BPASmartClient.Device.csproj
+++ b/BPASmartClient.Device/BPASmartClient.Device.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.Message" Version="1.0.86" />
+    <PackageReference Include="Microsoft.CognitiveServices.Speech" Version="1.27.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BPASmartClient.Device/Speech.cs b/BPASmartClient.Device/Speech.cs
new file mode 100644
index 00000000..4f20d9b5
--- /dev/null
+++ b/BPASmartClient.Device/Speech.cs
@@ -0,0 +1,72 @@
+using Microsoft.CognitiveServices.Speech;
+using Microsoft.CognitiveServices.Speech.Audio;
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.IO;
+using System.Diagnostics;
+
+namespace BPASmartClient.Device
+{
+    public class Speech
+    {
+        public static uint SND_ASYNC = 0x0001;
+        public static uint SND_FILENAME = 0x0002;
+
+        [DllImport("winmm.dll", CharSet = CharSet.Auto)]
+        public static extern int mciSendString(string m_strCmd, string m_strReceive, int m_v1, int m_v2);
+
+        [DllImport("Kernel32", CharSet = CharSet.Auto)]
+        public static extern Int32 GetShortPathName(string path, StringBuilder shortPath, Int32 shortPathLength);
+
+        private volatile static Speech _Instance;
+        public static Speech GetInstance => _Instance ?? (_Instance = new Speech());
+        private Speech() { }
+
+        /// <summary>
+        /// 播放语音
+        /// </summary>
+        /// <param name="SpeakText"></param>
+        public void Speak(string SpeakText)
+        {
+            string path = $"{AppDomain.CurrentDomain.BaseDirectory}Sound";//设置音频文件保存路径
+            Directory.CreateDirectory(path);
+            string SpeakPath = $"{path}\\{SpeakText}.wav";
+            SpeakPath = SpeakPath.Replace(' ', '_');
+            if (!File.Exists(SpeakPath))
+            {
+                var res = SynthesizeAudioAsync(SpeakText, SpeakPath);
+            }
+            StringBuilder shortPath = new StringBuilder(200);
+            int result = GetShortPathName(SpeakPath, shortPath, shortPath.Capacity);
+            string shortName = shortPath.ToString();
+            mciSendString(@"close all", null, 0, 0);
+            mciSendString(@"open " + shortName + " alias song", null, 0, 0);
+            mciSendString(@"play song", null, 0, 0);
+            //return "22";
+        }
+
+        /// <summary>
+        /// 文字转音频
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        private string SynthesizeAudioAsync(string text, string path)
+        {
+            var config = SpeechConfig.FromSubscription("b88f6907c8f64075a6169dc4d7dff65a", "chinanorth2");
+            config.SpeechSynthesisLanguage = "zh-CN"; //config.SpeechSynthesisVoiceName = "";
+            using var audioConfig = AudioConfig.FromWavFileOutput(path);
+            using var synthesizer = new SpeechSynthesizer(config, audioConfig);
+            synthesizer.SpeakTextAsync(text).Wait();
+            //await Task.Delay(TimeSpan.FromSeconds(2));
+            return "1";
+        }
+
+
+    }
+
+
+
+
+}
diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index 41e0aa39..8f91aba8 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -23,6 +23,7 @@ using BPA.Models;
 using System.Speech.Synthesis;
 using System.Windows.Forms;
 using System.Media;
+using BPASmartClient.CustomResource;
 
 namespace BPASmartClient.MorkS
 {
@@ -317,65 +318,65 @@ namespace BPASmartClient.MorkS
         {
             EventBus.EventBus.GetInstance().Subscribe<DoOrderEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBackHandle)
             {
-                 if (@event == null) return;
-                 if (@event is DoOrderEvent order)
-                 {
-                     mORKS.doOrderEvents.Add(order);
-                     if (order.MorkOrder.GoodBatchings == null) return;
-                     if (mORKS.HistorySuborderId.Contains(order.MorkOrder.SuborderId)) return;
-                     OrderCount++;
-                     if (DateTime.Now.Subtract(Json<OrderStatistics>.Data.StatisticsTime).Days != 0)
-                         Json<OrderStatistics>.Data.Count = 0;
-                     Json<OrderStatistics>.Data.StatisticsTime = DateTime.Now;
-                     Json<OrderStatistics>.Data.Count++;
-                     Json<OrderStatistics>.Save();
-                     OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT);
-                     if (order.MorkOrder.GoodBatchings.Count <= 1)
-                     {
-                         DeviceProcessLogShow($"数据解析失败，商品物料信息为空,请检查后台配置！");
-                         return;
-                     }
-                     DeviceProcessLogShow($"接收到{OrderCount}次订单，订单ID：{order.MorkOrder.SuborderId}");
-                     mORKS.HistorySuborderId.Add(order.MorkOrder.SuborderId);
-                     foreach (var item in order.MorkOrder.GoodBatchings)
-                     {
-                         var res = orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId);
-                         if (res != null)
-                         {
-                             if (ushort.TryParse(res.BatchingLoc, out ushort loc))
-                             {
-                                 if (loc >= 1 && loc <= 5)
-                                 {
-                                     if (mORKS.RBTakeNoodleTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
-                                         mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { GoodName = order.MorkOrder.GoodsName, Loc = ushort.Parse(res.BatchingLoc), SuborderId = order.MorkOrder.SuborderId, BatchingId = res.BatchingId });
-                                 }
-                                 else if (loc >= 10 && loc <= 11)
-                                 {
-                                     int index = 0;
-                                     if (recipeBoms != null)
-                                     {
-                                         index = Array.FindIndex(recipeBoms.RecipeIds?.ToArray(), p => p.RecipeId == order.MorkOrder.RecipeId);
-                                         index++;
-                                     }
-                                     if (mORKS.TakeBowlTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
-                                         mORKS.TakeBowlTask.Enqueue(new OrderLocInfo()
-                                         {
-                                             BatchingId = res.BatchingId,
-                                             GoodName = order.MorkOrder.GoodsName,
-                                             Loc = ushort.Parse(res.BatchingLoc),
-                                             SuborderId = order.MorkOrder.SuborderId,
-                                             RecipeNumber = (index >= 1 && index <= 10) ? (ushort)index : (ushort)0
-                                         });
-                                 }
-                             }
-                         }
-                         else
-                         {
-                             DeviceProcessLogShow($"数据解析失败，未找到商品信息,请检查后台配置！");
-                         }
-                     }
-                 }
-             });
+                if (@event == null) return;
+                if (@event is DoOrderEvent order)
+                {
+                    mORKS.doOrderEvents.Add(order);
+                    if (order.MorkOrder.GoodBatchings == null) return;
+                    if (mORKS.HistorySuborderId.Contains(order.MorkOrder.SuborderId)) return;
+                    OrderCount++;
+                    if (DateTime.Now.Subtract(Json<OrderStatistics>.Data.StatisticsTime).Days != 0)
+                        Json<OrderStatistics>.Data.Count = 0;
+                    Json<OrderStatistics>.Data.StatisticsTime = DateTime.Now;
+                    Json<OrderStatistics>.Data.Count++;
+                    Json<OrderStatistics>.Save();
+                    OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT);
+                    if (order.MorkOrder.GoodBatchings.Count <= 1)
+                    {
+                        DeviceProcessLogShow($"数据解析失败，商品物料信息为空,请检查后台配置！");
+                        return;
+                    }
+                    DeviceProcessLogShow($"接收到{OrderCount}次订单，订单ID：{order.MorkOrder.SuborderId}");
+                    mORKS.HistorySuborderId.Add(order.MorkOrder.SuborderId);
+                    foreach (var item in order.MorkOrder.GoodBatchings)
+                    {
+                        var res = orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId);
+                        if (res != null)
+                        {
+                            if (ushort.TryParse(res.BatchingLoc, out ushort loc))
+                            {
+                                if (loc >= 1 && loc <= 5)
+                                {
+                                    if (mORKS.RBTakeNoodleTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                                        mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { GoodName = order.MorkOrder.GoodsName, Loc = ushort.Parse(res.BatchingLoc), SuborderId = order.MorkOrder.SuborderId, BatchingId = res.BatchingId });
+                                }
+                                else if (loc >= 10 && loc <= 11)
+                                {
+                                    int index = 0;
+                                    if (recipeBoms != null)
+                                    {
+                                        index = Array.FindIndex(recipeBoms.RecipeIds?.ToArray(), p => p.RecipeId == order.MorkOrder.RecipeId);
+                                        index++;
+                                    }
+                                    if (mORKS.TakeBowlTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                                        mORKS.TakeBowlTask.Enqueue(new OrderLocInfo()
+                                        {
+                                            BatchingId = res.BatchingId,
+                                            GoodName = order.MorkOrder.GoodsName,
+                                            Loc = ushort.Parse(res.BatchingLoc),
+                                            SuborderId = order.MorkOrder.SuborderId,
+                                            RecipeNumber = (index >= 1 && index <= 10) ? (ushort)index : (ushort)0
+                                        });
+                                }
+                            }
+                        }
+                        else
+                        {
+                            DeviceProcessLogShow($"数据解析失败，未找到商品信息,请检查后台配置！");
+                        }
+                    }
+                }
+            });
         }
 
         public override void MainTask()
@@ -663,7 +664,6 @@ namespace BPASmartClient.MorkS
                 DeviceProcessLogShow($"订单【{mORKS.OutMealId}】制作完成");
                 mORKS.CookCompleteFlatBit = true;
                 mORKS.OutNoodleing = false;
-                WaitMeaLSpeak(mORKS.OutMealName);
             }
 
             //加汤
@@ -678,6 +678,8 @@ namespace BPASmartClient.MorkS
                 OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
                 DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成");
                 ResetCookComplete();
+                DeviceProcessLogShow($"出餐订单名称【{mORKS.OutMealName}】");
+                VoiceAPI.Speak(mORKS.OutMealName);
                 mORKS.CookCompleteFlatBit = false;
                 mORKS.OutMealId = string.Empty;
                 mORKS.OutMealName = string.Empty;
@@ -706,17 +708,19 @@ namespace BPASmartClient.MorkS
 
 
         }
-        /// <summary>
-        /// 语音提醒取餐
-        /// </summary>
-        /// <param name="meal"></param>
-        private void WaitMeaLSpeak(string meal)
-        {
-            VoiceAPI.m_SystemPlayWav(@"Vioce\电子提示音.wav");
-            Thread.Sleep(1000);
-            if (meal != null) mORKS.speech.Speak(meal);
-            VoiceAPI.m_SystemPlayWav(@"Vioce\取餐通知.wav");
-        }
+        ///// <summary>
+        ///// 语音提醒取餐
+        ///// </summary>
+        ///// <param name="meal"></param>
+        //private void WaitMeaLSpeak(string meal)
+        //{
+        //    VoiceAPI.m_SystemPlayWav(@"Vioce\电子提示音.wav");
+        //    Thread.Sleep(1000);
+        //    if (meal != null) mORKS.speech.Speak(meal);
+        //    VoiceAPI.m_SystemPlayWav(@"Vioce\取餐通知.wav");
+        //}
+
+
 
         #region PLC 控制函数
 
diff --git a/BPASmartClient.MorkS/VoiceAPI.cs b/BPASmartClient.MorkS/VoiceAPI.cs
index 99dcc433..9608396e 100644
--- a/BPASmartClient.MorkS/VoiceAPI.cs
+++ b/BPASmartClient.MorkS/VoiceAPI.cs
@@ -1,42 +1,81 @@
-using BPASmartClient.Message;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BPASmartClient.MorkS
-{
-    public class VoiceAPI
-    {
-        public VoiceAPI()
-        {
-        }
-       
-        [DllImport("winmm.dll")]
-        public static extern bool PlaySound(string pszSound, int hmod, int fdwSound);
-
-
-        // 系统播放wav格式的文件
-        public static void m_SystemPlayWav(string strPlayFile)
-        {
-            try
-            {
-                if (strPlayFile.Trim() == "")
-                { return; }//为空不放
-
-                string strPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
-                strPath = strPath + strPlayFile;
-
-                int SND_FILENAME = 0x00020000;
-                int SND_ASYNC = 0x0001;
-                PlaySound(strPath, 0, SND_ASYNC | SND_FILENAME);//播放音乐
-            }       
-            catch (Exception ex)
-            {
-                MessageLog.GetInstance.ShowEx(ex.Message);
-            }
-        }
-    }
-}
+//using BPASmartClient.Message;
+//using System;
+//using System.Collections.Concurrent;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Runtime.InteropServices;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
+
+//namespace BPASmartClient.MorkS
+//{
+//    public class VoiceAPI
+//    {
+//        public VoiceAPI()
+//        {
+//            BPA.Helper.ThreadManage.GetInstance().StartLong(new Action(() =>
+//            {
+//                while (msg.Count > 0)
+//                {
+//                    if (msg.TryDequeue(out string str))
+//                    {
+//                        WaitMeaLSpeak(str);
+//                    }
+//                }
+
+//                Thread.Sleep(1000);
+
+//            }), "语音播报", true);
+//        }
+
+//        [DllImport("winmm.dll")]
+//        public static extern bool PlaySound(string pszSound, int hmod, int fdwSound);
+
+//        private static ConcurrentQueue<string> msg { get; set; } = new ConcurrentQueue<string>();
+
+
+//        public static void Speak(string s) => msg.Enqueue(s);
+
+
+//        // 系统播放wav格式的文件
+//        private static void m_SystemPlayWav(string strPlayFile)
+//        {
+//            try
+//            {
+//                if (strPlayFile.Trim() == "")
+//                { return; }//为空不放
+
+//                string strPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
+//                strPath = strPath + strPlayFile;
+
+//                int SND_FILENAME = 0x00020000;
+//                int SND_ASYNC = 0x0001;
+//                PlaySound(strPath, 0, SND_ASYNC | SND_FILENAME);//播放音乐
+//            }
+//            catch (Exception ex)
+//            {
+//                MessageLog.GetInstance.ShowEx(ex.Message);
+//            }
+//        }
+
+//        private void WaitMeaLSpeak(string meal, int count = 1, int IntervalTime = 1000)
+//        {
+//            m_SystemPlayWav(@"Vioce\电子提示音.wav");
+//            Thread.Sleep(1000);
+//            for (int m = 0; m < count; m++)
+//            {
+//                m_SystemPlayWav(@"Vioce\请.wav");
+//                Thread.Sleep(500);
+//                for (int i = 0; i < meal.Length; i++)
+//                {
+//                    string name = meal.Substring(i, 1);
+//                    m_SystemPlayWav($"Vioce\\{name}.wav");
+//                    Thread.Sleep(500);
+//                }
+//                m_SystemPlayWav(@"Vioce\号用户取餐.wav");
+//                Thread.Sleep(1500 + IntervalTime);
+//            }
+//        }
+//    }
+//}
diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index fef122c1..06b64a60 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -22,6 +22,7 @@ using BPASmartClient.Model.小炒机;
 using BPA.Models;
 using System.Windows.Forms;
 using System.Media;
+using BPASmartClient.CustomResource;
 //using BPA.Helper;
 
 namespace BPASmartClient.MorkSUpgradedVer
@@ -651,6 +652,8 @@ namespace BPASmartClient.MorkSUpgradedVer
                 OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
                 DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成");
                 WriteData("M10.1", false);
+                DeviceProcessLogShow($"出餐订单名称【{mORKS.OutMealName}】");
+                VoiceAPI.Speak(mORKS.OutMealName);
                 mORKS.CookCompleteFlatBit = false;
                 mORKS.OutMealId = string.Empty;
                 mORKS.OutMealName = string.Empty;
diff --git a/BPASmartClient/App.xaml.cs b/BPASmartClient/App.xaml.cs
index b5919965..4ef458a1 100644
--- a/BPASmartClient/App.xaml.cs
+++ b/BPASmartClient/App.xaml.cs
@@ -1,5 +1,7 @@
 using BPA.Message;
 using BPA.Message.Enum;
+using BPASmartClient.CustomResource;
+using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.Helper;
 using BPASmartClient.Message;
 using BPASmartClient.Model;
@@ -10,6 +12,8 @@ using System.Configuration;
 using System.Data;
 using System.Drawing;
 using System.Linq;
+using System.Speech.Synthesis;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms;
@@ -33,6 +37,7 @@ namespace BPASmartClient
             NoCompleteOrderInit();
         }
 
+
         /// <summary>
         /// 分屏显示
         /// </summary>
diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml
index 9e5f5e2b..2a8012a0 100644
--- a/WpfApp1/MainWindow.xaml
+++ b/WpfApp1/MainWindow.xaml
@@ -25,5 +25,6 @@
             Height="30"
             Margin="300,24,400,381"
             Content="使能" Click="Button_Click_2" />
+        <TextBox Name="text" Height="30" Margin="36,80,400,325"/>
     </Grid>
 </Window>
diff --git a/WpfApp1/MainWindow.xaml.cs b/WpfApp1/MainWindow.xaml.cs
index ea98f3da..3e03cd53 100644
--- a/WpfApp1/MainWindow.xaml.cs
+++ b/WpfApp1/MainWindow.xaml.cs
@@ -88,24 +88,31 @@ namespace WpfApp1
 
         }
 
-        JaKaHelper jaKaHelper = new JaKaHelper();
+
 
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-            jaKaHelper.Conn("192.168.0.12");
-            MessageBox.Show($"连接成功,{jaKaHelper.rshd}");
+
+            Speech.GetInstance.aa("请0001号客户到1号窗口取餐");
+            //Task.Run(() =>
+            //{
+            //    Speech.GetInstance.Speak($"请0001号客户到1号窗口取餐");
+            //});
+            //Speech.GetInstance.SpeechSpeak(new SpeechInfo()
+            //{
+            //    Text = text.Text,
+            //    time = 10000
+            //});
         }
 
         private void Button_Click_1(object sender, RoutedEventArgs e)
         {
-            jaKaHelper.Power_On();
-            MessageBox.Show($"上电成功,{jaKaHelper.rshd}");
+
         }
 
         private void Button_Click_2(object sender, RoutedEventArgs e)
         {
-            jaKaHelper.Enable_robot();
-            MessageBox.Show($"使能成功,{jaKaHelper.rshd}");
+
         }
     }
 }
diff --git a/WpfApp1/Speech.cs b/WpfApp1/Speech.cs
new file mode 100644
index 00000000..d6a91b65
--- /dev/null
+++ b/WpfApp1/Speech.cs
@@ -0,0 +1,149 @@
+using Microsoft.CognitiveServices.Speech;
+using Microsoft.CognitiveServices.Speech.Audio;
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.IO;
+using System.Diagnostics;
+using System.Collections.Concurrent;
+using System.Threading;
+using System.Windows.Documents;
+
+namespace WpfApp1
+{
+    public class Speech
+    {
+        public static uint SND_ASYNC = 0x0001;
+        public static uint SND_FILENAME = 0x0002;
+
+        [DllImport("winmm.dll", CharSet = CharSet.Auto)]
+        public static extern int mciSendString(string m_strCmd, string m_strReceive, int m_v1, int m_v2);
+
+        [DllImport("Kernel32", CharSet = CharSet.Auto)]
+        public static extern Int32 GetShortPathName(string path, StringBuilder shortPath, Int32 shortPathLength);
+
+        private volatile static Speech _Instance;
+        public static Speech GetInstance => _Instance ?? (_Instance = new Speech());
+        private Speech()
+        {
+            //Task.Factory.StartNew(() =>
+            //{
+            //    while (true)
+            //    {
+            //        while (speechInfos.Count > 0)
+            //        {
+            //            if (speechInfos.TryDequeue(out SpeechInfo si))
+            //            {
+            //                for (int i = 0; i < si.Count; i++)
+            //                {
+            //                    Speak(si.Text);
+            //                    Thread.Sleep(si.time);
+            //                }
+            //            }
+            //        }
+            //        Thread.Sleep(1000);
+            //    }
+            //});
+        }
+        private ConcurrentQueue<SpeechInfo> speechInfos = new ConcurrentQueue<SpeechInfo>();
+
+        public void SpeechSpeak(SpeechInfo si)
+        {
+            speechInfos.Enqueue(si);
+        }
+
+        private void OutputSpeechSynthesisResult(SpeechSynthesisResult speechSynthesisResult, string text)
+        {
+            switch (speechSynthesisResult.Reason)
+            {
+                case ResultReason.SynthesizingAudioCompleted:
+                    Console.WriteLine($"Speech synthesized for text: [{text}]");
+                    break;
+                case ResultReason.Canceled:
+                    var cancellation = SpeechSynthesisCancellationDetails.FromResult(speechSynthesisResult);
+                    Console.WriteLine($"CANCELED: Reason={cancellation.Reason}");
+
+                    if (cancellation.Reason == CancellationReason.Error)
+                    {
+                        Console.WriteLine($"CANCELED: ErrorCode={cancellation.ErrorCode}");
+                        Console.WriteLine($"CANCELED: ErrorDetails=[{cancellation.ErrorDetails}]");
+                        Console.WriteLine($"CANCELED: Did you set the speech resource key and region values?");
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        public async void aa(string text)
+        {
+            var speechConfig = SpeechConfig.FromSubscription("b88f6907c8f64075a6169dc4d7dff65a", "chinanorth2");
+
+            // The language of the voice that speaks.
+            speechConfig.SpeechSynthesisVoiceName = "zh-CN";
+
+            using (var speechSynthesizer = new SpeechSynthesizer(speechConfig))
+            {
+                // Get text from the console and synthesize to the default speaker.
+                Console.WriteLine("Enter some text that you want to speak >");
+                //string text = Console.ReadLine();
+
+                var speechSynthesisResult = await speechSynthesizer.SpeakTextAsync(text);
+                OutputSpeechSynthesisResult(speechSynthesisResult, text);
+            }
+
+            Console.WriteLine("Press any key to exit...");
+        }
+
+        /// <summary>
+        /// 播放语音
+        /// </summary>
+        /// <param name="SpeakText"></param>
+        public void Speak(string SpeakText)
+        {
+            string path = $"{AppDomain.CurrentDomain.BaseDirectory}Sound";//设置音频文件保存路径
+            Directory.CreateDirectory(path);
+            string SpeakPath = $"{path}\\{SpeakText}.wav";
+            SpeakPath = SpeakPath.Replace(' ', '_');
+            if (!File.Exists(SpeakPath))
+            {
+                var res = SynthesizeAudioAsync(SpeakText, SpeakPath);
+            }
+            StringBuilder shortPath = new StringBuilder(200);
+            int result = GetShortPathName(SpeakPath, shortPath, shortPath.Capacity);
+            string shortName = shortPath.ToString();
+            mciSendString(@"close all", null, 0, 0);
+            mciSendString(@"open " + shortName + " alias song", null, 0, 0);
+            mciSendString(@"play song", null, 0, 0);
+            //return "22";
+        }
+
+        /// <summary>
+        /// 文字转音频
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        private string SynthesizeAudioAsync(string text, string path)
+        {
+            var config = SpeechConfig.FromSubscription("b88f6907c8f64075a6169dc4d7dff65a", "chinanorth2");
+            config.SpeechSynthesisLanguage = "zh-CN"; //config.SpeechSynthesisVoiceName = "";
+            using var audioConfig = AudioConfig.FromWavFileOutput(path);
+            using var synthesizer = new SpeechSynthesizer(config, audioConfig);
+            synthesizer.SpeakTextAsync(text).Wait();
+            //await Task.Delay(TimeSpan.FromSeconds(2));
+            return "1";
+        }
+
+
+    }
+
+
+    public class SpeechInfo
+    {
+        public string Text { get; set; }
+        public int Count { get; set; } = 1;
+        public int time { get; set; } = 2000;
+    }
+
+}
diff --git a/WpfApp1/WpfApp1.csproj b/WpfApp1/WpfApp1.csproj
index 4bf6fe58..e622e1af 100644
--- a/WpfApp1/WpfApp1.csproj
+++ b/WpfApp1/WpfApp1.csproj
@@ -7,6 +7,10 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CognitiveServices.Speech" Version="1.19.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\BPASmartClient.JakaRobot\BPASmartClient.JakaRobot.csproj" />
     <ProjectReference Include="..\BPASmartClient.S7Net\BPASmartClient.S7Net.csproj" />

From d45e9e65debfed1ae0c830e518a48f830f660aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Sat, 15 Apr 2023 10:53:24 +0800
Subject: [PATCH 22/96] =?UTF-8?q?=E5=8F=AB=E5=8F=B7=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.Business/Plugin/OrderProxy.cs  |  6 +++++-
 .../Pages/Model/VoiceAPI.cs                   |  6 +++++-
 BPASmartClient.MorkS/Control_Morks.cs         | 19 ++++++++++++++++---
 BPASmartClient.MorkS/GVL_MORKS.cs             | 16 ++++++++++++++++
 BPASmartClient.MorkS/OrderLocInfo.cs          |  1 +
 .../Control_MorkSUpgradedVer.cs               |  9 +++++++--
 .../GVL_MorkSUpgradedVer.cs                   | 15 +++++++++++++++
 .../OrderLocInfo.cs                           |  1 +
 .../OrderStatusViewModel.cs                   |  1 -
 BPASmartClient/App.config                     |  2 +-
 BPASmartClient/App.xaml.cs                    |  5 +++++
 11 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/BPASmartClient.Business/Plugin/OrderProxy.cs b/BPASmartClient.Business/Plugin/OrderProxy.cs
index 8fd409d5..d73a9db8 100644
--- a/BPASmartClient.Business/Plugin/OrderProxy.cs
+++ b/BPASmartClient.Business/Plugin/OrderProxy.cs
@@ -56,6 +56,9 @@ namespace BPASmartClient.Business
                             new OrderStatusChangedEvent() { SortNum = mork.SortNum.ToString(), Status = ORDER_STATUS.COMPLETED_COOK, SubOrderId = mork.SuborderId, GoodName = mork.GoodsName }.Publish();
                             Thread.Sleep(5000);
                             new OrderStatusChangedEvent() { SortNum = mork.SortNum.ToString(), Status = ORDER_STATUS.COMPLETED_TAKE, SubOrderId = mork.SuborderId, GoodName = mork.GoodsName }.Publish();
+                            string num = mork.SortNum.ToString().Substring(0, mork.SortNum.ToString().Length - 1);
+                            if (int.TryParse(num, out int sort))
+                                ActionManage.GetInstance.Send("COMPLETED_TAKE_Notify", sort.ToString("0000"));
                             Thread.Sleep(2000);
                         }
                     }
@@ -114,7 +117,8 @@ namespace BPASmartClient.Business
                 else if (message is StirFryPushMessage frybom)
                 {
                     IDevice device = deviceMgr.GetDevices().FirstOrDefault(x => x.DeviceId == 28);
-                    new StirFryGoodsEvent() {
+                    new StirFryGoodsEvent()
+                    {
                         DeviceId = device.DeviceId,
                         stirFrymessage = frybom
                     }.Publish();
diff --git a/BPASmartClient.CustomResource/Pages/Model/VoiceAPI.cs b/BPASmartClient.CustomResource/Pages/Model/VoiceAPI.cs
index c6330f28..a7577d0d 100644
--- a/BPASmartClient.CustomResource/Pages/Model/VoiceAPI.cs
+++ b/BPASmartClient.CustomResource/Pages/Model/VoiceAPI.cs
@@ -40,7 +40,11 @@ namespace BPASmartClient.CustomResource
         private static ConcurrentQueue<string> msg { get; set; } = new ConcurrentQueue<string>();
 
 
-        public static void Speak(string s) => msg.Enqueue(s);
+        public static void Speak(string s)
+        {
+            if (int.TryParse(s.Substring(0, s.Length - 1), out int num))
+                msg.Enqueue(num.ToString("0000"));
+        }
 
 
         // 系统播放wav格式的文件
diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index 8f91aba8..cf810647 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -348,7 +348,14 @@ namespace BPASmartClient.MorkS
                                 if (loc >= 1 && loc <= 5)
                                 {
                                     if (mORKS.RBTakeNoodleTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
-                                        mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { GoodName = order.MorkOrder.GoodsName, Loc = ushort.Parse(res.BatchingLoc), SuborderId = order.MorkOrder.SuborderId, BatchingId = res.BatchingId });
+                                        mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo()
+                                        {
+                                            GoodName = order.MorkOrder.GoodsName,
+                                            Loc = ushort.Parse(res.BatchingLoc),
+                                            SuborderId = order.MorkOrder.SuborderId,
+                                            SortNum = order.MorkOrder.SortNum,
+                                            BatchingId = res.BatchingId
+                                        });
                                 }
                                 else if (loc >= 10 && loc <= 11)
                                 {
@@ -365,6 +372,7 @@ namespace BPASmartClient.MorkS
                                             GoodName = order.MorkOrder.GoodsName,
                                             Loc = ushort.Parse(res.BatchingLoc),
                                             SuborderId = order.MorkOrder.SuborderId,
+                                            SortNum = order.MorkOrder.SortNum,
                                             RecipeNumber = (index >= 1 && index <= 10) ? (ushort)index : (ushort)0
                                         });
                                 }
@@ -417,6 +425,7 @@ namespace BPASmartClient.MorkS
             {
                 mORKS.TakeBowlId = orderLocInfo.SuborderId;
                 mORKS.TakeBowName = orderLocInfo.GoodName;
+                mORKS.TakeBowSortNum = orderLocInfo.SortNum;
                 TakeBowlControl(orderLocInfo.Loc);
                 SetRecipeNumber(orderLocInfo.RecipeNumber);
                 OrderChange(mORKS.TakeBowlId, ORDER_STATUS.COOKING);
@@ -631,6 +640,7 @@ namespace BPASmartClient.MorkS
                         if (!string.IsNullOrEmpty(mORKS.OutMealId)) OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
                         mORKS.OutMealId = mORKS.IngredientsCompleteId;
                         mORKS.OutMealName = mORKS.IngredientsCompleteName;
+                        mORKS.OutMealSortNum = mORKS.IngredientsCompleteSortNum;
                         mORKS.IngredientsCompleteId = string.Empty;
                         mORKS.CookNodelId[loc] = string.Empty;
                         DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{mORKS.OutMealId}");
@@ -651,8 +661,10 @@ namespace BPASmartClient.MorkS
             {
                 mORKS.IngredientsCompleteId = mORKS.TakeBowlId;
                 mORKS.IngredientsCompleteName = mORKS.TakeBowName;
+                mORKS.IngredientsCompleteSortNum = mORKS.TakeBowSortNum;
                 mORKS.TakeBowlId = string.Empty;
                 mORKS.TakeBowName = string.Empty;
+                mORKS.TakeBowSortNum = 0;
                 DeviceProcessLogShow($"碗到位，允许到面,{mORKS.IngredientsCompleteId}");
                 mORKS.TakeBowlInterlock = false;
             }
@@ -678,11 +690,12 @@ namespace BPASmartClient.MorkS
                 OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
                 DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成");
                 ResetCookComplete();
-                DeviceProcessLogShow($"出餐订单名称【{mORKS.OutMealName}】");
-                VoiceAPI.Speak(mORKS.OutMealName);
+                DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
+                VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
                 mORKS.CookCompleteFlatBit = false;
                 mORKS.OutMealId = string.Empty;
                 mORKS.OutMealName = string.Empty;
+                mORKS.OutMealSortNum = 0;
             }
 
             //机器人取面完成信号检测
diff --git a/BPASmartClient.MorkS/GVL_MORKS.cs b/BPASmartClient.MorkS/GVL_MORKS.cs
index 7270d656..4cebd61e 100644
--- a/BPASmartClient.MorkS/GVL_MORKS.cs
+++ b/BPASmartClient.MorkS/GVL_MORKS.cs
@@ -337,6 +337,11 @@ namespace BPASmartClient.MorkS
         /// 取碗订单名称
         /// </summary>
         public string TakeBowName = string.Empty;
+        /// <summary>
+        /// 配料完成订单名称
+        /// </summary>
+        public int TakeBowSortNum = 0;
+
 
         /// <summary>
         /// 配料完成订单ID
@@ -346,12 +351,18 @@ namespace BPASmartClient.MorkS
         /// 配料完成订单名称
         /// </summary>
         public string IngredientsCompleteName = string.Empty;
+        /// <summary>
+        /// 配料完成订单名称
+        /// </summary>
+        public int IngredientsCompleteSortNum = 0;
+
 
         /// <summary>
         /// 煮面口对应的订单ID
         /// </summary>
         public string[] CookNodelId = new string[6] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, };
 
+
         /// <summary>
         /// 出餐订单ID
         /// </summary>
@@ -360,6 +371,11 @@ namespace BPASmartClient.MorkS
         /// 出餐订单名称
         /// </summary>
         public string OutMealName = string.Empty;
+        /// <summary>
+        /// 出餐排序号
+        /// </summary>
+        public int OutMealSortNum = 0;
+
 
         /// <summary>
         /// 转台位置轮询
diff --git a/BPASmartClient.MorkS/OrderLocInfo.cs b/BPASmartClient.MorkS/OrderLocInfo.cs
index ab815d02..942ee255 100644
--- a/BPASmartClient.MorkS/OrderLocInfo.cs
+++ b/BPASmartClient.MorkS/OrderLocInfo.cs
@@ -16,6 +16,7 @@ namespace BPASmartClient.MorkS
         public string GoodName { get; set; }
 
         public int RecipeId { get; set; }
+        public int SortNum { get; set; }
 
         public List<int> Recipes { get; set; }
 
diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index 06b64a60..09505370 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -416,6 +416,7 @@ namespace BPASmartClient.MorkSUpgradedVer
             {
                 mORKS.TakeBowlId = orderLocInfo.SuborderId;
                 mORKS.TakeBowName = orderLocInfo.GoodName;
+                mORKS.TakeBowSortNum = orderLocInfo.SortNum;
                 TakeBowlControl(orderLocInfo.Loc);
                 OrderChange(mORKS.TakeBowlId, ORDER_STATUS.COOKING);
                 DeviceProcessLogShow($"订单【{mORKS.TakeBowlId}】执行取碗控制,位置:[{orderLocInfo.Loc}]");
@@ -621,6 +622,7 @@ namespace BPASmartClient.MorkSUpgradedVer
                         mORKS.CookCompleteFlatBit = true;
                         mORKS.OutMealId = mORKS.IngredientsCompleteId;
                         mORKS.OutMealName = mORKS.IngredientsCompleteName;
+                        mORKS.OutMealSortNum = mORKS.IngredientsCompleteSortNum;
                         mORKS.IngredientsCompleteId = string.Empty;
                         mORKS.CookNodelId[loc] = string.Empty;
                         DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{mORKS.OutMealId}");
@@ -640,6 +642,8 @@ namespace BPASmartClient.MorkSUpgradedVer
             {
                 mORKS.IngredientsCompleteId = mORKS.TakeBowlId;
                 mORKS.IngredientsCompleteName = mORKS.TakeBowName;
+                mORKS.IngredientsCompleteSortNum = mORKS.TakeBowSortNum;
+                mORKS.TakeBowSortNum = 0;
                 mORKS.TakeBowlId = string.Empty;
                 mORKS.TakeBowName = string.Empty;
                 DeviceProcessLogShow($"碗到位，允许到面,{mORKS.IngredientsCompleteId}");
@@ -652,11 +656,12 @@ namespace BPASmartClient.MorkSUpgradedVer
                 OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
                 DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成");
                 WriteData("M10.1", false);
-                DeviceProcessLogShow($"出餐订单名称【{mORKS.OutMealName}】");
-                VoiceAPI.Speak(mORKS.OutMealName);
+                DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
+                VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
                 mORKS.CookCompleteFlatBit = false;
                 mORKS.OutMealId = string.Empty;
                 mORKS.OutMealName = string.Empty;
+                mORKS.OutMealSortNum = 0;
             }
 
             //机器人取面完成信号检测
diff --git a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
index e923f434..7060f697 100644
--- a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
@@ -120,6 +120,11 @@ namespace BPASmartClient.MorkSUpgradedVer
         /// 取碗订单名称
         /// </summary>
         public string TakeBowName { get; set; } = string.Empty;
+        /// <summary>
+        /// 配料完成订单名称
+        /// </summary>
+        public int TakeBowSortNum { get; set; } = 0;
+
 
         /// <summary>
         /// 允许倒面位置ID
@@ -129,6 +134,11 @@ namespace BPASmartClient.MorkSUpgradedVer
         /// 配料完成订单名称
         /// </summary>
         public string IngredientsCompleteName { get; set; } = string.Empty;
+        /// <summary>
+        /// 配料完成订单名称
+        /// </summary>
+        public int IngredientsCompleteSortNum { get; set; } = 0;
+
 
         /// <summary>
         /// 煮面口对应的订单ID
@@ -143,6 +153,11 @@ namespace BPASmartClient.MorkSUpgradedVer
         /// 出餐订单名称
         /// </summary>
         public string OutMealName { get; set; } = string.Empty;
+        /// <summary>
+        /// 出餐排序号
+        /// </summary>
+        public int OutMealSortNum { get; set; } = 0;
+
 
         /// <summary>
         /// 转台位置轮询
diff --git a/BPASmartClient.MorkSUpgradedVer/OrderLocInfo.cs b/BPASmartClient.MorkSUpgradedVer/OrderLocInfo.cs
index 823c6985..df679c4f 100644
--- a/BPASmartClient.MorkSUpgradedVer/OrderLocInfo.cs
+++ b/BPASmartClient.MorkSUpgradedVer/OrderLocInfo.cs
@@ -14,6 +14,7 @@ namespace BPASmartClient.MorkSUpgradedVer
         public ushort RecipeNumber { get; set; }
         public int BatchingId { get; set; }
         public string GoodName { get; set; }
+        public int SortNum { get; set; }
 
         public int RecipeId { get; set; }
 
diff --git a/BPASmartClient.ViewModel/OrderStatusViewModel.cs b/BPASmartClient.ViewModel/OrderStatusViewModel.cs
index ab3b4d1a..fcdfee84 100644
--- a/BPASmartClient.ViewModel/OrderStatusViewModel.cs
+++ b/BPASmartClient.ViewModel/OrderStatusViewModel.cs
@@ -124,7 +124,6 @@ namespace BPASmartClient.ViewModel
                                 WaitTakeMeal.Insert(0, orderStatusLists.ElementAt(index));
                                 orderStatusLists.RemoveAt(index);
                             }
-
                         });
                     }
 
diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index 618157de..219c69c8 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -4,7 +4,7 @@
 
     <!--通用配置-->
     <!--<add key="ClientId" value="43"/>-->
-    <add key="IsEnableTest" value="false"/>
+    <add key="IsEnableTest" value="true"/>
 
     <!--测试环境-->
     <add key="apollouri" value="http://10.2.1.21:28080/"/>
diff --git a/BPASmartClient/App.xaml.cs b/BPASmartClient/App.xaml.cs
index 4ef458a1..48fb5fc7 100644
--- a/BPASmartClient/App.xaml.cs
+++ b/BPASmartClient/App.xaml.cs
@@ -35,6 +35,11 @@ namespace BPASmartClient
             mainView.Show();
             SplitScreenDisplay();
             NoCompleteOrderInit();
+            ActionManage.GetInstance.Register(new Action<object>(par =>
+            {
+                if (par != null)
+                    VoiceAPI.Speak(par.ToString());
+            }), "COMPLETED_TAKE_Notify");
         }
 
 

From cee8232bb0082172cd5616fee7d3d893ff6a114e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Sat, 15 Apr 2023 10:54:14 +0800
Subject: [PATCH 23/96] =?UTF-8?q?=E5=8F=AB=E5=8F=B7=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Control_MorkSUpgradedVer.cs                        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index 09505370..16d370a9 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -364,7 +364,14 @@ namespace BPASmartClient.MorkSUpgradedVer
                                  if (loc >= 1 && loc <= 5)
                                  {
                                      if (mORKS.RBTakeNoodleTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
-                                         mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { GoodName = order.MorkOrder.GoodsName, Loc = ushort.Parse(res.BatchingLoc), SuborderId = order.MorkOrder.SuborderId, BatchingId = res.BatchingId });
+                                         mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo()
+                                         {
+                                             GoodName = order.MorkOrder.GoodsName,
+                                             Loc = ushort.Parse(res.BatchingLoc),
+                                             SuborderId = order.MorkOrder.SuborderId,
+                                             SortNum = order.MorkOrder.SortNum,
+                                             BatchingId = res.BatchingId
+                                         });
                                  }
                                  else if (loc >= 10 && loc <= 11)
                                  {
@@ -381,6 +388,7 @@ namespace BPASmartClient.MorkSUpgradedVer
                                              GoodName = order.MorkOrder.GoodsName,
                                              Loc = ushort.Parse(res.BatchingLoc),
                                              SuborderId = order.MorkOrder.SuborderId,
+                                             SortNum = order.MorkOrder.SortNum,
                                              RecipeNumber = (index >= 1 && index <= 10) ? (ushort)index : (ushort)0
                                          });
                                  }

From 104afbded21ae0acee610a1d817b058a2f6ed498 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Sat, 15 Apr 2023 19:15:46 +0800
Subject: [PATCH 24/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.JXJFoodBigStation/App.config   |  2 +-
 .../Model/HK_PLC/HKDeviceStatus.cs            |  5 +-
 .../Model/ProcessControl.cs                   | 35 ++++++----
 .../MilkTeaCubeMachine.cs                     | 68 ++++++++++---------
 .../Control_MorkT_BarCounter.cs               |  2 +
 BPASmartClient.MorkT_BarCounter/GVL_MorkT.cs  |  2 +-
 BPASmartClient.MorkT_BarCounter/SavePar.cs    | 14 ++++
 .../SaveParModel.cs                           | 15 ++++
 .../View/DebugView.xaml                       |  8 +--
 .../ViewModel/DebugViewModel.cs               | 14 ++--
 BPASmartClient/App.config                     |  8 +--
 11 files changed, 107 insertions(+), 66 deletions(-)
 create mode 100644 BPASmartClient.MorkT_BarCounter/SavePar.cs
 create mode 100644 BPASmartClient.MorkT_BarCounter/SaveParModel.cs

diff --git a/BPASmartClient.JXJFoodBigStation/App.config b/BPASmartClient.JXJFoodBigStation/App.config
index 35b80a6d..b855f1a3 100644
--- a/BPASmartClient.JXJFoodBigStation/App.config
+++ b/BPASmartClient.JXJFoodBigStation/App.config
@@ -3,7 +3,7 @@
 	<appSettings>
 		<add key="HKPlc_IP" value="107.107.2.17"/>
 		<add key="Siemens_IP" value="107.107.2.200"/>
-		<add key="HKPlc_Connect" value="false"/>
+		<add key="HKPlc_Connect" value="true"/>
 		<add key="Siemens_Connect" value="false"/>
 	</appSettings>
 </configuration>
\ No newline at end of file
diff --git a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
index b384f96d..1aaeb292 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
@@ -103,24 +103,27 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
                                 }
                                 else
                                 {
-                                    MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
                                     switch (barrel)
                                     {
                                         case 1:
                                             string address = "DB99.DBD" + (6 + 4 * (loc - 1));
                                             HK_PLC_S7.Write(address, recipe.RawMaterial.ElementAt(index).RawMaterialWeight);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
                                             break;
                                         case 2:
                                             string address1 = "DB99.DBD" + (62 + 4 * (loc - 1));
                                             HK_PLC_S7.Write(address1, recipe.RawMaterial.ElementAt(index).RawMaterialWeight);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
                                             break;
                                         case 4:
                                             string address2 = "DB99.DBD" + (118 + 4 * (loc - 1));
                                             HK_PLC_S7.Write(address2, recipe.RawMaterial.ElementAt(index).RawMaterialWeight);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
                                             break;
                                         case 5:
                                             string address3 = "DB99.DBD" + (174 + 4 * (loc - 1));
                                             HK_PLC_S7.Write(address3, recipe.RawMaterial.ElementAt(index).RawMaterialWeight);
+                                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
                                             break;
                                         default:
                                             break;
diff --git a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
index b1962f34..43fc46f2 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
@@ -91,20 +91,27 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         RawMaterials.Clear();
                         for (int i = 0; i < GVL_BigStation.Max_DosingSotckBinNum; i++)
                         {
-                            int index = RawMaterialsNamePos.Values.ToList().IndexOf(recipe.Material[i].Material_Name);
-                            if (index >= 0)
+                            if (string.IsNullOrEmpty(recipe.Material[i].Material_Name)) 
                             {
-                                RawMaterials.Add(new RawMaterial()
-                                {
-                                    RawMaterialName = recipe.Material[i].Material_Name,
-                                    RawMaterialBarrelNum = recipe.Material[i].Material_BarrelNum,
-                                    RawMaterialWeight = recipe.Material[i].Material_Weight,
-                                    RawMaterialLocation = RawMaterialsNamePos.Keys.ToList()[index]
-                                });
+
                             }
-                            else
+                            else 
                             {
-                                MessageNotify.GetInstance.ShowAlarmLog($"本地缺少原料{recipe.Material[i].Material_Name}，和西门子下发的原料名称无法对应,");
+                                int index = RawMaterialsNamePos.Values.ToList().IndexOf(recipe.Material[i].Material_Name);
+                                if (index >= 0)
+                                {
+                                    RawMaterials.Add(new RawMaterial()
+                                    {
+                                        RawMaterialName = recipe.Material[i].Material_Name,
+                                        RawMaterialBarrelNum = recipe.Material[i].Material_BarrelNum,
+                                        RawMaterialWeight = recipe.Material[i].Material_Weight,
+                                        RawMaterialLocation = RawMaterialsNamePos.Keys.ToList()[index]
+                                    });
+                                }
+                                else
+                                {
+                                    MessageNotify.GetInstance.ShowAlarmLog($"本地缺少原料{recipe.Material[i].Material_Name}，和西门子下发的原料名称无法对应,");
+                                }
                             }
                         }
                         App.Current.Dispatcher.Invoke(() =>
@@ -1287,7 +1294,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     if (HKDevice.PlcRead.IsAllowIssueRecipe1 && GVL_BigStation.Recipe1DosingStatus == 0 && Inplace)//配方1是否允许下发配发
                     {
-
                         if (SiemensRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             if (!GVL_BigStation.BarrelWasherSign)
@@ -1311,7 +1317,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             GVL_BigStation.Recipe1DosingStatus = 1;
                             MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                         }
-
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe1 && GVL_BigStation.Recipe1DosingStatus == 1)
                     {
@@ -1349,7 +1354,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
                                 FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
                                 FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
-                                MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
+                                MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe1Time).TotalSeconds;
@@ -1462,7 +1467,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
                                 FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
                                 FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
-                                MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
+                                MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe2Time).TotalSeconds;
diff --git a/BPASmartClient.MilkTeaCube/MilkTeaCubeMachine.cs b/BPASmartClient.MilkTeaCube/MilkTeaCubeMachine.cs
index 33c678a4..b85c0a94 100644
--- a/BPASmartClient.MilkTeaCube/MilkTeaCubeMachine.cs
+++ b/BPASmartClient.MilkTeaCube/MilkTeaCubeMachine.cs
@@ -15,6 +15,41 @@ namespace BPASmartClient.MilkTeaCube
         public override void Init() 
         {
             modbus.ModbusTcpConnect(communicationPar.IPAddress);
+            EventBus.EventBus.GetInstance().Subscribe<MilkTea_MakeMilkTeaEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
+            {
+                if (@event == null) return;
+                var par = @event as MilkTea_MakeMilkTeaEvent;
+                switch (par?.TagName)
+                {
+                    case "Start":
+                        modbus.Write("LB14", true);
+                        Thread.Sleep(200);
+                        modbus.Write("LB14", false);
+
+                        break;
+                    case "ParameterSet":
+                        modbus.Write("LB14", false);
+                        Thread.Sleep(500);
+                        modbus.Write("LW1001", par.MilkTeaKind[0]);
+                        modbus.Write("LW1003", par.MilkTeaKind[1]);
+                        modbus.Write("LW1004", par.MilkTeaKind[2]);
+                        modbus.Write("LW1005", par.MilkTeaKind[3]);
+                        modbus.Write("LW1006", par.MilkTeaKind[4]);
+                        modbus.Write("LW1007", par.MilkTeaKind[5]);
+                        modbus.Write("LW1008", par.MilkTeaKind[6]);
+                        modbus.Write("LW1009", par.MilkTeaKind[7]);
+                        modbus.Write("LW1010", par.MilkTeaKind[8]);
+                        modbus.Write("LW1011", par.MilkTeaKind[9]);
+                        modbus.Write("LW1012", par.MilkTeaKind[10]);
+                        modbus.Write("LW1013", par.MilkTeaKind[11]);
+                        break;
+                    case "StartSignReset":
+                        modbus.Write("LB14", false);
+                        break;
+                    default:
+                        break;
+                }
+            });
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
                 IsConnected = modbus.Connected;
@@ -36,39 +71,6 @@ namespace BPASmartClient.MilkTeaCube
                 }
                 Thread.Sleep(1000);
             }), $"�̲�ζħ���豸����", true);
-            EventBus.EventBus.GetInstance().Subscribe<MilkTea_MakeMilkTeaEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
-            {
-                if (@event == null) return;
-                var par = @event as MilkTea_MakeMilkTeaEvent;
-                switch (par?.TagName)
-                {
-                    case "Start":
-                        modbus.Write("LB14",true);
-                        break;
-                    case "ParameterSet":
-                        modbus.Write("LB14", false);
-                        Thread.Sleep(500);
-                        modbus.Write("LW1002", par.MilkTeaKind[0]);
-                        modbus.Write("LW1006", par.MilkTeaKind[1]);
-                        modbus.Write("LW1008", par.MilkTeaKind[2]);
-                        modbus.Write("LW1010", par.MilkTeaKind[3]);
-                        modbus.Write("LW1012", par.MilkTeaKind[4]);
-                        modbus.Write("LW1014", par.MilkTeaKind[5]);
-                        modbus.Write("LW1016", par.MilkTeaKind[6]);
-                        modbus.Write("LW1018", par.MilkTeaKind[7]);
-                        modbus.Write("LW1020", par.MilkTeaKind[8]);
-                        modbus.Write("LW1022", par.MilkTeaKind[9]);
-                        modbus.Write("LW1024", par.MilkTeaKind[10]);
-                        modbus.Write("LW1026", par.MilkTeaKind[11]);
-                        
-                        break;
-                    case "StartSignReset":
-                        modbus.Write("LB14", false);
-                        break;
-                    default:
-                        break;
-                }
-            });
         }
         public override void Start()
         {
diff --git a/BPASmartClient.MorkT_BarCounter/Control_MorkT_BarCounter.cs b/BPASmartClient.MorkT_BarCounter/Control_MorkT_BarCounter.cs
index 10b33a97..128d1f41 100644
--- a/BPASmartClient.MorkT_BarCounter/Control_MorkT_BarCounter.cs
+++ b/BPASmartClient.MorkT_BarCounter/Control_MorkT_BarCounter.cs
@@ -60,6 +60,8 @@ namespace BPASmartClient.MorkT_BarCounter
             {
                 IsHealth = true;
             }
+            Json<SaveParModel>.Read();
+            GVL_MorkT.MilkTeaCHValue = Json<SaveParModel>.Data.parData;
             IsHealth = true;
             serverInit();
             DataParse();
diff --git a/BPASmartClient.MorkT_BarCounter/GVL_MorkT.cs b/BPASmartClient.MorkT_BarCounter/GVL_MorkT.cs
index af1ebad6..2217c3c1 100644
--- a/BPASmartClient.MorkT_BarCounter/GVL_MorkT.cs
+++ b/BPASmartClient.MorkT_BarCounter/GVL_MorkT.cs
@@ -108,7 +108,7 @@ namespace BPASmartClient.MorkT_BarCounter
         /// <summary>
         /// 出果汁完成，是否去取果汁
         /// </summary>
-        public static ushort[] MilkTeaCHValue = new ushort[12] {200,200,200,200,200,200,200,200,200,200,200,200 };
+        public static ushort[] MilkTeaCHValue { get; set; } = new ushort[12] {200,200,200,200,200,200,200,200,200,200,200,200 };
         /// <summary>
         /// 做茶订单队列
         /// </summary>
diff --git a/BPASmartClient.MorkT_BarCounter/SavePar.cs b/BPASmartClient.MorkT_BarCounter/SavePar.cs
new file mode 100644
index 00000000..5b7edfa2
--- /dev/null
+++ b/BPASmartClient.MorkT_BarCounter/SavePar.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkT_BarCounter
+{
+    public class SavePar
+    {
+        public string Name { get; set; }
+        public string Value { get; set; }
+    }
+}
diff --git a/BPASmartClient.MorkT_BarCounter/SaveParModel.cs b/BPASmartClient.MorkT_BarCounter/SaveParModel.cs
new file mode 100644
index 00000000..12a05cfa
--- /dev/null
+++ b/BPASmartClient.MorkT_BarCounter/SaveParModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkT_BarCounter
+{
+    public class SaveParModel
+    {
+        public ObservableCollection<SavePar> parSets { get; set; } = new ObservableCollection<SavePar>();
+        public ushort[] parData { get; set; }
+    }
+}
diff --git a/BPASmartClient.MorkT_BarCounter/View/DebugView.xaml b/BPASmartClient.MorkT_BarCounter/View/DebugView.xaml
index 618a5389..1365753c 100644
--- a/BPASmartClient.MorkT_BarCounter/View/DebugView.xaml
+++ b/BPASmartClient.MorkT_BarCounter/View/DebugView.xaml
@@ -102,16 +102,10 @@
             </WrapPanel>
             <WrapPanel Grid.Row="6" Grid.ColumnSpan="2" >
                 <TextBlock Height="22" Width="100" FontSize="14">味魔方执行程序:</TextBlock>
-                <TextBox Margin="2" Width="80" Text="{Binding MilkTeaCub}"></TextBox>
                 <Button Margin="2"  Content="启动" Width="50" Command="{Binding MikeTeaCupControlCommand}"></Button>
-                <Button Margin="2"  Content="设置参数" Width="60" Command="{Binding MikeTeaCupSetParCommand}"></Button>
+                <Button Margin="2"  Content="保存参数" Width="60" Command="{Binding MikeTeaCupSetParCommand}"></Button>
             </WrapPanel>
         </Grid>
 
-        <WrapPanel Grid.Row="1">
-            <TextBlock Grid.Column="0" Height="22" Width="100" FontSize="14">电爪执行程序:</TextBlock>
-            <TextBox Margin="10" Width="80" Text="{Binding GripperProgam}"></TextBox>
-            <Button Margin="10"  Content="启动" Width="50" Command="{Binding GripperControlCommand}"></Button>
-        </WrapPanel>
     </Grid>
 </UserControl>
diff --git a/BPASmartClient.MorkT_BarCounter/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkT_BarCounter/ViewModel/DebugViewModel.cs
index c49d316d..4ea1237d 100644
--- a/BPASmartClient.MorkT_BarCounter/ViewModel/DebugViewModel.cs
+++ b/BPASmartClient.MorkT_BarCounter/ViewModel/DebugViewModel.cs
@@ -25,6 +25,10 @@ public class DebugViewModel : ObservableObject
 {
     public DebugViewModel()
     {
+        if (Json<SaveParModel>.Data.parData != null)
+        {
+            CH_Value = Json<SaveParModel>.Data.parData;
+        }
         RobotControlCommand = new RelayCommand(() => 
         {
             new WriteJaka() { DeviceId = 126, TagName = "JaKaProgramName", Value = JakaRobotProgram }.Publish();
@@ -36,7 +40,6 @@ public class DebugViewModel : ObservableObject
         });
         MikeTeaCupControlCommand = new RelayCommand(() =>
         {
-            new MilkTea_MakeMilkTeaEvent() { DeviceId = 126, TagName = "ParameterSet", MilkTeaKind = GVL_MorkT.MilkTeaCHValue }.Publish();  //写入奶茶参数
             new MilkTea_MakeMilkTeaEvent() { DeviceId = 126, TagName = "Start" }.Publish();
         });
         GripperControlCommand = new RelayCommand(() =>
@@ -64,8 +67,11 @@ public class DebugViewModel : ObservableObject
         {
             for (int i = 0; i < 12; i++)
             {
-                GVL_MorkT.MilkTeaCHValue[i] = (ushort)CH_Value[i];
+                GVL_MorkT.MilkTeaCHValue[i] = CH_Value[i];
             }
+            Json<SaveParModel>.Data.parData = GVL_MorkT.MilkTeaCHValue;
+            Json<SaveParModel>.Save();
+            new MilkTea_MakeMilkTeaEvent() { DeviceId = 126, TagName = "ParameterSet", MilkTeaKind = GVL_MorkT.MilkTeaCHValue }.Publish();  //写入奶茶参数
         });
     }
     public int JakaRobotProgram { get { return _JakaRobotProgram; } set { _JakaRobotProgram = value; OnPropertyChanged(); } }
@@ -82,8 +88,8 @@ public class DebugViewModel : ObservableObject
     public int GripperProgam { get { return _GripperProgam; } set { _GripperProgam = value; OnPropertyChanged(); } }
     private int _GripperProgam { get; set; }
 
-    public int[] CH_Value { get { return _CH_Value; } set { _CH_Value = value; OnPropertyChanged(); } }
-    private int[] _CH_Value { get; set; } = new int[12] {200,200,200,200,200,200,200,200,200,200,200,200 };
+    public ushort[] CH_Value { get { return _CH_Value; } set { _CH_Value = value; OnPropertyChanged(); } }
+    private ushort[] _CH_Value { get; set; } = new ushort[12] {200,200,200,200,200,200,200,200,200,200,200,200 };
 
     public RelayCommand GripperControlCommand { get; set; }
 }
diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index 618157de..9c45fe12 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -7,9 +7,9 @@
     <add key="IsEnableTest" value="false"/>
 
     <!--测试环境-->
-    <add key="apollouri" value="http://10.2.1.21:28080/"/>
+    <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
     <add key="AppId" value="test1_HostComputer"/>
-    <add key ="Namespaces" value="DEV.test1.Config"/>
+    <add key ="Namespaces" value="DEV.test1.Config"/>-->
 
     <!--开发环境-->
     <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
@@ -17,9 +17,9 @@
     <add key ="Namespaces" value="DEV.Config"/>-->
 
     <!--正式环境-->
-    <!--<add key="apollouri" value="http://47.108.65.220:28080/"/>
+    <add key="apollouri" value="http://47.108.65.220:28080/"/>
     <add key="appid" value="hostcomputer"/>
-    <add key ="namespaces" value="test1.config"/>-->
+    <add key ="namespaces" value="test1.config"/>
 
     <!--阿里云上报启动方式:API 或者 LOCAL-->
     <!--API  :通过客户端ID,调用接口查询“设备连接信息”-->

From 3590344e031be4b607c3ea23701cffac03832889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Thu, 20 Apr 2023 13:24:04 +0800
Subject: [PATCH 25/96] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient/App.config | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index 219c69c8..9c45fe12 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -4,12 +4,12 @@
 
     <!--通用配置-->
     <!--<add key="ClientId" value="43"/>-->
-    <add key="IsEnableTest" value="true"/>
+    <add key="IsEnableTest" value="false"/>
 
     <!--测试环境-->
-    <add key="apollouri" value="http://10.2.1.21:28080/"/>
+    <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
     <add key="AppId" value="test1_HostComputer"/>
-    <add key ="Namespaces" value="DEV.test1.Config"/>
+    <add key ="Namespaces" value="DEV.test1.Config"/>-->
 
     <!--开发环境-->
     <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
@@ -17,9 +17,9 @@
     <add key ="Namespaces" value="DEV.Config"/>-->
 
     <!--正式环境-->
-    <!--<add key="apollouri" value="http://47.108.65.220:28080/"/>
+    <add key="apollouri" value="http://47.108.65.220:28080/"/>
     <add key="appid" value="hostcomputer"/>
-    <add key ="namespaces" value="test1.config"/>-->
+    <add key ="namespaces" value="test1.config"/>
 
     <!--阿里云上报启动方式:API 或者 LOCAL-->
     <!--API  :通过客户端ID,调用接口查询“设备连接信息”-->

From f83f1f9c843dd550fe115c3463a9717f939db9ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Thu, 20 Apr 2023 13:27:10 +0800
Subject: [PATCH 26/96] =?UTF-8?q?=E5=8F=AB=E5=8F=B7=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkS/Control_Morks.cs                       | 1 +
 BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index cf810647..9ca24ee6 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -692,6 +692,7 @@ namespace BPASmartClient.MorkS
                 ResetCookComplete();
                 DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
                 VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
+                Plugin.GetInstance().GetPlugin<MQTTMgr>().Publish($"MORKS/VoiceCall/{DeviceId}", mORKS.OutMealSortNum.ToString());
                 mORKS.CookCompleteFlatBit = false;
                 mORKS.OutMealId = string.Empty;
                 mORKS.OutMealName = string.Empty;
diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index 16d370a9..5fc3eb56 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -666,6 +666,7 @@ namespace BPASmartClient.MorkSUpgradedVer
                 WriteData("M10.1", false);
                 DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
                 VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
+                Plugin.GetInstance().GetPlugin<MQTTMgr>().Publish($"MORKS/VoiceCall/{DeviceId}", mORKS.OutMealSortNum.ToString());
                 mORKS.CookCompleteFlatBit = false;
                 mORKS.OutMealId = string.Empty;
                 mORKS.OutMealName = string.Empty;

From 91a4bb0f18a3286676319aee11a39f7b030a4ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Thu, 20 Apr 2023 13:28:28 +0800
Subject: [PATCH 27/96] =?UTF-8?q?=E5=8F=AB=E5=8F=B7=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkS/Control_Morks.cs                       | 1 +
 BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index 9ca24ee6..303247f2 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -692,6 +692,7 @@ namespace BPASmartClient.MorkS
                 ResetCookComplete();
                 DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
                 VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
+                DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");
                 Plugin.GetInstance().GetPlugin<MQTTMgr>().Publish($"MORKS/VoiceCall/{DeviceId}", mORKS.OutMealSortNum.ToString());
                 mORKS.CookCompleteFlatBit = false;
                 mORKS.OutMealId = string.Empty;
diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index 5fc3eb56..16ca2e06 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -666,6 +666,7 @@ namespace BPASmartClient.MorkSUpgradedVer
                 WriteData("M10.1", false);
                 DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
                 VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
+                DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");
                 Plugin.GetInstance().GetPlugin<MQTTMgr>().Publish($"MORKS/VoiceCall/{DeviceId}", mORKS.OutMealSortNum.ToString());
                 mORKS.CookCompleteFlatBit = false;
                 mORKS.OutMealId = string.Empty;

From 0b9577b6d4fd11d463a4679324a4f192e24740a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Thu, 20 Apr 2023 13:33:14 +0800
Subject: [PATCH 28/96] =?UTF-8?q?=E5=8F=AB=E5=8F=B7=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkS/Control_Morks.cs                       | 4 ++--
 BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index 303247f2..bca2ea46 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -692,8 +692,8 @@ namespace BPASmartClient.MorkS
                 ResetCookComplete();
                 DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
                 VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
-                DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");
-                Plugin.GetInstance().GetPlugin<MQTTMgr>().Publish($"MORKS/VoiceCall/{DeviceId}", mORKS.OutMealSortNum.ToString());
+                //DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");
+                //Plugin.GetInstance().GetPlugin<MQTTMgr>().Publish($"MORKS/VoiceCall/{DeviceId}", mORKS.OutMealSortNum.ToString());
                 mORKS.CookCompleteFlatBit = false;
                 mORKS.OutMealId = string.Empty;
                 mORKS.OutMealName = string.Empty;
diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index 16ca2e06..6a26a374 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -666,8 +666,8 @@ namespace BPASmartClient.MorkSUpgradedVer
                 WriteData("M10.1", false);
                 DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
                 VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
-                DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");
-                Plugin.GetInstance().GetPlugin<MQTTMgr>().Publish($"MORKS/VoiceCall/{DeviceId}", mORKS.OutMealSortNum.ToString());
+                //DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");
+                //Plugin.GetInstance().GetPlugin<MQTTMgr>().Publish($"MORKS/VoiceCall/{DeviceId}", mORKS.OutMealSortNum.ToString());
                 mORKS.CookCompleteFlatBit = false;
                 mORKS.OutMealId = string.Empty;
                 mORKS.OutMealName = string.Empty;

From f3fe103f9f6282c48393b18d926878fb0206d1cb Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Fri, 21 Apr 2023 09:13:37 +0800
Subject: [PATCH 29/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/HK_PLC/PlcReceviceRecipe.cs         | 19 +++++++++++++++++++
 BPASmartClient.MorkS/Control_Morks.cs         |  6 ++----
 .../ViewModel/DebugViewModel.cs               |  2 +-
 .../ViewModel/ParSetViewModel.cs              |  7 +++++++
 BPASmartClient/App.config                     |  8 ++++----
 5 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 BPASmartClient.JXJFoodBigStation/Model/HK_PLC/PlcReceviceRecipe.cs

diff --git a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/PlcReceviceRecipe.cs b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/PlcReceviceRecipe.cs
new file mode 100644
index 00000000..c2855676
--- /dev/null
+++ b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/PlcReceviceRecipe.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
+{
+    public class PlcReceviceRecipe
+    {
+        public short TrayNum { get; set; }
+        public short RecipeNum { get; set; }
+        public float[] Barrel1Weight { get; set; } = new float[14];
+        public float[] Barrel2Weight { get; set; } = new float[14];
+        public float[] Barrel4Weight { get; set; } = new float[14];
+        public float[] Barrel5Weight { get; set; } = new float[14];
+
+    }
+}
diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index cf810647..24cccf76 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -413,10 +413,6 @@ namespace BPASmartClient.MorkS
 
             WriteControl("M260.0", data.ToArray());
 
-            OrderChange(mORKS.OutMealId, ORDER_STATUS.COOKING);
-
-            OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_COOK);
-
         }
 
         private void BowlControl(OrderLocInfo orderLocInfo)
@@ -690,6 +686,8 @@ namespace BPASmartClient.MorkS
                 OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
                 DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成");
                 ResetCookComplete();
+                DeviceProcessLogShow($"出餐订单【{mORKS.OutMealSortNum.ToString()}】");
+                //int SerialNum = Convert.ToInt32(mORKS.OutMealSortNum.ToString().Substring(0,(mORKS.OutMealSortNum.ToString().Length-1)));
                 DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
                 VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
                 mORKS.CookCompleteFlatBit = false;
diff --git a/BPASmartClient.MorkS/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkS/ViewModel/DebugViewModel.cs
index 9471ed5d..0fc4aad0 100644
--- a/BPASmartClient.MorkS/ViewModel/DebugViewModel.cs
+++ b/BPASmartClient.MorkS/ViewModel/DebugViewModel.cs
@@ -49,7 +49,7 @@ namespace BPASmartClient.MorkS.ViewModel
         }
 
         public RelayCommand InitCommand { get; set; }
-
+        
         public RelayCommand SimOrderCommand { get; set; }
 
         public RelayCommand SimOrderRandomCommand { get; set; }
diff --git a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
index 3de1399b..c77b1e3e 100644
--- a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
+++ b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using BPASmartClient.CustomResource;
 using BPASmartClient.Helper;
 using BPASmartClient.Model;
 using BPASmartClient.MorkS.Model;
@@ -25,11 +26,17 @@ namespace BPASmartClient.MorkS.ViewModel
                 await Task.Delay((int)DelayTime * 1000);
                 ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M0.6", Value = false });
             });
+
+            //VoicePlayTest = new RelayCommand(() => {
+            //    VoiceAPI.Speak(new Random().Next(1,100).ToString());
+            //});
         }
 
         public RelayCommand SaveInfoCommand { get; set; }
         public RelayCommand CommandStart { get; set; }
 
+        //public RelayCommand VoicePlayTest { get; set; }
+        
         public ObservableCollection<ParSet> parSets { get; set; } = Json<MorksPar>.Data.parSets;
 
         /// <summary>
diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index 7a6229b6..219c69c8 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -7,9 +7,9 @@
     <add key="IsEnableTest" value="true"/>
 
     <!--测试环境-->
-    <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
+    <add key="apollouri" value="http://10.2.1.21:28080/"/>
     <add key="AppId" value="test1_HostComputer"/>
-    <add key ="Namespaces" value="DEV.test1.Config"/>-->
+    <add key ="Namespaces" value="DEV.test1.Config"/>
 
     <!--开发环境-->
     <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
@@ -17,9 +17,9 @@
     <add key ="Namespaces" value="DEV.Config"/>-->
 
     <!--正式环境-->
-    <add key="apollouri" value="http://47.108.65.220:28080/"/>
+    <!--<add key="apollouri" value="http://47.108.65.220:28080/"/>
     <add key="appid" value="hostcomputer"/>
-    <add key ="namespaces" value="test1.config"/>
+    <add key ="namespaces" value="test1.config"/>-->
 
     <!--阿里云上报启动方式:API 或者 LOCAL-->
     <!--API  :通过客户端ID,调用接口查询“设备连接信息”-->

From 7f87889226dfd0a43f775ca28c97f077d66cb8a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Fri, 21 Apr 2023 11:10:55 +0800
Subject: [PATCH 30/96] =?UTF-8?q?=E5=8F=AB=E5=8F=B7=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.Business/Plugin/OrderProxy.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BPASmartClient.Business/Plugin/OrderProxy.cs b/BPASmartClient.Business/Plugin/OrderProxy.cs
index d73a9db8..9c436ef9 100644
--- a/BPASmartClient.Business/Plugin/OrderProxy.cs
+++ b/BPASmartClient.Business/Plugin/OrderProxy.cs
@@ -206,6 +206,8 @@ namespace BPASmartClient.Business
             var temp = BPAPackage.Make(orderStatusChange, clientId, orderStatusChangedEvent.deviceClientType);
             var q = temp.Serialize(false);
             Plugin.GetInstance().GetPlugin<MQTTMgr>().Publish(TOPIC.GetInstance.GetAppTopic(clientId.ToString()), temp.Serialize(false));
+            if (orderStatusChange.CookingStatus == ORDER_STATUS.COMPLETED_TAKE)
+                MessageLog.GetInstance.Show($"通知叫号：{orderStatusChange.GoodName}--{orderStatusChange.SortNum}");
             #endregion
         }
 

From 2bb6be209a3c5740a7f42d6460b87402c6164026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Mon, 24 Apr 2023 16:12:06 +0800
Subject: [PATCH 31/96] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.Device/BaseDevice.cs         |  3 ++-
 BPASmartClient.Device/IDevice.cs            |  2 ++
 BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs  | 29 +++++++++++++++++++++
 BPASmartClient.MorkS/View/ParSet.xaml       | 22 ++++++++++------
 BPASmartClient.Peripheral/BasePeripheral.cs |  7 +++++
 BPASmartClient.Peripheral/IPeripheral.cs    |  6 +++++
 6 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/BPASmartClient.Device/BaseDevice.cs b/BPASmartClient.Device/BaseDevice.cs
index be2eea4b..3ef2b91e 100644
--- a/BPASmartClient.Device/BaseDevice.cs
+++ b/BPASmartClient.Device/BaseDevice.cs
@@ -122,6 +122,7 @@ namespace BPASmartClient.Device
         public IAlarm InterfaceAlarm { get; set; }
         public AlarmHelper alarmHelper { get; set; } = new AlarmHelper();
         public IStatus InterfaceStatus { get; set; }
+        public ObservableCollection<Variable> variables { get; set; } = new ObservableCollection<Variable>();
 
         #endregion
 
@@ -284,7 +285,7 @@ namespace BPASmartClient.Device
                     foreach (var faces in res)
                     {
                         if (faces.Name == "IStatus")
-                        {   
+                        {
                             InterfaceStatus = item.GetValue(this) as IStatus;
                             GetMonitorData(InterfaceStatus);
                         }
diff --git a/BPASmartClient.Device/IDevice.cs b/BPASmartClient.Device/IDevice.cs
index 2fd0dcdd..ae7aaa2d 100644
--- a/BPASmartClient.Device/IDevice.cs
+++ b/BPASmartClient.Device/IDevice.cs
@@ -62,6 +62,8 @@ namespace BPASmartClient.Device
         /// </summary>
         ObservableCollection<VariableMonitor> variableMonitors { get; set; }
 
+        ObservableCollection<Variable> variables { get; set; }
+
         /// <summary>
         /// 设备报警信息集合
         /// </summary>
diff --git a/BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs b/BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs
index 07f19945..6181cc29 100644
--- a/BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs
+++ b/BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs
@@ -41,6 +41,23 @@ namespace BPASmartClient.PLC
                                     }
                                 }
                             }
+
+                            //foreach (var par in tempVar)
+                            //{
+                            //    if (par.Value?.Address.Length > 0)
+                            //    {
+                            //        var res = modbusTcp.Read(par.Value.Address, (ushort)par.Value.ReadLeng);
+                            //        if (status.ContainsKey(par.Value.Address))
+                            //        {
+                            //            status[par.Value.Address] = res;
+                            //        }
+                            //        else
+                            //        {
+                            //            status.TryAdd(par.Value.Address, res);
+                            //        }
+                            //    }
+                            //}
+
                             Thread.Sleep(100);
                         }
                         Thread.Sleep(1000);
@@ -78,6 +95,18 @@ namespace BPASmartClient.PLC
                 modbusTcp.Write(address, value);
         }
 
+        public override void AddVarInfo(string add, int len)
+        {
+            if (!tempVar.ContainsKey(add) && !string.IsNullOrEmpty(add) && len > 0)
+            {
+                tempVar.TryAdd(add, new Variable()
+                {
+                    Address = add,
+                    ReadLeng = len
+                });
+            }
+        }
+
         protected override void InitStatus()
         {
 
diff --git a/BPASmartClient.MorkS/View/ParSet.xaml b/BPASmartClient.MorkS/View/ParSet.xaml
index 8cfaca7b..531a53ed 100644
--- a/BPASmartClient.MorkS/View/ParSet.xaml
+++ b/BPASmartClient.MorkS/View/ParSet.xaml
@@ -129,8 +129,8 @@
 
             <StackPanel Grid.Row="1" Orientation="Horizontal">
                 <TextBlock
+                    Margin="40,0,0,0"
                     FontSize="21"
-                        Margin="40 0 0 0"
                     Style="{StaticResource TextBlockStyle}"
                     Text="加汤时间:" />
                 <TextBox
@@ -145,13 +145,13 @@
                     Foreground="#ff34f7f7"
                     Text="{Binding AddSoup}" />
                 <TextBlock
+                    Margin="10,0,0,0"
                     FontSize="21"
-                    Margin="10 0 0 0"
                     Style="{StaticResource TextBlockStyle}"
                     Text="(秒)" />
                 <TextBlock
+                    Margin="40,0,0,0"
                     FontSize="21"
-                        Margin="40 0 0 0"
                     Style="{StaticResource TextBlockStyle}"
                     Text="清洗加汤管道时间:" />
                 <TextBox
@@ -166,15 +166,21 @@
                     Foreground="#ff34f7f7"
                     Text="{Binding DelayTime}" />
                 <TextBlock
+                    Margin="10,0,0,0"
                     FontSize="21"
-                    Margin="10 0 0 0"
                     Style="{StaticResource TextBlockStyle}"
                     Text="(秒)" />
-                <Button Content="启动"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5" Foreground="Aqua" 
-                    Style="{StaticResource ButtonStyle}" Command="{Binding CommandStart}" />
+                <Button
+                    Margin="5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Command="{Binding CommandStart}"
+                    Content="启动"
+                    Foreground="Aqua"
+                    Style="{StaticResource ButtonStyle}" />
                 <TextBlock
+                    Margin="40,0,0,0"
                     FontSize="21"
-                        Margin="40 0 0 0"
                     Style="{StaticResource TextBlockStyle}"
                     Text="倒面条件，煮面口使用数量:" />
                 <TextBox
@@ -189,8 +195,8 @@
                     Foreground="#ff34f7f7"
                     Text="{Binding OpenUseNumber}" />
                 <TextBlock
+                    Margin="10,0,0,0"
                     FontSize="21"
-                    Margin="10 0 0 0"
                     Style="{StaticResource TextBlockStyle}"
                     Text="(个)" />
             </StackPanel>
diff --git a/BPASmartClient.Peripheral/BasePeripheral.cs b/BPASmartClient.Peripheral/BasePeripheral.cs
index e582433d..8ab90939 100644
--- a/BPASmartClient.Peripheral/BasePeripheral.cs
+++ b/BPASmartClient.Peripheral/BasePeripheral.cs
@@ -29,6 +29,7 @@ namespace BPASmartClient.Peripheral
         public CommunicationPar communicationPar { get; set; } = new CommunicationPar();
         public ConcurrentDictionary<string, object> status { get; set; } = new ConcurrentDictionary<string, object>();
         public ObservableCollection<Variable> variables { get; set; } = new ObservableCollection<Variable>();
+        public ConcurrentDictionary<string, Variable> tempVar { get; set; } = new();
 
         /// <summary>q
         /// 外设状态集合
@@ -65,10 +66,16 @@ namespace BPASmartClient.Peripheral
 
         public abstract void WriteData(string address, object value);
 
+        public abstract void AddVarInfo(string add, int len);
+
         public ConcurrentDictionary<string, object> GetAllStatus()
         {
             return status;
         }
 
+        public ConcurrentDictionary<string, Variable> GetVariable()
+        {
+            return tempVar;
+        }
     }
 }
diff --git a/BPASmartClient.Peripheral/IPeripheral.cs b/BPASmartClient.Peripheral/IPeripheral.cs
index 2a3e6d41..914bc1c7 100644
--- a/BPASmartClient.Peripheral/IPeripheral.cs
+++ b/BPASmartClient.Peripheral/IPeripheral.cs
@@ -53,8 +53,14 @@ namespace BPASmartClient.Peripheral
         /// </summary>
         ConcurrentDictionary<string, object> status { get; set; }
 
+        ConcurrentDictionary<string, Variable> tempVar { get; set; }
+
+        ConcurrentDictionary<string, Variable> GetVariable();
+
         void WriteData(string address, object value);
 
+        void AddVarInfo(string add, int len);
+
         //void ReadData(string address);
 
         /// <summary>

From 55ea5f43eea76f7858fd16a793f79ad2e7921cc7 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Tue, 25 Apr 2023 19:07:51 +0800
Subject: [PATCH 32/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.JXJFoodBigStation/App.config | 2 +-
 BPASmartClient.MorkS/Control_Morks.cs       | 2 +-
 BPASmartClient/App.config                   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BPASmartClient.JXJFoodBigStation/App.config b/BPASmartClient.JXJFoodBigStation/App.config
index b855f1a3..35b80a6d 100644
--- a/BPASmartClient.JXJFoodBigStation/App.config
+++ b/BPASmartClient.JXJFoodBigStation/App.config
@@ -3,7 +3,7 @@
 	<appSettings>
 		<add key="HKPlc_IP" value="107.107.2.17"/>
 		<add key="Siemens_IP" value="107.107.2.200"/>
-		<add key="HKPlc_Connect" value="true"/>
+		<add key="HKPlc_Connect" value="false"/>
 		<add key="Siemens_Connect" value="false"/>
 	</appSettings>
 </configuration>
\ No newline at end of file
diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index a2aa59c9..4ebb59fb 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -322,6 +322,7 @@ namespace BPASmartClient.MorkS
                 if (@event is DoOrderEvent order)
                 {
                     mORKS.doOrderEvents.Add(order);
+                    DeviceProcessLogShow($"接收到{order.MorkOrder.SortNum}号订单");
                     if (order.MorkOrder.GoodBatchings == null) return;
                     if (mORKS.HistorySuborderId.Contains(order.MorkOrder.SuborderId)) return;
                     OrderCount++;
@@ -687,7 +688,6 @@ namespace BPASmartClient.MorkS
                 DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成");
                 ResetCookComplete();
                 DeviceProcessLogShow($"出餐订单【{mORKS.OutMealSortNum.ToString()}】");
-                //int SerialNum = Convert.ToInt32(mORKS.OutMealSortNum.ToString().Substring(0,(mORKS.OutMealSortNum.ToString().Length-1)));
                 DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
                 VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
                 //DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");
diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index 618157de..9c45fe12 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -7,9 +7,9 @@
     <add key="IsEnableTest" value="false"/>
 
     <!--测试环境-->
-    <add key="apollouri" value="http://10.2.1.21:28080/"/>
+    <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
     <add key="AppId" value="test1_HostComputer"/>
-    <add key ="Namespaces" value="DEV.test1.Config"/>
+    <add key ="Namespaces" value="DEV.test1.Config"/>-->
 
     <!--开发环境-->
     <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
@@ -17,9 +17,9 @@
     <add key ="Namespaces" value="DEV.Config"/>-->
 
     <!--正式环境-->
-    <!--<add key="apollouri" value="http://47.108.65.220:28080/"/>
+    <add key="apollouri" value="http://47.108.65.220:28080/"/>
     <add key="appid" value="hostcomputer"/>
-    <add key ="namespaces" value="test1.config"/>-->
+    <add key ="namespaces" value="test1.config"/>
 
     <!--阿里云上报启动方式:API 或者 LOCAL-->
     <!--API  :通过客户端ID,调用接口查询“设备连接信息”-->

From bf4b6349b215489bc851253a870937c771d30c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Wed, 26 Apr 2023 10:11:12 +0800
Subject: [PATCH 33/96] =?UTF-8?q?=E5=90=89=E9=A6=99=E5=B1=85=E9=85=8D?=
 =?UTF-8?q?=E6=96=99=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/GVL_SmallStation.cs                 |   79 +-
 .../Model/HK_PLC/DataComm.cs                  |   41 -
 .../Model/HK_PLC/HKDeviceStatus.cs            |   97 +-
 .../Model/HK_PLC/PlcReadAddressDB3.cs         |  221 +--
 .../Model/HK_PLC/PlcWriteAddressDB7.cs        |   13 -
 .../Model/ProcessControl.cs                   | 1232 ++++++-----------
 .../Model/RawMaterial/DeviceAddress.cs        |    5 +
 .../Model/RawMaterial/DeviceInquire.cs        |   79 +-
 .../Model/Siemens/RemoteRecipeRawMaterial.cs  |    3 +
 .../Model/Siemens/SiemensDeviceStatus.cs      |    6 +-
 .../View/ManualFlowView.xaml                  |  118 +-
 .../View/ManualFlowView.xaml.cs               |    8 +-
 .../View/PlcVarMonitorView.xaml               |    8 +-
 .../View/ProcessMonitorView.xaml              |    8 +-
 .../View/RecipeReceiveView.xaml               |   10 +-
 .../View/RecipeReceiveView.xaml.cs            |    4 +-
 .../View/RobotView.xaml                       |   14 +-
 .../ViewModel/ManualFlowViewModel.cs          |  202 ++-
 .../ViewModel/RecipeReceiveViewModel.cs       |   17 +-
 .../ViewModel/RobotViewModel.cs               |  110 +-
 20 files changed, 1071 insertions(+), 1204 deletions(-)
 delete mode 100644 BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/DataComm.cs
 delete mode 100644 BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcWriteAddressDB7.cs

diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
index 090121ed..d2d872c0 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
@@ -27,14 +27,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public const int Max_PowderSotckBinNum = 5;
 
-
-        [VarComm("Global", "订单取消")]
-        /// <summary>
-        /// 订单取消
-        /// </summary>
-        public bool NotUseSmallDosing { get; set; }
-
-
         [VarComm("Global", "订单取消")]
         /// <summary>
         /// 订单取消
@@ -47,6 +39,28 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public string Order_CancelRecipeCode { get; set; } = "";
 
+        [VarComm("Global", "柔性配料料仓配料下发情况")]
+        /// <summary>
+        /// 料仓配料情况
+        /// </summary>
+        public bool[] PlcAllowIssueRecipe { get; set; } = new bool[5] { false, false, false, false,false };
+
+        [VarComm("Global", "柔性配料料仓,气缸顶起状态")]
+        /// <summary>
+        /// 柔性配料料仓,气缸顶起状态
+        /// </summary>
+        public ushort StockBinCylinderStatus { get; set; }
+
+        [VarComm("Global", "柔性配料料仓配料下发情况")]
+        /// <summary>
+        /// 料仓配料情况
+        /// </summary>
+        public ushort[] StockBinDosingIssue { get; set; } = new ushort[5] { 0, 0, 0, 0, 0 };
+        [VarComm("Global", "柔性配料料仓配料下发情况")]
+        /// <summary>
+        /// 料仓配料情况
+        /// </summary>
+        public ushort[] RecipeStockBinDosing { get; set; } = new ushort[5] { 0, 0, 0, 0, 0 };
 
         [VarComm("Global", "柔性配料料仓配料情况")]
         /// <summary>
@@ -60,6 +74,12 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public int Tray1LogicFinish { get; set; } = 0;
 
+        [VarComm("Global", "托盘1托盘到位情况0:未到位,1=AGV到位,2=托盘有货架,3=AGV取托盘完成")]
+        /// <summary>
+        /// 托盘1托盘到位情况
+        /// </summary>
+        public int[] Tray_AGVLogic { get; set; } = new int[5] { 0, 0, 0, 0, 0 };
+
         [VarComm("Global", "托盘2托盘到位情况0:未到位,1=AGV到位,2=托盘有货架,3=AGV取托盘完成")]
         /// <summary>
         /// 托盘2托盘到位 逻辑完成
@@ -142,6 +162,13 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         public bool HeartBeatToPlc { get; set; } = false;
 
         [VarComm("Global", "来自plc的心跳")]
+
+
+        public bool DisEnableStockAlarm { get; set; } = false;
+
+        [VarComm("Global", "来自plc的心跳")]
+
+
         /// <summary>
         /// 来自plc的心跳
         /// </summary>
@@ -165,14 +192,25 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public int RecipeStatusIDTray1 { get; set; } = 0;
 
-
-        [VarComm("Global", "配方2下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料")]
+        [VarComm("Global", "配方1下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料")]
         /// <summary>
         /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料
         /// </summary>
         public int[] RecipeProcessStatus { get; set; } = new int[5] { 0, 0, 0, 0, 0 };
 
 
+        [VarComm("Global", "配方1下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料")]
+        /// <summary>
+        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料
+        /// </summary>
+        public bool AGVIsGetTray { get; set; } = false;
+
+        [VarComm("Global", "配方2下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料")]
+        /// <summary>
+        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料
+        /// </summary>
+        public int RecipeStatusIDTray2 { get; set; } = 0;
+
         [VarComm("Global", "当前配方正在配料位置")]
         /// <summary>
         /// 当前料仓的位置
@@ -180,11 +218,13 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         public int StockInIsWork { get; set; } = 0;
 
 
-        [VarComm("Global", "是否使用粉仓配料")]
+
+
+        [VarComm("Global", "设置料仓配料完成")]
         /// <summary>
-        /// 是否使用粉仓配料
+        /// 当前料仓的位置
         /// </summary>
-        public bool RequestOrder { get; set; } = false;
+        public bool[] StockInDosingComple { get; set; } = new bool[15];
 
 
         [VarComm("Global", "是否使用粉仓配料")]
@@ -213,11 +253,22 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public bool IsUseLocalRecipe { get; set; }
 
+        [VarComm("Global", "是否使用本地模拟配方")]
+        /// <summary>
+        /// 是否使用本地模拟配方
+        /// </summary>
+        public bool NotUseSmallStation { get; set; }
+
         /// <summary>
         /// 配料时间
         /// </summary>
         public DateTime time1;
 
+        /// <summary>
+        /// 配料时间
+        /// </summary>
+        public DateTime[] DosingTime = new DateTime[5] { DateTime.Now, DateTime.Now, DateTime.Now, DateTime.Now, DateTime.Now };
+
         /// <summary>
         /// 原料的名称和原料编号对应，Mes提供的信息
         /// </summary>
@@ -263,7 +314,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// <summary>
         /// 延迟采集料仓的配料完成重量
         /// </summary>
-        public int Time { get; set; } = 1000;
+        public int Time { get; set; } = 2000;
 
         [VarComm("Global", "取消订单的步骤号")]
         /// <summary>
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/DataComm.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/DataComm.cs
deleted file mode 100644
index f47bd894..00000000
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/DataComm.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using BPASmartClient.Helper;
-using BPASmartClient.Modbus;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
-{
-    public class DataComm
-    {
-        public volatile static DataComm Instance;
-        public static DataComm GetInstance => Instance ?? (new DataComm());
-        public DataComm() { }
-        /// <summary>
-        /// 是否允许配料
-        /// </summary>
-        public bool IsAllowDosing { get { return _mIsAllowDosing; } set { _mIsAllowDosing = value; } }
-        private bool _mIsAllowDosing;
-
-        public bool DosingFinishToPLC { get { return _mDosingFinishToPLC; } set { _mDosingFinishToPLC = value; } }
-        private bool _mDosingFinishToPLC;
-
-        private int _mStockBinLocationToPLC;
-        public int StockBinLocationToPLC { get { return _mStockBinLocationToPLC; } set { _mStockBinLocationToPLC = value; } }
-
-        public bool StatusSignToBPA { get { return _mStatusSignToBPA; } set { _mStatusSignToBPA = value; } }
-        private bool _mStatusSignToBPA;
-
-        private int _mStockBinLocationToBPA;
-        public int StockBinLocationToBPA { get { return _mStockBinLocationToBPA; } set { _mStockBinLocationToBPA = value; } }
-
-        private int _mBarrelNumToPLC;
-        public int BarrelNumToPLC { get { return _mBarrelNumToPLC; } set { _mBarrelNumToPLC = value; } }
-       
-        /*public ConcurrentDictionary<int, StockBinLocations> DeviceLists = new ConcurrentDictionary<int, StockBinLocations>();*/
-    }
-   
-}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
index f90bd07f..70effaaa 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
@@ -192,38 +192,83 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
 
         public void IssueRecipeToPlc(ObservableCollection<RemoteRecipeRawMaterial> rawMaterials,int recipeLoction)
         {
-            if (IsConnected)
+            bool[] barrel = new bool[16];
+            bool[] barrel1 = new bool[16];
+            bool[] barrel2 = new bool[16];
+            bool[] barrel3 = new bool[16];
+            ushort barrel1_short = 0;
+            ushort barrel2_short = 0;
+            ushort barrel3_short = 0;
+
+            foreach (var item in rawMaterials)
+            {
+                switch (item.RawMaterialBarrelNum)
+                {
+                    case 6:
+                        barrel[item.RawMaterialLocation-1] = true;
+                        barrel1[item.RawMaterialLocation - 1] = true;
+                        break;
+                    case 7:
+                        barrel[item.RawMaterialLocation - 1] = true;
+                        barrel2[item.RawMaterialLocation - 1] = true;
+                        break;
+                    case 8:
+                        barrel[item.RawMaterialLocation - 1] = true;
+                        barrel3[item.RawMaterialLocation - 1] = true;
+                        break;
+                    default:
+                        break;
+                }
+            }
+            for (int i = 0; i < 16; i++)
             {
-                ushort barrel1 = 0;
-                ushort barrel2 = 0;
-                ushort barrel3 = 0;
-                foreach (var item in rawMaterials)
+                if (recipeLoction == 0)
                 {
-                    switch (item.RawMaterialBarrelNum)
+                    if (i >= 8)
+                    {
+                        HK_PLC_S7.Write<bool>("DB4.DBX15." + (i - 8), barrel1[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX17." + (i - 8), barrel2[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX19." + (i - 8), barrel3[i]);
+                    }
+                    else
                     {
-                        case 1:
-                            barrel1 = barrel1.SetBitValue((byte)item.RawMaterialLocation, true);
-                            break;
-                        case 2:
-                            barrel2 = barrel2.SetBitValue((byte)item.RawMaterialLocation, true);
-                            break;
-                        case 3:
-                            barrel3 = barrel3.SetBitValue((byte)item.RawMaterialLocation, true);
-                            break;
-                        default:
-                            break;
+                        HK_PLC_S7.Write<bool>("DB4.DBX14." + i, barrel1[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX16." + i, barrel2[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX18." + i, barrel3[i]);
                     }
+                    barrel1_short = barrel1_short.SetBitValue((byte)(i + 1), barrel1[i]);
+                    barrel2_short = barrel2_short.SetBitValue((byte)(i + 1), barrel2[i]);
+                    barrel3_short = barrel3_short.SetBitValue((byte)(i + 1), barrel3[i]);
+                    GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeLoction] = GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeLoction].SetBitValue((byte)(i + 1), barrel[i]);
+                }
+                else if (recipeLoction == 1)
+                {
+                    if (i >= 8)
+                    {
+                        HK_PLC_S7.Write<bool>("DB4.DBX21." + (i - 8), barrel1[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX23." + (i - 8), barrel2[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX25." + (i - 8), barrel3[i]);
+                    }
+                    else
+                    {
+                        HK_PLC_S7.Write<bool>("DB4.DBX20." + i, barrel1[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX22." + i, barrel2[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX24." + i, barrel3[i]);
+                    }
+                    barrel1_short = barrel1_short.SetBitValue((byte)(i + 1), barrel1[i]);
+                    barrel2_short = barrel2_short.SetBitValue((byte)(i + 1), barrel2[i]);
+                    barrel3_short = barrel3_short.SetBitValue((byte)(i + 1), barrel3[i]);
+                    GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeLoction] = GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeLoction].SetBitValue((byte)(i + 1), barrel[i]);
                 }
-                string AddresBarrel1 = "DB4.DBW" + (12 + (recipeLoction - 1) * 6);
-                string AddresBarrel2 = "DB4.DBW" + (14 + (recipeLoction - 1) * 6);
-                string AddresBarrel3 = "DB4.DBW" + (16 + (recipeLoction - 1) * 6);
-                HK_PLC_S7.Write<ushort>(AddresBarrel1, barrel1);
-                HK_PLC_S7.Write<ushort>(AddresBarrel2, barrel2);
-                HK_PLC_S7.Write<ushort>(AddresBarrel3, barrel3);
-                MessageNotify.GetInstance.ShowRunLog($"配方下发，plc配方位置{recipeLoction},桶1料仓配料{barrel1.ToBinString}");
-                MessageNotify.GetInstance.ShowRunLog($"配方下发，plc配方位置{recipeLoction},桶2料仓配料{barrel1.ToBinString}");
-                MessageNotify.GetInstance.ShowRunLog($"配方下发，plc配方位置{recipeLoction},桶3料仓配料{barrel1.ToBinString}");
             }
+            //HK_PLC_S7.Write<bool[]>(AddresBarrel1, barrel1);
+            //HK_PLC_S7.Write<bool[]>(AddresBarrel2, barrel2);
+            //HK_PLC_S7.Write<bool[]>(AddresBarrel3, barrel3);
+            MessageNotify.GetInstance.ShowRunLog($"配方下发，plc配方位置{recipeLoction},桶1料仓配料{barrel1_short}，配料位置{barrel1_short.ToBinString()}");
+            MessageNotify.GetInstance.ShowRunLog($"配方下发，plc配方位置{recipeLoction},桶2料仓配料{barrel2_short}，配料位置{barrel2_short.ToBinString()}");
+            MessageNotify.GetInstance.ShowRunLog($"配方下发，plc配方位置{recipeLoction},桶3料仓配料{barrel3_short}，配料位置{barrel3_short.ToBinString()}");
+            MessageNotify.GetInstance.ShowRunLog($"配方下发，plc配方位置{recipeLoction},料仓配料{GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeLoction]}，配料位置{GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeLoction].ToBinString()}");
+
         }
     }
 }   
\ No newline at end of file
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
index 26f141b4..4a97383d 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
@@ -9,170 +9,65 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
 {
     public class PlcReadAddressDB3
     {
-        [VarComm("DB3.DBX0.0","心跳")]
+        [VarComm("DB3.DBX0.0", "心跳")]
         public bool HeartBeat { get; set; }
-        [VarComm("DB3.DBX0.1", "备用1")]
-        public bool Standby1 { get; set; }
-        [VarComm("DB3.DBX0.2", "备用2")]
-        public bool Standby2 { get; set; }
-        [VarComm("DB3.DBX0.3", "备用3")]
-        public bool Standby3 { get; set; }
-        [VarComm("DB3.DBX0.4", "备用4")]
-        public bool Standby4 { get; set; }
-        [VarComm("DB3.DBX0.5", "备用5")]
-        public bool Standby5 { get; set; }
-        [VarComm("DB3.DBX0.6", "备用6")]
-        public bool Standby6 { get; set; }
-        [VarComm("DB3.DBX0.7", "工站1有托盘")]
-        public bool WorkStation1HaveTray { get; set; }
-
-        [VarComm("DB3.DBX1.0", "工站2有托盘")]
-        public bool WorkStation2HaveTray { get; set; }
-        [VarComm("DB3.DBX1.1", "工站1配料完成")]
-        public bool WorkStation1DosingComplete { get; set; }
-        [VarComm("DB3.DBX1.2", "工站2配料完成")]
-        public bool WorkStation2DosingComplete { get; set; }
-        [VarComm("DB3.DBX1.3", "工站1接收配方完成")]
-        public bool WorkStation1ReceviceRecipeComplete { get; set; }
-        [VarComm("DB3.DBX1.4", "工站2接收配方完成")]
-        public bool WorkStation2ReceviceRecipeComplete { get; set; }
-        [VarComm("DB3.DBX1.5", "工站1气缸报警")]
-        public bool WorkStation1CylinderAlarm { get; set; }
-        [VarComm("DB3.DBX1.6", "工站2气缸报警")]
-        public bool WorkStation2CylinderAlarm { get; set; }
-        [VarComm("DB3.DBX1.7", "允许配方1下发配方")]
-        public bool AllowRecipe1Issue { get; set; }
-
-        [VarComm("DB3.DBX2.0", "允许配方2下发配方")]
-        public bool AllowRecipe2Issue { get; set; }
-        [VarComm("DB3.DBX2.1", "工站1传感器信号")]
-        public bool WorkStation1Sensor { get; set; }
-        [VarComm("DB3.DBX2.2", "工站2传感器信号")]
-        public bool WorkStation2Sensor { get; set; }
-        [VarComm("DB3.DBX2.3", "工站1气缸信号，false=伸出")]
-        public bool WorkStation1Cylinder { get; set; }
-        [VarComm("DB3.DBX2.4", "工站2气缸信号，false=伸出")]
-        public bool WorkStation2Cylinder { get; set; }
-        [VarComm("DB3.DBX2.5", "工站1取消订单")]
-        public bool WorkStation1OrderCancel { get; set; }
-        [VarComm("DB3.DBX2.6", "工站2取消订单")]
-        public bool WorkStation2OrderCancel { get; set; }
-        [VarComm("DB3.DBX2.7", "备用7")]
-        public bool Standby7 { get; set; }
-        [VarComm("DB3.DBB3", "备用")]
-        public byte Standby81 { get; set; }
-        [VarComm("DB3.DBB4", "备用")]
-        public byte Standby82 { get; set; }
-        [VarComm("DB3.DBB5", "备用")]
-        public byte Standby83 { get; set; }
-        [VarComm("DB3.DBW6", "备用")]
-        public int Standby9 { get; set; }
-
-        [VarComm("DB3.DBD10", "工站1_1号桶的位置")]
-        public float WorkStation1Barrel1Pos { get; set; }
-        [VarComm("DB3.DBD14", "工站1_2号桶的位置")]
-        public float WorkStation1Barrel2Pos { get; set; }
-        [VarComm("DB3.DBD18", "工站1_3号桶的位置")]
-        public float WorkStation1Barrel3Pos { get; set; }
-        [VarComm("DB3.DBD22", "工站1_4号桶的位置")]
-        public float WorkStation1Barrel4Pos { get; set; }
-        [VarComm("DB3.DBD26", "工站2_1号桶的位置")]
-        public float WorkStation2Barrel1Pos { get; set; }
-        [VarComm("DB3.DBD30", "工站2_2号桶的位置")]
-        public float WorkStation2Barrel2Pos { get; set; }
-        [VarComm("DB3.DBD34", "工站2_3号桶的位置")]
-        public float WorkStation2Barrel3Pos { get; set; }
-        [VarComm("DB3.DBD38", "工站2_4号桶的位置")]
-        public float WorkStation2Barrel4Pos { get; set; }
-
-        [VarComm("DB3.DBD42", "备用")]
-        public int StandBy42 { get; set; }
-        [VarComm("DB3.DBD46", "备用")]
-        public int StandBy46 { get; set; }
-
-        [VarComm("DB3.DBX50.0", "工站1_1号桶允许配料")]
-        public bool WorkStation1Barrel1AllowDosing { get; set; }
-        [VarComm("DB3.DB50.1", "工站1_2号桶允许配料")]
-        public bool WorkStation1Barrel2AllowDosing { get; set; }
-        [VarComm("DB3.DB50.2", "工站1_3号桶允许配料")]
-        public bool WorkStation1Barrel3AllowDosing { get; set; }
-        [VarComm("DB3.DB50.3", "工站1_4号桶允许配料")]
-        public bool WorkStation1Barrel4AllowDosing { get; set; }
-        [VarComm("DB3.DB50.4", "工站2_1号桶允许配料")]
-        public bool WorkStation2Barrel1AllowDosing { get; set; }
-        [VarComm("DB3.DB50.5", "工站2_2号桶允许配料")]
-        public bool WorkStation2Barrel2AllowDosing { get; set; }
-        [VarComm("DB3.DB50.6", "工站2_3号桶允许配料")]
-        public bool WorkStation2Barrel3AllowDosing { get; set; }
-        [VarComm("DB3.DB50.7", "工站2_4号桶允许配料")]
-        public bool WorkStation2Barrel4AllowDosing { get; set; }
-
-        [VarComm("DB3.DBD52", "备用")]
-        public int Standby15 { get; set; }
-        [VarComm("DB3.DBD56", "备用")]
-        public int Standby16 { get; set; }
-        [VarComm("DB3.DBD60", "备用")]
-        public int Standby17 { get; set; }
-        [VarComm("DB3.DBD64", "备用")]
-        public int Standby18 { get; set; }
-        [VarComm("DB3.DBD68", "备用")]
-        public int Standby19 { get; set; }
-        [VarComm("DB3.DBD72", "备用")]
-        public int Standby20 { get; set; }
-        [VarComm("DB3.DBD76", "备用")]
-        public int Standby21 { get; set; }
-        [VarComm("DB3.DBD80", "备用")]
-        public int Standby22 { get; set; }
-        [VarComm("DB3.DBD84", "备用")]
-        public int Standby23 { get; set; }
-        [VarComm("DB3.DBD88", "备用")]
-        public int Standby24 { get; set; }
-        [VarComm("DB3.DBD92", "备用")]
-        public int Standby25 { get; set; }
-        [VarComm("DB3.DBD96", "备用")]
-        public int Standby26 { get; set; }
-
-        [VarComm("DB3.DBX100.0", "机器人运行模式")]
-        public bool RobotRunMode { get; set; }
-        [VarComm("DB3.DBX100.1", "机器人自动运行")]
-        public bool RobotAutoRun { get; set; }
-        [VarComm("DB3.DBX100.2", "机器人停止")]
-        public bool RobotStop { get; set; }
-        [VarComm("DB3.DBX100.3", "机器人运行")]
-        public bool RobotRun { get; set; }
-        [VarComm("DB3.DBX100.4", "机器人运行报警")]
-        public bool RobotRunAlarm { get; set; }
-        [VarComm("DB3.DBX100.5", "机器人在原点")]
+
+        [VarComm("DB3.DBX0.1", "机器人自动运行模式")]
+        public bool RobotAutoRunMode { get; set; }
+
+        [VarComm("DB3.DBX0.2", "机器人正在自动运行")]
+        public bool RobotAutoRunning { get; set; }
+
+        [VarComm("DB3.DBX0.3", "机器人停止运行")]
+        public bool RobotStopped { get; set; }
+
+        [VarComm("DB3.DBX0.4", "机器人正常运行")]
+        public bool RobotRunning { get; set; }
+
+        [VarComm("DB3.DBX0.5", "机器人运行故障")]
+        public bool RobotAlarm { get; set; }
+
+        [VarComm("DB3.DBX0.6", "机器人在Home点")]
         public bool RobotInHomed { get; set; }
-        [VarComm("DB3.DBX100.6", "机器人备用")]
-        public bool Standby30 { get; set; }
-        [VarComm("DB3.DBX100.7", "机器人取空桶完成")]
-        public bool RobotGetEmptyBarrelComplete { get; set; }
-
-        [VarComm("DB3.DBX101.0", "机器人放空桶完成")]
-        public bool RobotPutEmptyBarrelComplete { get; set; }
-        [VarComm("DB3.DBX101.1", "机器人取满桶完成")]
-        public bool RobotGetFullBarrelComplete { get; set; }
-        [VarComm("DB3.DBX101.2", "机器人放满桶完成")]
-        public bool RobotPutFullBarrelComplete { get; set; }
-        [VarComm("DB3.DBX101.3", "备用")]
-        public bool Standby31 { get; set; }
-        [VarComm("DB3.DBX101.4", "备用")]
-        public bool Standby32 { get; set; }
-        [VarComm("DB3.DBX101.5", "备用")]
-        public bool Standby33 { get; set; }
-        [VarComm("DB3.DBX101.6", "备用")]
-        public bool Standby34 { get; set; }
-        [VarComm("DB3.DBX101.7", "备用")]
-        public bool Standby35 { get; set; }
-
-        [VarComm("DB3.DBB102", "机器人运行的程序号")]
-        public byte RobotProgramNum { get; set; }
-        [VarComm("DB3.DBB103", "备用")]
-        public byte Standby36 { get; set; }
-        [VarComm("DB3.DBB104", "备用")]
-        public byte Standby37 { get; set; }
-        [VarComm("DB3.DBB105", "备用")]
-        public byte Standby38 { get; set; }
+
+        [VarComm("DB3.DBX1.0", "机器人执行程序号")]
+        public byte RobotRunProgram{ get; set; }
+
+        [VarComm("DB3.DBX2.0", "Plc允许工单下发")]
+        public bool[] RecipeAllowIssue { get; set; }=new bool[16];
+
+        [VarComm("DB3.DBX4.0", "Plc工单接收完成")]
+        public bool[] RecipeReceviceComple { get; set; } = new bool[16];
+
+        [VarComm("DB3.DBX6.0", "工单配料完成")]
+        public bool[] RecipeDosingComple { get; set; } = new bool[16];
+
+        [VarComm("DB3.DBX8.0", "允许单个料仓下料")]
+        public bool[] StockBinAllowIssue { get; set; } = new bool[16];
+
+        [VarComm("DB3.DBW10", "配方1桶位置反馈")]
+        public ushort[] Recipe1BarrelPosReserve { get; set; } = new ushort[3];
+
+        [VarComm("DB3.DBW16", "配方2桶位置反馈")]
+        public ushort[] Recipe2BarrelPosReserve { get; set; } = new ushort[3];
+
+        [VarComm("DB3.DBW22", "配方3桶位置反馈")]
+        public ushort[] Recipe3BarrelPosReserve { get; set; } = new ushort[3];
+
+        [VarComm("DB3.DBW28", "配方4桶位置反馈")]
+        public ushort[] Recipe4BarrelPosReserve { get; set; } = new ushort[3];
+
+        [VarComm("DB3.DBW34", "配方5桶位置反馈")]
+        public ushort[] Recipe5BarrelPosReserve { get; set; } = new ushort[3];
+
+        [VarComm("DB3.DBX40.0", "工站1有无托盘")]
+        public bool Station1HaveTray { get; set; }
+
+        [VarComm("DB3.DBX40.1", "工站1传感器信号")]
+        public bool Station1Sensor { get; set; }
+
+        [VarComm("DB3.DBX40.2", "工站1气缸信号")]
+        public bool Station1Cylinder { get; set; }
+
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcWriteAddressDB7.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcWriteAddressDB7.cs
deleted file mode 100644
index e083e60c..00000000
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcWriteAddressDB7.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
-{
-    public class PlcWriteAddressDB7
-    {
-        
-    }
-}
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index 863094fb..6cfae563 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -39,6 +39,12 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public ConcurrentQueue<string> RecipeQueueTray1 = new ConcurrentQueue<string>();
 
+
+        /// <summary>
+        /// 物料集合
+        /// </summary>
+        public Dictionary<int, ConcurrentQueue<string>> RecipeQueueTray { get; set; } = new Dictionary<int, ConcurrentQueue<string>>();
+
         public ConcurrentQueue<string> RecipeQueueTray2 = new ConcurrentQueue<string>();
 
 
@@ -66,6 +72,11 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
 
         public void Init()
         {
+            RecipeQueueTray.TryAdd(0, new ConcurrentQueue<string>());
+            RecipeQueueTray.TryAdd(1, new ConcurrentQueue<string>());
+            RecipeQueueTray.TryAdd(2, new ConcurrentQueue<string>());
+            RecipeQueueTray.TryAdd(3, new ConcurrentQueue<string>());
+            RecipeQueueTray.TryAdd(4, new ConcurrentQueue<string>());
             PlcVarMonitor();
             StockBinNameWithPos();
             RawMaterialNameWithCode();
@@ -79,7 +90,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     GVL_SmallStation.GetInstance.HeartBeatToPlc = !GVL_SmallStation.GetInstance.HeartBeatToPlc;
                     HKDevice.HK_PLC_S7.Write("DB4.DBX0.0", GVL_SmallStation.GetInstance.HeartBeatToPlc);
                     GVL_SmallStation.GetInstance.HeartBeatFromPlc = HKDevice.HK_PLC_S7.Read<bool>("DB45.DBX0.0");
-                    if (DeviceInquire.GetInstance.devices.Count < 15 && HKDevice.IsConnected && Json<RemoteRecipeDataColl>.Data.Recipes.Count > 0 && GVL_SmallStation.GetInstance.DisEnableStockBinAlarm == false && DateTime.Now.Subtract(StockBinAlarmTime).TotalSeconds >= 60) 
+                    if (DeviceInquire.GetInstance.devices.Count < 15 && HKDevice.IsConnected && Json<RemoteRecipeDataColl>.Data.Recipes.Count > 0 && GVL_SmallStation.GetInstance.DisEnableStockBinAlarm == false && DateTime.Now.Subtract(StockBinAlarmTime).TotalSeconds >= 60 & !GVL_SmallStation.GetInstance.DisEnableStockAlarm) 
                     {
                         HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
                         App.Current.Dispatcher.Invoke(() =>
@@ -163,7 +174,24 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     int index = Array.FindIndex(CommData.ToArray(), p => p.Name == item.Name);
                     if (index >= 0)
                     {
-                        CommData.ElementAt(index).Value = GVL_SmallStation.GetInstance.plcReadDataDB3.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.GetInstance.plcReadDataDB3, null).ToString();
+                        if (item.PropertyType.IsArray)
+                        {
+                            CommData.ElementAt(index).Value = "";
+                            Array array = (Array)item.GetValue(GVL_SmallStation.GetInstance.plcReadDataDB3, null);
+                            foreach (var values in array)
+                            {
+                                string data = values.ToString();
+                                if (data.ToLower() == "false")
+                                    data = "0";
+                                if (data.ToLower() == "true")
+                                    data = "1";
+                                CommData.ElementAt(index).Value = CommData.ElementAt(index).Value + data + ",";
+                            }
+                        }
+                        else
+                        {
+                            CommData.ElementAt(index).Value = GVL_SmallStation.GetInstance.plcReadDataDB3.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.GetInstance.plcReadDataDB3, null).ToString();
+                        }
                     }
                 }
             }
@@ -172,7 +200,24 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 int index = Array.FindIndex(ProcessVar.ToArray(), p => p.Name == item.Name);
                 if (index >= 0)
                 {
-                    ProcessVar.ElementAt(index).Value = GVL_SmallStation.GetInstance.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.GetInstance, null).ToString();
+                    if (item.PropertyType.IsArray)
+                    {
+                        ProcessVar.ElementAt(index).Value = "";
+                        Array array = (Array)item.GetValue(GVL_SmallStation.GetInstance, null);
+                        foreach (var values in array)
+                        {
+                            string data = values.ToString();
+                            if (data.ToLower() == "false")
+                                data = "0";
+                            if (data.ToLower() == "true")
+                                data = "1";
+                            ProcessVar.ElementAt(index).Value = ProcessVar.ElementAt(index).Value + data + ",";
+                        }
+                    }
+                    else
+                    {
+                        ProcessVar.ElementAt(index).Value = GVL_SmallStation.GetInstance.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.GetInstance, null).ToString();
+                    }
                 }
             }
         }
@@ -188,28 +233,51 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 GVL_SmallStation.GetInstance.PlcSystemMode = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.1");//系统模式
                 GVL_SmallStation.GetInstance.PlcSystemIsPause = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.2");//系统暂停
 
-                GVL_SmallStation.GetInstance.Station1HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX0.7");//工站1 有货架
-                GVL_SmallStation.GetInstance.Station2HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.0");//工站2 有货架
+                GVL_SmallStation.GetInstance.Station1HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX40.0");//工站1 有货架
+
+                GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[0] = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.0");
+                GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[1] = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.1");
+                GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[2] = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.2");
+                GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[3] = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.3");
+                GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[4] = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.4");
                 if (GVL_SmallStation.GetInstance.WindSendDosingComple)
                 {
-                    HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.7", true);
+                    //HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.7", true);
+                    HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX2.0", true);
                     GVL_SmallStation.GetInstance.WindSendDosingComple = false;
                     MessageNotify.GetInstance.ShowRunLog("风送配料完成信号，发给产线plc信号");
                 }
-                if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1"))
+                //if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1"))
+                //{
+                //    HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.7", false);
+                //}
+                /*if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.7"))//允许下配方1或者允许下配方2
                 {
-                    HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.7", false);
-                }
-                if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.7") || GVL_SmallStation.GetInstance.RequestOrder)//允许下配方1或者允许下配方2
+                    GVL_SmallStation.GetInstance.IsAllowSiemensSendRecipe = true;
+                }*/
+                //for (int i = 0; i < 5; i++)
+                //{
+                //    if (GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[i] && RecipeQueueTray[i].Count == 0)
+                //    {
+                //        GVL_SmallStation.GetInstance.IsAllowSiemensSendRecipe = true;
+                //    }
+                //}
+                //GVL_SmallStation.GetInstance.Station1Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.1");
+                //GVL_SmallStation.GetInstance.Station2Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.2");
+                //GVL_SmallStation.GetInstance.Station1Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.3");
+                //GVL_SmallStation.GetInstance.Station2Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.4");
+                //GVL_SmallStation.GetInstance.RobotStatus = HKDevice.HK_PLC_S7.Read<ushort>("DB3.DBW100");
+                //GVL_SmallStation.GetInstance.RobotProgramNum = HKDevice.HK_PLC_S7.Read<byte>("DB3.DBB102");
+                if (Json<RemoteRecipeDataColl>.Data.Recipes.Count <= 3) 
                 {
                     GVL_SmallStation.GetInstance.IsAllowSiemensSendRecipe = true;
                 }
-                GVL_SmallStation.GetInstance.Station1Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.1");
-                GVL_SmallStation.GetInstance.Station2Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.2");
-                GVL_SmallStation.GetInstance.Station1Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.3");
-                GVL_SmallStation.GetInstance.Station2Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.4");
-                GVL_SmallStation.GetInstance.RobotStatus = HKDevice.HK_PLC_S7.Read<ushort>("DB3.DBW100");
-                GVL_SmallStation.GetInstance.RobotProgramNum = HKDevice.HK_PLC_S7.Read<byte>("DB3.DBB102");
+
+                GVL_SmallStation.GetInstance.Station1Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX40.1");
+                GVL_SmallStation.GetInstance.Station1Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX40.2");
+
+                GVL_SmallStation.GetInstance.RobotStatus = HKDevice.HK_PLC_S7.Read<byte>("DB3.DBB0");
+                GVL_SmallStation.GetInstance.RobotProgramNum = HKDevice.HK_PLC_S7.Read<byte>("DB3.DBB1");
             }
             if (SiemensDevice.IsConnected)
             {
@@ -263,6 +331,16 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     string code = GVL_SmallStation.GetInstance.Order_CancelRecipeCode;
                     int index = Array.FindIndex(Json<RemoteRecipeDataColl>.Data.Recipes.ToArray(), p => p.RecipeCode == code);
+                    int[] cnt = new int[5] { -1,-1,-1,-1,-1};
+                    int index1 = -1;
+                    for (int i = 0; i < 5; i++)
+                    {
+                        cnt[i]= Array.FindIndex(RecipeQueueTray[i].ToArray(), p => p == code);
+                        if (cnt[i] >= 0) 
+                        {
+                            index1 = i;
+                        }
+                    }
                     switch (GVL_SmallStation.GetInstance.OrderCancelStep)
                     {
                         case 0://前提条件判断
@@ -273,14 +351,10 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             }
                             else
                             {
-                                if (RecipeQueueTray1.Contains(GVL_SmallStation.GetInstance.Order_CancelRecipeCode))
+                                if (index1>=0)
                                 {
                                     GVL_SmallStation.GetInstance.OrderCancelStep = 1;
                                 }
-                                else if (RecipeQueueTray2.Contains(GVL_SmallStation.GetInstance.Order_CancelRecipeCode))
-                                {
-                                    GVL_SmallStation.GetInstance.OrderCancelStep = 10;
-                                }
                                 else
                                 {
                                     GVL_SmallStation.GetInstance.OrderCancelStep = 20;
@@ -290,10 +364,10 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
 
                         //Case 1-9为
                         case 1:
-                            if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 != 0)
+                            if (GVL_SmallStation.GetInstance.RecipeProcessStatus[index] != 0)
                             {
-                                GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
-                                HKDevice.HK_PLC_S7.Write("DB4.DBX2.1", true);
+                                GVL_SmallStation.GetInstance.RecipeProcessStatus[index] = 0;
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX6." + index1, true);
                                 MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，正在取消订单：{code}");
                                 GVL_SmallStation.GetInstance.OrderCancelStep = 2;
                             }
@@ -304,11 +378,10 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             }
                             break;
                         case 2:
-                            if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.5"))
+                            if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX42."+index1))
                             {
                                 if (GVL_SmallStation.GetInstance.Station1Cylinder == false) 
                                 {
-                                    GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
                                     GVL_SmallStation.GetInstance.OrderCancelStep = 3;
                                     MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
                                 }
@@ -332,62 +405,11 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
                             });
                             RecipeQueueTray1.TryDequeue(out code);
-                            GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
-                            GVL_SmallStation.GetInstance.Order_Cancel = false;
-                            GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
-                            GVL_SmallStation.GetInstance.OrderCancelStep = 0;
-                            break;
-                        case 10:
-                            if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 != 0)
-                            {
-                                GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
-                                HKDevice.HK_PLC_S7.Write("DB4.DBX2.2", true);
-                                MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，正在取消订单：{code}");
-                                GVL_SmallStation.GetInstance.OrderCancelStep = 11;
-                            }
-                            else
-                            {
-                                MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
-                                GVL_SmallStation.GetInstance.OrderCancelStep = 12;
-                            }
-                            break;
-                        case 11:
-                            if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.6"))
-                            {
-                                if (GVL_SmallStation.GetInstance.Station2Cylinder == false)
-                                {
-                                    GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
-                                    GVL_SmallStation.GetInstance.OrderCancelStep = 12;
-                                    MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
-                                }
-                            }
-                            break;
-
-                        case 12:
-                            SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
-                            GVL_SmallStation.GetInstance.OrderCancelStep = 13;
-                            break;
-                        case 13:
-                            if (SiemensDevice.Siemens_PLC_S7.Read<bool>("DB2201.DBX440.1") == false)
-                            {
-                                SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
-                                GVL_SmallStation.GetInstance.OrderCancelStep = 14;
-                                MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
-                            }
-                            break;
-                        case 19:
-                            App.Current.Dispatcher.Invoke(() =>
-                            {
-                                Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
-                            });
-                            RecipeQueueTray2.TryDequeue(out code);
+                            GVL_SmallStation.GetInstance.RecipeProcessStatus[index] = 0;
                             GVL_SmallStation.GetInstance.Order_Cancel = false;
-                            GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;
                             GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
                             GVL_SmallStation.GetInstance.OrderCancelStep = 0;
                             break;
-
-                        //20-29为订单还未下发至PLC
                         case 20:
                             SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
                             GVL_SmallStation.GetInstance.OrderCancelStep = 21;
@@ -447,82 +469,52 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     {
                         if (data.TrayCode == 1)
                         {
-                            if (!(RecipeQueueTray1.Contains(data.RecipeCode)))
+                            if (SiemensDevice.XL_Status is XL_Status_DB status)
                             {
-                                if (SiemensDevice.XL_Status is XL_Status_DB status)
+                                switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus)
                                 {
-                                    switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus)
-                                    {
-                                        case 3:
-                                            SiemensDevice.Siemens_PLC_S7.WriteString(2231, data.RecipeCode, 10);
-                                            SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", true);
-                                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 4;
-                                            MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，请求配料");
-                                            break;
-                                        case 4:
-                                            if (SiemensDevice.XL_Status.Dosing_Confirm)
-                                            {
-                                                SiemensDevice.Siemens_PLC_S7.WriteString(2231, "", 10);//复位字符串
-                                                SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", false);
-                                                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 5;
-                                                MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料");
-                                            }
-                                            break;
-                                        case 5:
-                                            if (SiemensDevice.XL_Status.Dosing_Confirm == false)
-                                            {
-                                                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 6;
-                                                MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料信号复位完成");
-                                            }
-                                            break;
-                                        case 6:
-                                            RecipeQueueTray1.Enqueue(data.RecipeCode);
+                                    case 3:
+                                        SiemensDevice.Siemens_PLC_S7.WriteString(2231, data.RecipeCode, 10);
+                                        SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", true);
+                                        GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 4;
+                                        MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，请求配料");
+                                        break;
+                                    case 4:
+                                        if (SiemensDevice.XL_Status.Dosing_Confirm)
+                                        {
+                                            SiemensDevice.Siemens_PLC_S7.WriteString(2231, "", 10);//复位字符串
+                                            SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", false);
+                                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 5;
+                                            MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料");
+                                        }
+                                        break;
+                                    case 5:
+                                        if (SiemensDevice.XL_Status.Dosing_Confirm == false)
+                                        {
                                             GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
-                                            MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，加入队列");
-                                            break;
-                                        default:
-                                            break;
-                                    }
+                                            MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料信号复位完成");
+                                        }
+                                        break;
+                                    default:
+                                        break;
                                 }
                             }
-                        }
-                        else if (data.TrayCode == 2)
-                        {
-                            if (!(RecipeQueueTray2.Contains(data.RecipeCode)))
+                            for (int i = 0; i < 5; i++)
                             {
-                                if (SiemensDevice.XL_Status is XL_Status_DB status)
+                                if (GVL_SmallStation.GetInstance.NotUseSmallStation)
                                 {
-                                    switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus)
+                                    if (RecipeQueueTray[i].Count == 0 && !RecipeQueueTray[0].Contains(data.RecipeCode) && !RecipeQueueTray[1].Contains(data.RecipeCode) && !RecipeQueueTray[2].Contains(data.RecipeCode) && !RecipeQueueTray[3].Contains(data.RecipeCode) && !RecipeQueueTray[4].Contains(data.RecipeCode))
                                     {
-                                        case 3:
-                                            SiemensDevice.Siemens_PLC_S7.WriteString(2231, data.RecipeCode, 10);
-                                            SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", true);
-                                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 4;
-                                            MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，请求配料");
-                                            break;
-                                        case 4:
-                                            if (SiemensDevice.XL_Status.Dosing_Confirm)
-                                            {
-                                                SiemensDevice.Siemens_PLC_S7.WriteString(2231, "", 10);//复位字符串
-                                                SiemensDevice.Siemens_PLC_S7.Write("DB2231.DBX28.0", false);
-                                                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 5;
-                                                MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料");
-                                            }
-                                            break;
-                                        case 5:
-                                            if (SiemensDevice.XL_Status.Dosing_Confirm == false)
-                                            {
-                                                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 6;
-                                                MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料信号复位完成");
-                                            }
-                                            break;
-                                        case 6:
-                                            RecipeQueueTray2.Enqueue(data.RecipeCode);
-                                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
-                                            MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，加入队列");
-                                            break;
-                                        default:
-                                            break;
+                                        RecipeQueueTray[i].Enqueue(data.RecipeCode);
+                                        MessageNotify.GetInstance.ShowRunLog($"西门子配方配料 ，不使用小料配料，配方{data.RecipeCode}，加入配方{i}");
+                                    }
+                                }
+                                else if (GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[i])
+                                {
+                                    if (RecipeQueueTray[i].Count == 0 && !RecipeQueueTray[0].Contains(data.RecipeCode) && !RecipeQueueTray[1].Contains(data.RecipeCode) && !RecipeQueueTray[2].Contains(data.RecipeCode) && !RecipeQueueTray[3].Contains(data.RecipeCode) && !RecipeQueueTray[4].Contains(data.RecipeCode))
+                                    {
+                                        RecipeQueueTray[i].Enqueue(data.RecipeCode);
+                                        MessageNotify.GetInstance.ShowRunLog($"西门子配方配料 ，等待plc允许配料，配方{data.RecipeCode}，加入配方{i}");
                                     }
                                 }
                             }
@@ -531,12 +523,11 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
                 else
                 {
-                    RecipeQueueTray1.Clear();
-                    RecipeQueueTray2.Clear();
-                    /*GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
-                    GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;*/
-                    GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
-                    GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
+                    for (int i = 0; i < 5; i++)
+                    {
+                        RecipeQueueTray[i].Clear();
+                        GVL_SmallStation.GetInstance.RecipeProcessStatus[i] = 0;
+                    }
                 }
             }
             else
@@ -548,29 +539,35 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     {
                         if (data.TrayCode == 1)
                         {
-                            if (!(RecipeQueueTray1.Contains(data.RecipeCode)))
-                            {
-                                RecipeQueueTray1.Enqueue(data.RecipeCode);
-                            }
-                        }
-                        else if (data.TrayCode == 2)
-                        {
-                            if (!(RecipeQueueTray2.Contains(data.RecipeCode)))
+                            for (int i = 0; i < 5; i++)
                             {
-                                RecipeQueueTray2.Enqueue(data.RecipeCode);
+                                if (GVL_SmallStation.GetInstance.NotUseSmallStation) 
+                                {
+                                    if (RecipeQueueTray[i].Count == 0 && !RecipeQueueTray[0].Contains(data.RecipeCode) && !RecipeQueueTray[1].Contains(data.RecipeCode) && !RecipeQueueTray[2].Contains(data.RecipeCode) && !RecipeQueueTray[3].Contains(data.RecipeCode) && !RecipeQueueTray[4].Contains(data.RecipeCode))
+                                    {
+                                        RecipeQueueTray[i].Enqueue(data.RecipeCode);
+                                        MessageNotify.GetInstance.ShowRunLog($"本地配方配料 ，不使用小料配料，配方{data.RecipeCode}，加入配方{i}");
+                                    }
+                                }
+                                else if(GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[i])
+                                {
+                                    if (RecipeQueueTray[i].Count==0 && !RecipeQueueTray[0].Contains(data.RecipeCode) && !RecipeQueueTray[1].Contains(data.RecipeCode) && !RecipeQueueTray[2].Contains(data.RecipeCode) && !RecipeQueueTray[3].Contains(data.RecipeCode) && !RecipeQueueTray[4].Contains(data.RecipeCode))
+                                    {
+                                        RecipeQueueTray[i].Enqueue(data.RecipeCode);
+                                        MessageNotify.GetInstance.ShowRunLog($"本地配方配料 ，等待plc允许配料，配方{data.RecipeCode}，加入配方{i}");
+                                    }
+                                }
                             }
                         }
                     }
                 }
                 else
                 {
-                    RecipeQueueTray1.Clear();
-                    RecipeQueueTray2.Clear();
-                    /*GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
-                    GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;*/
-
-                    GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
-                    GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
+                    for (int i = 0; i < 5; i++)
+                    {
+                        RecipeQueueTray[i].Clear();
+                        GVL_SmallStation.GetInstance.RecipeProcessStatus[i] = 0;
+                    }
                 }
             }
         }
@@ -579,669 +576,348 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         private void RecipeInfoToHKPLC()
         {
-            switch (GVL_SmallStation.GetInstance.Tray1LogicFinish)
+            if (!GVL_SmallStation.GetInstance.NotUseSmallStation)
             {
-                case 0:
-                    if (GVL_SmallStation.GetInstance.AGV_PutTray1Finish && RecipeQueueTray1.Count > 0 && !GVL_SmallStation.GetInstance.NotUseSmallDosing)
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB4.DBX0.7", true);
-                        GVL_SmallStation.GetInstance.AGV_PutTray1Finish = false;
-                        GVL_SmallStation.GetInstance.Tray1LogicFinish = 1;
-                        MessageNotify.GetInstance.ShowRunLog("AGV到位 发送到位信号给plc");
-                    }
-                    break;
-                case 1:
-                    if (GVL_SmallStation.GetInstance.Station1HaveTray)
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB4.DBX0.7", false);
-                        GVL_SmallStation.GetInstance.Tray1LogicFinish = 2;
-                        MessageNotify.GetInstance.ShowRunLog("托盘1有货架");
-                    }
-                    else
+                for (int i = 0; i < 5; i++)
+                {
+                    switch (GVL_SmallStation.GetInstance.Tray_AGVLogic[i])
                     {
-                        if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.5") == true)
-                        {
-                            if (GVL_SmallStation.GetInstance.CylinderReset)
+                        case 0:
+                            if (GVL_SmallStation.GetInstance.AGV_PutTray1Finish && (RecipeQueueTray[i].Count > 0) && GVL_SmallStation.GetInstance.AGVIsGetTray == false)
                             {
-                                HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.5", true);
+                                GVL_SmallStation.GetInstance.AGVIsGetTray = true;
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX8." + i, true);
+                                GVL_SmallStation.GetInstance.AGV_PutTray1Finish = false;
+                                GVL_SmallStation.GetInstance.Tray_AGVLogic[i] = 1;
+                                MessageNotify.GetInstance.ShowRunLog("AGV到位 发送到位信号给plc");
                             }
-                            MessageNotify.GetInstance.ShowRunLog("气缸收紧错位");
-                        }
-                        else
-                        {
-                            GVL_SmallStation.GetInstance.Tray1LogicFinish = 1;
-                            HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.5", false);
-                        }
-                    }
-                    break;
-                case 2:
-                    if (GVL_SmallStation.GetInstance.AGV_GetTray1Finish && GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 0)
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB4.DBX1.1", true);
-                        GVL_SmallStation.GetInstance.Tray1LogicFinish = 3;
-                        MessageNotify.GetInstance.ShowRunLog("AGV取托盘1完成,发送给海科信号后1s后复位");
-                    }
-                    break;
-                case 3:
-                    if (HKDevice.HK_PLC_S7.Read<bool>("DB4.DBX1.1") == true)
-                    {
-                        Thread.Sleep(1000);
-                        HKDevice.HK_PLC_S7.Write("DB4.DBX1.1", false);
-                        GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
-                        GVL_SmallStation.GetInstance.AGV_GetTray1Finish = false;
-                        MessageNotify.GetInstance.ShowRunLog("AGV取托盘1完成，信号复位");
-                    }
-                    break;
-                default:
-                    break;
-            }
-            switch (GVL_SmallStation.GetInstance.Tray2LogicFinish)
-            {
-                case 0:
-                    if (GVL_SmallStation.GetInstance.AGV_PutTray2Finish)
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB4.DBX1.0", true);
-                        GVL_SmallStation.GetInstance.AGV_PutTray2Finish = false;
-                        GVL_SmallStation.GetInstance.Tray2LogicFinish = 1;
-                        MessageNotify.GetInstance.ShowRunLog("AGV到位 发送到位信号给plc");
-                    }
-                    break;
-                case 1:
-                    if (GVL_SmallStation.GetInstance.Station2HaveTray)
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB4.DBX1.0", false);
-                        GVL_SmallStation.GetInstance.Tray2LogicFinish = 2;
-                        MessageNotify.GetInstance.ShowRunLog("托盘1有货架");
-                    }
-                    else
-                    {
-                        if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.6") == true)
-                        {
-                            if (GVL_SmallStation.GetInstance.CylinderReset)
+                            break;
+                        case 1:
+                            if (GVL_SmallStation.GetInstance.Station1HaveTray)
+
                             {
-                                HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.6", true);
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX8." + i, false);
+                                GVL_SmallStation.GetInstance.Tray_AGVLogic[i] = 2;
+                                MessageNotify.GetInstance.ShowRunLog("托盘1有货架");
                             }
-                            MessageNotify.GetInstance.ShowRunLog("气缸收紧错位");
-                        }
-                        else
-                        {
-                            GVL_SmallStation.GetInstance.Tray2LogicFinish = 1;
-                            HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.6", false);
-                        }
-                    }
-                    break;
-                case 2:
-                    if (GVL_SmallStation.GetInstance.AGV_GetTray2Finish && GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 0)
-                    {
-                        HKDevice.HK_PLC_S7.Write("DB4.DBX1.2", true);
-                        GVL_SmallStation.GetInstance.Tray2LogicFinish = 3;
-                    }
-                    break;
-                case 3:
-                    if (HKDevice.HK_PLC_S7.Read<bool>("DB4.DBX1.2") == true)
-                    {
-                        Thread.Sleep(1000);
-                        HKDevice.HK_PLC_S7.Write("DB4.DBX1.2", false);
-                        GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;
-                        GVL_SmallStation.GetInstance.AGV_GetTray2Finish = false;
+                            break;
+                        case 2:
+                            if (GVL_SmallStation.GetInstance.AGV_GetTray1Finish && GVL_SmallStation.GetInstance.RecipeProcessStatus[i] == 0)
+                            {
+                                GVL_SmallStation.GetInstance.AGVIsGetTray = false;
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX10." + i, true);
+                                GVL_SmallStation.GetInstance.Tray_AGVLogic[i] = 3;
+                                MessageNotify.GetInstance.ShowRunLog("AGV取托盘1完成,发送给海科信号后1s后复位");
+                            }
+                            break;
+                        case 3:
+                            if (HKDevice.HK_PLC_S7.Read<bool>("DB4.DBX10." + i) == true)
+                            {
+                                Thread.Sleep(1000);
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX10." + i, false);
+                                GVL_SmallStation.GetInstance.Tray_AGVLogic[i] = 0;
+                                GVL_SmallStation.GetInstance.AGV_GetTray1Finish = false;
+                                MessageNotify.GetInstance.ShowRunLog("AGV取托盘1完成，信号复位");
+                            }
+                            break;
+                        default:
+                            break;
                     }
-                    break;
-                default:
-                    break;
+                }
             }
-            #region 托盘1配料
-            if (RecipeQueueTray1.Count > 0) /*&& GVL_SmallStation.GetInstance.Tray1LogicFinish == 2*/   //不需要等待AGV到位，就给PLC下发配方
+            foreach (var recipe in RecipeQueueTray)
             {
-                int index = Array.FindIndex(RemoteRecipes.ToArray(), p => p.RecipeCode == RecipeQueueTray1.ElementAt(0));
-                if (index >= 0 && index < RemoteRecipes.Count)
+                int recipeNum = recipe.Key;
+                if (RecipeQueueTray[recipeNum].Count > 0)
                 {
-                    string code = RemoteRecipes.ElementAt(index).RecipeCode;
-                    int trayCode = RemoteRecipes.ElementAt(index).TrayCode;
-                    string recipeName = RemoteRecipes.ElementAt(index).RecipeName;
-                    string windSend = RemoteRecipes.ElementAt(index).ToString();
-                    if (trayCode == 1)
+                    int index = Array.FindIndex(RemoteRecipes.ToArray(), p => p.RecipeCode == RecipeQueueTray[recipeNum].ElementAt(0));
+                    if (index >= 0 && index < RemoteRecipes.Count)
                     {
-                        if (GVL_SmallStation.GetInstance.NotUseSmallDosing)
+                        string code = RemoteRecipes.ElementAt(index).RecipeCode;
+                        int trayCode = RemoteRecipes.ElementAt(index).TrayCode;
+                        string recipeName = RemoteRecipes.ElementAt(index).RecipeName;
+                        string windSend = RemoteRecipes.ElementAt(index).ToString();
+                        if (trayCode == 1)
                         {
-                            if (GVL_SmallStation.GetInstance.AGV_PutTray1Finish)
+                            if (GVL_SmallStation.GetInstance.NotUseSmallStation)
                             {
-                                Thread.Sleep(5000);
-                                var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
-                                if (SiemensDevice.IsConnected && !GVL_SmallStation.GetInstance.IsUseLocalRecipe)
+                                if (GVL_SmallStation.GetInstance.AGV_PutTray1Finish)
                                 {
-                                    RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
-                                    RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
-                                    RecipeFinishInfo.Job_No = (short)trayCode;
-                                    for (int i = 0; i < 20; i++)
-                                    {
-                                        RecipeFinishInfo.Material[i] = new UDT1();
-                                    }
-                                    for (int i = 0; i < 10; i++)
-                                    {
-                                        RecipeFinishInfo.Powder[i] = new UDT2();
-                                    }
-                                    for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
-                                    {
-                                        RecipeFinishInfo.Material[i].Material_Name = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
-                                        RecipeFinishInfo.Material[i].Material_BarrelNum = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
-                                        RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight * (float)0.001;
-                                    }
-                                    for (int i = 0; i < RemoteRecipes.ElementAt(index).WindSend.Count; i++)
+                                    Thread.Sleep(5000);
+                                    var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
+                                    if (SiemensDevice.IsConnected && !GVL_SmallStation.GetInstance.IsUseLocalRecipe)
                                     {
-                                        RecipeFinishInfo.Powder[i].Powder_Weight = RemoteRecipes.ElementAt(index).WindSend.ElementAt(i).DosingCompleWeight;
-                                    }
-                                    RecipeFinishInfo.Ask_For_Finish = true;
-                                    RecipeFinishInfo.DosingTime = 0;
-                                    SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
+                                        RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
+                                        RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
+                                        RecipeFinishInfo.Job_No = (short)trayCode;
+                                        for (int i = 0; i < 20; i++)
+                                        {
+                                            RecipeFinishInfo.Material[i] = new UDT1();
+                                        }
+                                        for (int i = 0; i < 10; i++)
+                                        {
+                                            RecipeFinishInfo.Powder[i] = new UDT2();
+                                        }
+                                        for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
+                                        {
+                                            RecipeFinishInfo.Material[i].Material_Name = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
+                                            RecipeFinishInfo.Material[i].Material_BarrelNum = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
+                                            RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight * (float)0.001;
+                                        }
+                                        for (int i = 0; i < RemoteRecipes.ElementAt(index).WindSend.Count; i++)
+                                        {
+                                            RecipeFinishInfo.Powder[i].Powder_Weight = RemoteRecipes.ElementAt(index).WindSend.ElementAt(i).DosingCompleWeight;
+                                        }
+                                        RecipeFinishInfo.Ask_For_Finish = true;
+                                        RecipeFinishInfo.DosingTime = Convert.ToInt16(0);
+                                        SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
 
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据反馈给西门子");
-                                }
-                                else
-                                {
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据无法反馈给西门子，西门子设备未连接或处于本地配方");
-                                }
-                                GVL_SmallStation.GetInstance.WindSendDosing = false;
-                                App.Current.Dispatcher.Invoke(() =>
-                                {
-                                    Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
-                                });
-                                RecipeQueueTray1.TryDequeue(out code);
-                            }
-                        }
-                        else
-                        {
-                            //粉料仓下发配方
-                            if (GVL_SmallStation.GetInstance.IsUseWindSend && GVL_SmallStation.GetInstance.Tray1LogicFinish == 2 && GVL_SmallStation.GetInstance.WindSendDosing == false)
-                            {
-                                GVL_SmallStation.GetInstance.WindSendDosing = true;
-                                WindSendData.TargetRecipeCode = code;
-                                WindSendData.IsAllowDosing = true;
-                                foreach (var item in RemoteRecipes.ElementAt(index).WindSend)
-                                {
-                                    if (item.RawMaterialName == "0037" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(0).RawMaterialName)
-                                    {
-                                        WindSendData.RawMaterial1_SetWeight = item.RawMaterialWeight;
-                                    }
-                                    if (item.RawMaterialName == "0038" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(1).RawMaterialName)
-                                    {
-                                        WindSendData.RawMaterial2_SetWeight = item.RawMaterialWeight;
-                                    }
-                                    if (item.RawMaterialName == "0039" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(2).RawMaterialName)
-                                    {
-                                        WindSendData.RawMaterial3_SetWeight = item.RawMaterialWeight;
+                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据反馈给西门子");
                                     }
-                                    if (item.RawMaterialName == "0045" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(3).RawMaterialName)
+                                    else
                                     {
-                                        WindSendData.RawMaterial4_SetWeight = item.RawMaterialWeight;
+                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据无法反馈给西门子，西门子设备未连接或处于本地配方");
                                     }
-                                    if (item.RawMaterialName == "0046" || item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(4).RawMaterialName)
+                                    GVL_SmallStation.GetInstance.WindSendDosing = false;
+                                    App.Current.Dispatcher.Invoke(() =>
                                     {
-                                        WindSendData.RawMaterial5_SetWeight = item.RawMaterialWeight;
-                                    }
-                                }
-                                WindSendDevice.Siemens_PLC_S7.WriteClass<WindSend_Write>(WindSendData, 95);
-                            }
-                            if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 0)
-                            {
-                                StockBinInit();
-                                GVL_SmallStation.GetInstance.StockBinDosing = 0;
-                                foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
-                                {
-                                    HKDevice.StockBinPar((uint)item.RawMaterialBarrelNum, (ushort)item.RawMaterialLocation);
-                                    GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)item.RawMaterialLocation, true);//哪些仓位需要配料写入
+                                        Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
+                                    });
+                                    RecipeQueueTray[recipeNum].TryDequeue(out code);
+                                    GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] = 0;
+                                    GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] = 0;
                                 }
-                                HKDevice.HK_PLC_S7.Write("DB4.DBX1.3", true);
-                                GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 1;
-                                MessageNotify.GetInstance.ShowRunLog($"托盘1,配方：{recipeName}，下发完成");
-                                GVL_SmallStation.GetInstance.time1 = DateTime.Now;
-                            }
-                            bool recipeReceviceFinish = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.3");
-                            if (recipeReceviceFinish && GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 1)
-                            {
-                                HKDevice.HK_PLC_S7.Write("DB4.DBX1.3", false);
-                                GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 2;
-                                MessageNotify.GetInstance.ShowRunLog($"托盘1,{ recipeName}plc端 配方接收完成");
                             }
-                            if (GVL_SmallStation.GetInstance.RecipeStatusIDTray1 == 2)
+                            else
                             {
-                                if (RTrig.GetInstance("DB3.DBX50.0").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.0")))
+                                //粉料仓下发配方
+                                if (GVL_SmallStation.GetInstance.IsUseWindSend && GVL_SmallStation.GetInstance.Tray_AGVLogic[recipeNum] == 2 && GVL_SmallStation.GetInstance.WindSendDosing == false)
                                 {
-                                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD10");
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{res}料仓，允许配料");
-                                    if (res > 0 && res is float loc)
+                                    if (WindSendDevice.IsConnected)
                                     {
-                                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                        float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;//单位g转换kg
-                                        if (weight <= 0)
+                                        WindSendData.TargetRecipeCode = code;
+                                        WindSendData.IsAllowDosing = true;
+                                        foreach (var item in RemoteRecipes.ElementAt(index).WindSend)
                                         {
-                                            int i = (int)loc;
-                                            if (i >= 1 && i <= 8)
+                                            if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(0).RawMaterialName)
                                             {
-                                                string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
-                                                MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                                WindSendData.RawMaterial1_SetWeight = item.RawMaterialWeight;
                                             }
-                                            else if (i >= 9 && i <= 15)
+                                            if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(1).RawMaterialName)
                                             {
-                                                string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
-                                                MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                                WindSendData.RawMaterial2_SetWeight = item.RawMaterialWeight;
                                             }
-                                            GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
-                                        }
-                                        else
-                                        {
-                                            if (loc_index >= 0)
+                                            if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(2).RawMaterialName)
                                             {
-                                                DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//根据料仓编号 启动并写入每个原料重量
-                                                GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                                WindSendData.RawMaterial3_SetWeight = item.RawMaterialWeight;
                                             }
-                                            else
+                                            if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(3).RawMaterialName)
                                             {
-                                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，错误没有找到{(int)loc}号仓的配方");
+                                                WindSendData.RawMaterial4_SetWeight = item.RawMaterialWeight;
                                             }
-                                        }
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{(int)loc}号仓，正在配料");
-                                    }
-                                }
-                                else if (RTrig.GetInstance("DB3.DBX50.1").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.1")))
-                                {
-                                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD14");
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{res}料仓，允许配料");
-                                    if (res > 0 && res is float loc)
-                                    {
-                                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                        float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
-                                        if (weight <= 0)
-                                        {
-                                            int i = (int)loc;
-                                            if (i >= 1 && i <= 8)
-                                            {
-                                                string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
-                                                MessageNotify.GetInstance.ShowRunLog(commInfo);
-                                            }
-                                            else if (i >= 9 && i <= 15)
+                                            if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(4).RawMaterialName)
                                             {
-                                                string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
-                                                MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                                WindSendData.RawMaterial5_SetWeight = item.RawMaterialWeight;
                                             }
-                                            GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
                                         }
-                                        else
-                                        {
-                                            if (loc_index >= 0)
-                                            {
-                                                DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
-                                                GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-                                            }
-                                            else
-                                            {
-                                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，错误没有找到{(int)loc}号仓的配方");
-                                            }
-                                        }
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{(int)loc}号仓，正在配料");
+                                        GVL_SmallStation.GetInstance.WindSendDosing = true;
+                                        WindSendDevice.Siemens_PLC_S7.WriteClass<WindSend_Write>(WindSendData, 95);
+                                    }
+                                    else
+                                    {
+                                        MessageNotify.GetInstance.ShowRunLog($"风送设备PLC未连接");
                                     }
                                 }
-                                else if (RTrig.GetInstance("DB3.DBX50.2").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.2")))
+                                if (GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] == 0)
+                                {
+                                    GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] = 0;
+                                    HKDevice.IssueRecipeToPlc(RemoteRecipes.ElementAt(index).RawMaterial, recipeNum);
+                                    HKDevice.HK_PLC_S7.Write("DB4.DBX2." + recipeNum, true);
+                                    GVL_SmallStation.GetInstance.DosingTime[recipeNum] = DateTime.Now;
+                                    GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] = 1;
+                                    MessageNotify.GetInstance.ShowRunLog($"托盘1,配方编号{code},配方号{recipeNum + 1}，下发完成");
+                                }
+                                bool recipeReceviceFinish = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX4." + recipeNum);
+                                if (recipeReceviceFinish && GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] == 1)
+                                {
+                                    HKDevice.HK_PLC_S7.Write("DB4.DBX2." + recipeNum, false);
+                                    GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] = 2;
+                                    GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] = 0;
+                                    MessageNotify.GetInstance.ShowRunLog($"托盘1,配方编号{code},配方号{recipeNum + 1}，配方接收完成");
+                                }
+                                if (GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] == 2)
                                 {
-                                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD18");
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{res}料仓，允许配料");
-                                    if (res > 0 && res is float loc)
+                                    for (byte i = 1; i < 16; i++)
                                     {
-                                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                        float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
-                                        if (weight <= 0)
+                                        int indexArr = -1;
+                                        if (GVL_SmallStation.GetInstance.plcReadDataDB3.StockBinAllowIssue[i - 1])
                                         {
-                                            int i = (int)loc;
-                                            if (i >= 1 && i <= 8)
+                                            switch (recipeNum)
                                             {
-                                                string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
-                                                MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                                case 0:
+                                                    indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe1BarrelPosReserve.ToArray(), p => p == i);
+                                                    break;
+                                                case 1:
+                                                    indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe2BarrelPosReserve.ToArray(), p => p == i);
+                                                    break;
+                                                case 2:
+                                                    indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe3BarrelPosReserve.ToArray(), p => p == i);
+                                                    break;
+                                                case 3:
+                                                    indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe4BarrelPosReserve.ToArray(), p => p == i);
+                                                    break;
+                                                case 4:
+                                                    indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe5BarrelPosReserve.ToArray(), p => p == i);
+                                                    break;
                                             }
-                                            else if (i >= 9 && i <= 15)
+                                            if (indexArr >= 0 && GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum].Get16bitValue((byte)i) == false)
                                             {
-                                                string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
-                                                MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                                int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
+                                                float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;//单位g转换kg
+                                                if (weight <= 0)
+                                                {
+                                                    if (i >= 1 && i <= 8)
+                                                    {
+                                                        string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX12." + (i - 1), true);
+                                                        MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                                    }
+                                                    else if (i >= 9 && i <= 15)
+                                                    {
+                                                        string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX13." + (i - 9), true);
+                                                        MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                                    }
+                                                    GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] = GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum].SetBitValue((byte)i, false);//配料完成设备写成false
+                                                    GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] = GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum].SetBitValue((byte)i, true);//配料完成设备写成false
+                                                }
+                                                else
+                                                {
+                                                    if (loc_index >= 0)
+                                                    {
+                                                        DeviceInquire.GetInstance.GetDevice((int)i)?.Start(weight);//根据料仓编号 启动并写入每个原料重量
+                                                        GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] = GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum].SetBitValue((byte)i, true);//配料完成设备写成false
+                                                    }
+                                                    else
+                                                    {
+                                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方编号：{code}，配方号{recipeNum + 1}，{indexArr + 1}号桶，错误没有找到{(int)i}号仓的配方");
+                                                    }
+                                                }
+                                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方编号：{code}，配方号{recipeNum + 1}，{indexArr + 1}号桶，{(int)i}号仓，正在配料");
                                             }
-                                            GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
-                                        }
-                                        else
-                                        {
-                                            if (loc_index >= 0)
+                                            else
                                             {
-                                                DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
-                                                GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                                //MessageNotify.GetInstance.ShowRunLog($"错误，有允许配料信号，但没有相应的位置 和桶号");
                                             }
-                                            else
+                                            if ((DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3) && indexArr >= 0 && GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum].Get16bitValue((byte)i))
                                             {
-                                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，错误没有找到{(int)loc}号仓的配方");
+                                                int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
+                                                if (res < 0)
+                                                {
+
+                                                }
+                                                else
+                                                {
+                                                    Thread.Sleep(GVL_SmallStation.GetInstance.Time);
+                                                    RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
+                                                    bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
+                                                    MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成,下料完成重量：{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}");
+                                                    float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000);
+                                                    int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
+                                                    if (iIndex >= 0)
+                                                    {
+                                                        if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
+                                                        {
+                                                            HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
+                                                            App.Current.Dispatcher.Invoke(() =>
+                                                            {
+                                                                MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
+                                                                HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
+                                                            });
+                                                        }
+                                                    }
+                                                    if (i >= 1 && i <= 8)
+                                                    {
+                                                        string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX12." + (i - 1), true);
+                                                        MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                                    }
+                                                    else if (i >= 9 && i <= 15)
+                                                    {
+                                                        string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX13." + (i - 9), true);
+                                                        MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                                    }
+                                                    GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] = GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum].SetBitValue((byte)i, false);//配料完成设备写成false
+                                                    MessageNotify.GetInstance.ShowRunLog($"配方{recipeNum}，{GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum].ToBinString()}");
+                                                }
                                             }
                                         }
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{(int)loc}号仓，正在配料");
                                     }
-                                }
-                                else if (RTrig.GetInstance("DB3.DBX50.3").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.3")))
-                                {
-                                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD22");
-                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{res}料仓，允许配料");
-                                    if (res > 0 && res is float loc)
+                                    bool DosingComple = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX6." + recipeNum);
+                                    if ((RTrig.GetInstance("配方配料完成").Start(DosingComple)) || (GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] > 0 && DosingComple))
                                     {
-                                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                        float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;
-                                        if (weight <= 0)
+                                        GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] = 0;
+                                        if (GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] > 0)
                                         {
-                                            int i = (int)loc;
-                                            if (i >= 1 && i <= 8)
-                                            {
-                                                string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
-                                                MessageNotify.GetInstance.ShowRunLog(commInfo);
-                                            }
-                                            else if (i >= 9 && i <= 15)
+                                            for (int i = 1; i < 17; i++)
                                             {
-                                                string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
-                                                MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                                if (GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum].Get16bitValue((byte)i))
+                                                {
+                                                    MessageNotify.GetInstance.ShowRunLog($"料仓配料完成，但存在料仓未配料:{i}号仓");
+                                                }
                                             }
-                                            GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
                                         }
-                                        else
+                                        var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
+                                        double a = DateTime.Now.Subtract(GVL_SmallStation.GetInstance.DosingTime[recipeNum]).TotalSeconds;
+                                        foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
                                         {
-                                            if (loc_index >= 0)
-                                            {
-                                                DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//启动并写入每个原料重量
-                                                GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-                                            }
-                                            else
-                                            {
-                                                MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，错误没有找到{(int)loc}号仓的配方");
-                                            }
+                                            MessageNotify.GetInstance.ShowRunLog($"{item.RawMaterialName},下料重量：{item.Laying_Off_Weight}g");
                                         }
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{(int)loc}号仓，正在配料");
-                                    }
-                                }
-                                for (int i = 1; i < 16; i++)
-                                {
-                                    if ((DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3) && GVL_SmallStation.GetInstance.StockBinDosing.Get16bitValue((byte)i))
-                                    {
-                                        int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
-                                        if (res >= 0)
+                                        if (SiemensDevice.IsConnected && !GVL_SmallStation.GetInstance.IsUseLocalRecipe)
                                         {
-                                            Thread.Sleep(GVL_SmallStation.GetInstance.Time);
-                                            RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
-                                            bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
-                                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成,下料完成重量：{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}");
-                                            float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000);
-                                            int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
-                                            if (iIndex >= 0)
+                                            RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
+                                            RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
+                                            RecipeFinishInfo.Job_No = (short)trayCode;
+                                            for (int i = 0; i < 20; i++)
                                             {
-                                                if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
-                                                {
-                                                    HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
-                                                    App.Current.Dispatcher.Invoke(() =>
-                                                    {
-                                                        MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
-                                                        HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
-                                                    });
-                                                }
+                                                RecipeFinishInfo.Material[i] = new UDT1();
                                             }
-                                            if (i >= 1 && i <= 8)
+                                            for (int i = 0; i < 10; i++)
                                             {
-                                                string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
-                                                MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                                RecipeFinishInfo.Powder[i] = new UDT2();
                                             }
-                                            else if (i >= 9 && i <= 15)
+                                            for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
                                             {
-                                                string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
-                                                MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                                RecipeFinishInfo.Material[i].Material_Name = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
+                                                RecipeFinishInfo.Material[i].Material_BarrelNum = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
+                                                RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight * (float)0.001;
                                             }
-                                        }
-                                        GVL_SmallStation.GetInstance.StockBinDosing = GVL_SmallStation.GetInstance.StockBinDosing.SetBitValue((byte)i, false);//配料完成设备写成false
-                                    }
-                                }
-                                if ((RTrig.GetInstance("配方配料完成").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1"))))
-                                {
-                                    if (GVL_SmallStation.GetInstance.StockBinDosing > 0)
-                                    {
-                                        for (int i = 1; i < 17; i++)
-                                        {
-                                            if (GVL_SmallStation.GetInstance.StockBinDosing.Get16bitValue((byte)i))
+                                            for (int i = 0; i < RemoteRecipes.ElementAt(index).WindSend.Count; i++)
                                             {
-                                                MessageNotify.GetInstance.ShowRunLog($"料仓配料完成，但存在料仓未配料:{i}号仓");
+                                                RecipeFinishInfo.Powder[i].Powder_Weight = RemoteRecipes.ElementAt(index).WindSend.ElementAt(i).DosingCompleWeight;
                                             }
+                                            RecipeFinishInfo.Ask_For_Finish = true;
+                                            RecipeFinishInfo.DosingTime = Convert.ToInt16(a);
+                                            SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
+
+                                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据反馈给西门子");
                                         }
-                                    }
-                                    var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
-                                    foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
-                                    {
-                                        MessageNotify.GetInstance.ShowRunLog($"{item.RawMaterialName},下料重量：{item.Laying_Off_Weight}g");
-                                    }
-                                    if (SiemensDevice.IsConnected && !GVL_SmallStation.GetInstance.IsUseLocalRecipe)
-                                    {
-                                        RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
-                                        RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
-                                        RecipeFinishInfo.Job_No = (short)trayCode;
-                                        for (int i = 0; i < 20; i++)
-                                        {
-                                            RecipeFinishInfo.Material[i] = new UDT1();
-                                        }
-                                        for (int i = 0; i < 10; i++)
-                                        {
-                                            RecipeFinishInfo.Powder[i] = new UDT2();
-                                        }
-                                        for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
+                                        else
                                         {
-                                            RecipeFinishInfo.Material[i].Material_Name = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
-                                            RecipeFinishInfo.Material[i].Material_BarrelNum = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
-                                            RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight * (float)0.001;
+                                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据无法反馈给西门子，西门子设备未连接或处于本地配方");
                                         }
-                                        for (int i = 0; i < RemoteRecipes.ElementAt(index).WindSend.Count; i++)
+                                        GVL_SmallStation.GetInstance.WindSendDosing = false;
+                                        App.Current.Dispatcher.Invoke(() =>
                                         {
-                                            RecipeFinishInfo.Powder[i].Powder_Weight = RemoteRecipes.ElementAt(index).WindSend.ElementAt(i).DosingCompleWeight;
-                                        }
-                                        double a = DateTime.Now.Subtract(GVL_SmallStation.GetInstance.time1).TotalSeconds;
-                                        RecipeFinishInfo.Ask_For_Finish = true;
-                                        RecipeFinishInfo.DosingTime = Convert.ToInt16(a);
-                                        SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
-
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据反馈给西门子");
-                                    }
-                                    else
-                                    {
-                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据无法反馈给西门子，西门子设备未连接或处于本地配方");
+                                            Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
+                                        });
+                                        RecipeQueueTray[recipeNum].TryDequeue(out code);
+                                        GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] = 0;
+                                        GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] = 0;
                                     }
-                                    GVL_SmallStation.GetInstance.WindSendDosing = false;
-                                    App.Current.Dispatcher.Invoke(() =>
-                                    {
-                                        Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
-                                    });
-                                    RecipeQueueTray1.TryDequeue(out code);
-                                    HKDevice.HK_PLC_S7.Write("DB3.DBX1.1", false);
-                                    GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
                                 }
                             }
                         }
                     }
                 }
             }
-            #endregion
-            #region 托盘2配料 ---硬件不具备条件，不使用
-            //if (RecipeQueueTray2.Count > 0 && GVL_SmallStation.GetInstance.Tray2LogicFinish == 2)
-            //{
-            //    int index = Array.FindIndex(RemoteRecipes.ToArray(), p => p.RecipeCode == RecipeQueueTray2.ElementAt(0));
-            //    if (index >= 0 && index < RemoteRecipes.Count)
-            //    {
-            //        string code = RemoteRecipes.ElementAt(index).RecipeCode;
-            //        int trayCode = RemoteRecipes.ElementAt(index).TrayCode;
-            //        string recipeName = RemoteRecipes.ElementAt(index).RecipeName;
-            //        if (trayCode == 2)
-            //        {
-            //            if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 0)
-            //            {
-            //                StockBinInit();
-            //                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，初始化");
-            //                foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
-            //                {
-            //                    HKDevice.StockBinPar((uint)item.RawMaterialBarrelNum, (ushort)item.RawMaterialLocation, 2);
-            //                }
-            //                HKDevice.HK_PLC_S7.Write("DB4.DBX1.4", true);
-            //                GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 1;
-            //                MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，下发完成");
-            //            }
-
-            //            if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.4") && GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 1)
-            //            {
-            //                HKDevice.HK_PLC_S7.Write("DB3.DBX1.4", false);
-            //                GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 2;
-            //                MessageNotify.GetInstance.ShowRunLog($"配方：{recipeName}，plc端 配方接收完成");
-            //            }
-            //            if (GVL_SmallStation.GetInstance.RecipeStatusIDTray2 == 2)
-            //            {
-            //                if (RTrig.GetInstance("DB3.DBX50.4").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.4")))
-            //                {
-            //                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD26");
-            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，1号桶，{res}料仓，允许配料");
-            //                    if (res > 0 && res is float loc)
-            //                    {
-            //                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-            //                        double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
-            //                        if (loc_index >= 0)
-            //                        {
-            //                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//根据料仓编号 启动并写入每个原料重量
-            //                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-            //                        }
-            //                        GVL_SmallStation.GetInstance.DosingTray2 = true;
-            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
-            //                        MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，1号桶，{(int)loc}号仓，配料完成");
-            //                    }
-            //                }
-            //                else if (RTrig.GetInstance("DB3.DBX50.5").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.5")))
-            //                {
-            //                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD30");
-            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，2号桶，{res}料仓，允许配料");
-            //                    if (res > 0 && res is float loc)
-            //                    {
-            //                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-            //                        double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
-            //                        if (loc_index >= 0)
-            //                        {
-            //                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
-            //                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-            //                        }
-            //                        GVL_SmallStation.GetInstance.DosingTray2 = true;
-            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
-            //                        MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，2号桶，{(int)loc}号仓，配料完成");
-            //                    }
-            //                }
-            //                else if (RTrig.GetInstance("DB3.DBX50.6").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.6")))
-            //                {
-            //                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD34");
-            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，3号桶，{res}料仓，允许配料");
-            //                    if (res > 0 && res is float loc)
-            //                    {
-            //                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-            //                        double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
-            //                        if (loc_index >= 0)
-            //                        {
-            //                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
-            //                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-            //                        }
-            //                        GVL_SmallStation.GetInstance.DosingTray2 = true;
-            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
-            //                        MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，3号桶，{(int)loc}号仓，配料完成");
-            //                    }
-            //                }
-            //                else if (RTrig.GetInstance("DB3.DBX50.7").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.7")))
-            //                {
-            //                    var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD38");
-            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方：{recipeName}，4号桶，{res}料仓，允许配料");
-            //                    if (res > 0 && res is float loc)
-            //                    {
-            //                        int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-            //                        double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
-            //                        if (loc_index >= 0)
-            //                        {
-            //                            DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
-            //                            GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
-            //                        }
-            //                        GVL_SmallStation.GetInstance.DosingTray2 = true;
-            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
-            //                        MessageNotify.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，4号桶，{(int)loc}号仓，配料完成");
-            //                    }
-            //                }
-            //                if (GVL_SmallStation.GetInstance.DosingTray2 == true && GVL_SmallStation.GetInstance.DosingTray1 == false && GVL_SmallStation.GetInstance.DosingTray2Loc > 0 && GVL_SmallStation.GetInstance.DosingTray2Loc < 16)
-            //                {
-            //                    Thread.Sleep(GVL_SmallStation.GetInstance.Time);
-            //                    int i = GVL_SmallStation.GetInstance.DosingTray2Loc;
-            //                    if (RTrig.GetInstance("Tray2StatusDevice" + i).Start(DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3))
-            //                    {
-            //                        MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘2,配方：{recipeName},{i}号仓，配料完成");
-            //                        int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
-            //                        RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
-            //                        bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
-            //                        float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight);
-            //                        int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
-            //                        if (iIndex >= 0)
-            //                        {
-            //                            if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
-            //                            {
-            //                                HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
-            //                                App.Current.Dispatcher.Invoke(() =>
-            //                                {
-            //                                    MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
-            //                                    HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
-            //                                });
-            //                            }
-            //                        }
-            //                        if (info)
-            //                        {
-            //                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送成功");
-            //                        }
-            //                        else
-            //                        {
-            //                            MessageNotify.GetInstance.ShowRunLog($"柔性味魔方配料完成后复位 发送失败");
-            //                        }
-            //                        if (i >= 1 && i <= 8)
-            //                        {
-            //                            string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true, 4);
-            //                            MessageNotify.GetInstance.ShowRunLog(commInfo);
-            //                        }
-            //                        else if (i >= 9 && i <= 15)
-            //                        {
-            //                            string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true, 4);
-            //                            MessageNotify.GetInstance.ShowRunLog(commInfo1);
-            //                        }
-            //                        GVL_SmallStation.GetInstance.DosingTray2 = false;
-            //                        GVL_SmallStation.GetInstance.DosingTray2Loc = 0;
-            //                    }
-            //                }
-            //                if (RTrig.GetInstance("DB3.DBX1.2").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.2")))
-            //                {
-            //                    var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
-            //                    MessageNotify.GetInstance.ShowRunLog($"托盘2,配方{res.RecipeName},配料完成");
-            //                    RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
-            //                    RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
-            //                    for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
-            //                    {
-            //                        RecipeFinishInfo.Material[i] = new UDT1();
-            //                        RecipeFinishInfo.Material[i].Material_Name = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
-            //                        RecipeFinishInfo.Material[i].Material_BarrelNum = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
-            //                        RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight;
-            //                    }
-            //                    if (SiemensDevice.IsConnected)
-            //                    {
-            //                        RecipeFinishInfo.Ask_For_Finish = true;
-            //                        SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
-            //                    }
-            //                    App.Current.Dispatcher.Invoke(() =>
-            //                    {
-            //                        Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
-            //                    });
-            //                    RecipeQueueTray2.TryDequeue(out code);
-            //                    HKDevice.HK_PLC_S7.Write("DB3.DBX1.2", false);
-            //                    GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
-            //                }
-            //            }
-            //        }
-            //    }
-            //}
-            #endregion
         }
         private void StockBinInit()
         {
@@ -1541,37 +1217,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     }
                 }
             }), "SiemensRecipeRecive", true);
-            ActionManage.GetInstance.Register(new Action<object>((res) =>
-            {
-            //    if (SiemensDevice.IsConnected)
-            //    {
-            //        if (res != null && res is RemoteRecipeData recipe)
-            //        {
-            //            RecipeFinishInfo.Order_No = recipe.RecipeCode;
-            //            RecipeFinishInfo.Product_Code = recipe.RecipeName;
-            //            RecipeFinishInfo.Job_No = (short)recipe.TrayCode;
-            //            for (int i = 0; i < recipe.RawMaterial.Count; i++)
-            //            {
-            //                RecipeFinishInfo.Material[i] = new UDT1();
-            //                RecipeFinishInfo.Material[i].Material_Name = recipe.RawMaterial.ElementAt(i).RawMaterialName;
-            //                RecipeFinishInfo.Material[i].Material_BarrelNum = recipe.RawMaterial.ElementAt(i).RawMaterialBarrelNum;
-            //                RecipeFinishInfo.Material[i].Material_Laying_Off_Weight = recipe.RawMaterial.ElementAt(i).Laying_Off_Weight;
-            //            }
-            //            for (int i = 0; i < recipe.WindSend.Count; i++)
-            //            {
-            //                RecipeFinishInfo.Powder[i] = new UDT2();
-            //                RecipeFinishInfo.Powder[i].Powder_Name = recipe.RawMaterial.ElementAt(i).RawMaterialName;
-            //                RecipeFinishInfo.Powder[i].Powder_Weight = recipe.RawMaterial.ElementAt(i).Laying_Off_Weight;
-            //            }
-            //            if (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus == 6)
-            //            {
-            //                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 7;
-            //                RecipeFinishInfo.Ask_For_Finish = true;
-            //                SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
-            //            }
-            //        }
-            //    }
-            }), "SiemensRecipeFinish", true);
 
             //将本地配方发送到西门子配方里，执行配料
             ActionManage.GetInstance.Register(new Action<Object>((res) =>
@@ -1592,7 +1237,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             //流程控制
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.3", true); }), "ManualSystemReset", true);
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.4", true); }), "CLearRecipeInfo", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX0.7", true); }), "AGVPutTrayFinish", true);
             ActionManage.GetInstance.Register(new Action(() =>
             {
                 Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
@@ -1602,13 +1246,17 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
                 GVL_SmallStation.GetInstance.OrderCancelStep = 0;
 
-                RecipeQueueTray1.Clear();
-                RecipeQueueTray2.Clear();
-                GVL_SmallStation.GetInstance.RecipeStatusIDTray1 = 0;
-                GVL_SmallStation.GetInstance.RecipeStatusIDTray2 = 0;
-                GVL_SmallStation.GetInstance.Tray1LogicFinish = 0;
-                GVL_SmallStation.GetInstance.Tray2LogicFinish = 0;
-                StockBinInit(); 
+                for (int i = 0; i < 5; i++)
+                {
+                    RecipeQueueTray[i].Clear();
+                    GVL_SmallStation.GetInstance.RecipeProcessStatus[i] = 0;
+                    GVL_SmallStation.GetInstance.Tray_AGVLogic[i] = 0;
+                }
+                StockBinInit();
+                //for (int i = 0; i < GVL_SmallStation.GetInstance.StockInDosingComple.Length; i++)
+                //{
+                //    GVL_SmallStation.GetInstance.StockInDosingComple[i] = false;
+                //}
                 MessageNotify.GetInstance.ShowRunLog("系统流程复位，等待西门子重新下发订单");
             }), "BPASystemReset", true);
 
@@ -1701,7 +1349,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             {
                 if (o != null && o is short Value)
                 {
-                    HKDevice.HK_PLC_S7.Write("DB4.DBB102", (byte)Value);
+                    HKDevice.HK_PLC_S7.Write("DB4.DBB1", (byte)Value);
                 }
             }), "RobotSetProgramNum", true);
             
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceAddress.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceAddress.cs
index 80fbd5c2..81e4e381 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceAddress.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceAddress.cs
@@ -94,6 +94,11 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public static string LowerLimitWeightOfSilo { get; set; } = "LW35";
 
+        /// <summary>
+        /// 配料信号反馈
+        /// </summary>
+        public static string DosingStatusFeedback { get; set; } = "LW62";
+
         /// <summary>
         /// 搅拌速度
         /// </summary>
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
index 22963a6b..8a093b5d 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
@@ -57,7 +57,12 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     {
                         devices.ElementAt(deviceIndex).DeviceName = DeviceLists.ElementAt(i).Value.DeviceName;
                     }
+                    if (!ThreadManage.GetInstance().IsContainsKey($"{deviceName} 开始监听")) 
+                    {
+                        DeviceLists[DeviceLists.ElementAt(i).Key].Init(deviceName);
+                    }
                 }
+                
                 Thread.Sleep(200);
             }), "设备状态监听",true);
         }
@@ -234,14 +239,29 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         }
                         else
                         {
-                            if (!InvalidIP.Contains(ip)) InvalidIP.Add(ip);
+                            //if (!InvalidIP.Contains(ip)) InvalidIP.Add(ip);
+
+                            if (DeviceLists.ContainsKey(ip))
+                            {
+                                DeviceLists[ip].Dispose();
+                                var res11 = DeviceLists[ip];
+                                DeviceLists.TryRemove(ip, out res11);
+                            }
                         }
                     });
 
                     DS.modbusTcp.ConnectFail = new Action(() =>
                     {
-                        if (!InvalidIP.Contains(ip)) InvalidIP.Add(ip);
+                        //if (!InvalidIP.Contains(ip)) InvalidIP.Add(ip);
                         //MessageLog.GetInstance.ShowAlarmLog($"设备{ip}连接失败");
+
+
+                        if (DeviceLists.ContainsKey(ip))
+                        {
+                            DeviceLists[ip].Dispose();
+                            var res11 = DeviceLists[ip];
+                            DeviceLists.TryRemove(ip, out res11);
+                        }
                     });
 
                     DS.modbusTcp.Disconnect = new Action(() =>
@@ -277,7 +297,10 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         IPQueues.Enqueue(e.Reply.Address.ToString());
                     }));
                 }
-                else IPQueues.Enqueue(e.Reply.Address.ToString());
+                else
+                {
+                    IPQueues.Enqueue(e.Reply.Address.ToString());
+                }
             }
             else
             {
@@ -317,23 +340,40 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 if (s != null) MessageNotify.GetInstance.ShowRunLog(s);
             });
             this.DeviceName = DeviceName;
-            AlarmHelper<AlarmInfo>.Init();
+            //AlarmHelper<AlarmInfo>.Init();
             if (modbusTcp.Connected)
             {
                 ThreadManage.GetInstance().StartLong(new Action(() =>
                 {
-                    deviceStatus.RunStatus = (ushort)this.modbusTcp.ReadShort(DeviceAddress.RunStatus); //获取设备运行状态
-                    deviceStatus.WeightFeedback = this.modbusTcp.ReadShort(DeviceAddress.WeightFeedback);//获取设备料仓剩余重量
-                    deviceStatus.NowWeightFeedback = this.modbusTcp.GetReal(DeviceAddress.CutWeightFeedback);//获取下料重量
-                    deviceStatus.DeviceNum = (ushort)this.modbusTcp.ReadShort(DeviceAddress.DeviceNum);//获取设备编号
-                    deviceStatus.DeviceAlarmCode = (ushort)this.modbusTcp.ReadShort(DeviceAddress.DeviceAlarmCode);//获取设备故障编码
-                    AlarmHelper<AlarmInfo>.GetInstance(DeviceName).EStop1 = deviceStatus.DeviceAlarmCode.Get16bitValue(1);
-                    AlarmHelper<AlarmInfo>.GetInstance(DeviceName).Servo = deviceStatus.DeviceAlarmCode.Get16bitValue(2);
-                    AlarmHelper<AlarmInfo>.GetInstance(DeviceName).Inverter = deviceStatus.DeviceAlarmCode.Get16bitValue(3);
-                    AlarmHelper<AlarmInfo>.GetInstance(DeviceName).EStop2 = deviceStatus.DeviceAlarmCode.Get16bitValue(7);
-                    AlarmHelper<AlarmInfo>.GetInstance(DeviceName).SiloUpperLimit = deviceStatus.DeviceAlarmCode.Get16bitValue(8);
-                    AlarmHelper<AlarmInfo>.GetInstance(DeviceName).SiloLowerLimit = deviceStatus.DeviceAlarmCode.Get16bitValue(9);
-                    Thread.Sleep(10);
+                    if (modbusTcp.Connected)
+                    {
+                        deviceStatus.RunStatus = (ushort)this.modbusTcp.ReadShort(DeviceAddress.RunStatus); //获取设备运行状态
+                        deviceStatus.WeightFeedback = this.modbusTcp.ReadShort(DeviceAddress.WeightFeedback);//获取设备料仓剩余重量
+                        deviceStatus.NowWeightFeedback = this.modbusTcp.GetReal(DeviceAddress.CutWeightFeedback);//获取下料重量
+                        deviceStatus.DeviceNum = (ushort)this.modbusTcp.ReadShort(DeviceAddress.DeviceNum);//获取设备编号
+                        deviceStatus.DeviceAlarmCode = (ushort)this.modbusTcp.ReadShort(DeviceAddress.DeviceAlarmCode);//获取设备故障编码
+                        AlarmHelper<AlarmInfo>.GetInstance(DeviceName).EStop1 = deviceStatus.DeviceAlarmCode.Get16bitValue(1);
+                        AlarmHelper<AlarmInfo>.GetInstance(DeviceName).Servo = deviceStatus.DeviceAlarmCode.Get16bitValue(2);
+                        AlarmHelper<AlarmInfo>.GetInstance(DeviceName).Inverter = deviceStatus.DeviceAlarmCode.Get16bitValue(3);
+                        AlarmHelper<AlarmInfo>.GetInstance(DeviceName).EStop2 = deviceStatus.DeviceAlarmCode.Get16bitValue(7);
+                        AlarmHelper<AlarmInfo>.GetInstance(DeviceName).SiloUpperLimit = deviceStatus.DeviceAlarmCode.Get16bitValue(8);
+                        AlarmHelper<AlarmInfo>.GetInstance(DeviceName).SiloLowerLimit = deviceStatus.DeviceAlarmCode.Get16bitValue(9);
+                        //允许配料即产线气缸抬起，发送给味魔方
+                        if (deviceStatus.DeviceNum >= 1 && deviceStatus.DeviceNum <= 15)
+                        {
+                            if (GVL_SmallStation.GetInstance.plcReadDataDB3.StockBinAllowIssue[deviceStatus.DeviceNum-1])
+                            {
+                                this.modbusTcp.Write("LW41", (ushort)1);
+                                GVL_SmallStation.GetInstance.StockBinCylinderStatus.SetBitValue((byte)(deviceStatus.DeviceNum), true);
+                            }
+                            else
+                            {
+                                this.modbusTcp.Write("LW41", (ushort)0);
+                                GVL_SmallStation.GetInstance.StockBinCylinderStatus.SetBitValue((byte)(deviceStatus.DeviceNum), false);
+                            }
+                        }
+                        Thread.Sleep(10);
+                    }
                 }), $"{DeviceName} 开始监听", true);
             }
         }
@@ -397,9 +437,14 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     modbusTcp.SetUint(DeviceAddress.StirringSpeed, num);
                     MessageNotify.GetInstance.ShowRunLog($"{res.MaterialName},参数下发完成");
                 }
+                int Count = 0;
+            Start:
+                Count++;
                 modbusTcp.SetReal(DeviceAddress.WeightSet, Value);//写入原料重量
                 modbusTcp.Write(DeviceAddress.Start, (ushort)1);//设备启动写入
-                MessageNotify.GetInstance.ShowRunLog($"{DeviceName},设置重量：{Value}，柔性味魔方开始配料");
+                MessageNotify.GetInstance.ShowRunLog($"{DeviceName},设置重量：{Value}，下发次数{Count}，柔性味魔方开始配料");
+                Thread.Sleep(200);
+                if (this.modbusTcp.ReadShort(DeviceAddress.DosingStatusFeedback) == (short)0 && Count <=10) goto Start;
             }
         }
     }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeRawMaterial.cs b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeRawMaterial.cs
index b4f197b5..cf39f5f0 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeRawMaterial.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeRawMaterial.cs
@@ -47,5 +47,8 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public int RawMaterialLocation { get { return _mRawMaterialLocation; } set { _mRawMaterialLocation = value;OnPropertyChanged(); } }
         private int _mRawMaterialLocation;
+
+        public bool IsDosingComple { get { return _mIsDosingComple; } set { _mIsDosingComple = value; OnPropertyChanged(); } }
+        private bool _mIsDosingComple;
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs
index 5c2c6cea..86be7f46 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/SiemensDeviceStatus.cs
@@ -37,9 +37,13 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.Siemens
                                     this.Siemens_PLC_S7.Write("DB2201.DBX450.0", true);
                                     GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 1;
                                 }
+                                else
+                                {
+                                    this.Siemens_PLC_S7.Write("DB2201.DBX450.0", false);
+                                }
                                 break;
                             case 1:
-                                if (Start.Order_Request_ACK)
+                                if (st.Order_Request_ACK)
                                 {
                                     if (!string.IsNullOrEmpty(st.RecipeCode))
                                     {
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
index 45257ee7..5622c4c9 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
@@ -22,6 +22,7 @@
         <Grid>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center">
                 <Button
+                    Name="test1"
                     Width="200"
                     Height="40"
                     Margin="5"
@@ -29,8 +30,10 @@
                     Content="AGV送托盘完成"
                     FontSize="20"
                     Panel.ZIndex="0"
+                    Visibility="{Binding VisibilityBtn1}"
                     Style="{StaticResource ImageButtonStyle}"></Button>
                 <Button
+                    Name="test2"
                     Width="200"
                     Height="40"
                     Margin="5"
@@ -38,8 +41,10 @@
                     Content="粉料仓配料完成"
                     FontSize="20"
                     Panel.ZIndex="0"
+                    Visibility="{Binding VisibilityBtn2}"
                     Style="{StaticResource ImageButtonStyle}"></Button>
                 <Button
+                    Name="test3"
                     Width="200"
                     Height="40"
                     Margin="5"
@@ -47,16 +52,15 @@
                     Content="AGV取托盘完成"
                     FontSize="20"
                     Panel.ZIndex="0"
+                    Visibility="{Binding VisibilityBtn3}"
                     Style="{StaticResource ImageButtonStyle}"></Button>
-                <Button
-                    Width="200"
-                    Height="40"
-                    Margin="5"
-                    Command="{Binding Test4Command}"
-                    Content="气缸收紧错位复位"
-                    FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                <TextBlock
+                    Width="100" 
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="#FF2AB2E7"
+                    FontSize="25"
+                    Margin="10"></TextBlock>
                 <Button
                     Width="200"
                     Height="40"
@@ -66,15 +70,6 @@
                     FontSize="20"
                     Panel.ZIndex="0"
                     Style="{StaticResource ImageButtonStyle}"></Button>
-                <Button
-                    Width="200"
-                    Height="40"
-                    Margin="5"
-                    Command="{Binding Test6Command}"
-                    Content="AGV放货架流程完成"
-                    FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
                 <Button
                     Width="200"
                     Height="40"
@@ -140,10 +135,8 @@
                 <WrapPanel Grid.Row="2">
                     <TextBlock Text="当前下发配方状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
                     <TextBlock Text="{Binding OrderStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
-                    <TextBlock Text="当前配料状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding OrderDosingStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
                 </WrapPanel>
-                <WrapPanel Grid.Row="4">
+                <WrapPanel Grid.Row="0" Grid.Column="2">
                     <TextBlock Text="柔性味魔方配料完成，延迟复位时间：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
                     <TextBox Text="{Binding time}" Width="150"  HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBox>
                     <TextBlock Text="ms" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
@@ -157,10 +150,87 @@
                         Panel.ZIndex="0"
                         Style="{StaticResource ImageButtonStyle}"></Button>
                 </WrapPanel>
-
-                <WrapPanel Grid.Column="1" Grid.Row="2">
+                <WrapPanel Grid.Column="0" Grid.Row="3" Grid.RowSpan="2">
+                    <TextBlock Text="当前配料状态：" Width="200" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <WrapPanel>
+                        <TextBlock Text="配方1：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                        <TextBlock Text="{Binding Recipe1DosingStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock Text="配方2：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                        <TextBlock Text="{Binding Recipe2DosingStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock Text="配方3：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                        <TextBlock Text="{Binding Recipe3DosingStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock Text="配方4：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                        <TextBlock Text="{Binding Recipe4DosingStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock Text="配方5：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                        <TextBlock Text="{Binding Recipe5DosingStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    </WrapPanel>
+                </WrapPanel>
+                <WrapPanel Grid.Column="1" Grid.Row="3" Grid.RowSpan="2">
                     <TextBlock Text="配料情况：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding DosingComplete}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <WrapPanel>
+                        <TextBlock Text="配方1：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                        <TextBlock Text="{Binding Recipe1DosingComplete}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock Text="配方2：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                        <TextBlock Text="{Binding Recipe2DosingComplete}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock Text="配方3：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                        <TextBlock Text="{Binding Recipe3DosingComplete}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock Text="配方4：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                        <TextBlock Text="{Binding Recipe4DosingComplete}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock Text="配方5：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                        <TextBlock Text="{Binding Recipe5DosingComplete}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    </WrapPanel>
+                </WrapPanel>
+                <WrapPanel  Grid.Row="1" Grid.Column="2">
+                    <!--<ComboBox
+                        x:Name="cmbList"
+                        Width="70"
+                        VerticalAlignment="Center"
+                        BorderBrush="#FF074B92"
+                        BorderThickness="1"
+                        FontFamily="楷体"
+                        FontSize="14"
+                        Foreground="LightGray"
+                        IsEditable="False"
+                        MouseLeave="ComboBox_MouseLeave"
+                        Style="{StaticResource ComboBoxStyle}"
+                        Text="{Binding RawMaterialName}"/>-->
+                    <TextBlock Text="料仓号:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                    <TextBox Width="50" Text="{Binding StockbinDosingCompleNum}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBox>
+                    <Button
+                        Width="200"
+                        Height="40"
+                        Margin="5,0,5,0"
+                        Command="{Binding StockbinDosingComple}"
+                        Content="小料料仓配料完成"
+                        FontSize="20"
+                        Panel.ZIndex="0"
+                        Style="{StaticResource ImageButtonStyle}"></Button>
+                    <Button
+                        HorizontalAlignment="Right"
+                        Width="400"
+                        Height="40"
+                        Margin="10"
+                        Command="{Binding StockbinDosingCompleClear}"
+                        Content="清除所有小料料仓配料完成信号"
+                        FontSize="20"
+                        Panel.ZIndex="0"
+                        Style="{StaticResource ImageButtonStyle}"></Button>
                 </WrapPanel>
             </Grid>
         </Grid>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml.cs
index 3ea0ccf0..2e844f3a 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.JXJFoodSmallStation.Model;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -24,10 +25,5 @@ namespace BPASmartClient.JXJFoodSmallStation.View
         {
             InitializeComponent();
         }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-
-        }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml b/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
index 767e68be..58899358 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
@@ -21,8 +21,8 @@
                     <ColumnDefinition Width="8*"></ColumnDefinition>
                     <ColumnDefinition Width="4*"></ColumnDefinition>
                     <ColumnDefinition Width="4*"></ColumnDefinition>
-                    <ColumnDefinition Width="10*"></ColumnDefinition>
-                    <ColumnDefinition Width="3*"></ColumnDefinition>
+                    <ColumnDefinition Width="8*"></ColumnDefinition>
+                    <ColumnDefinition Width="5*"></ColumnDefinition>
                     <ColumnDefinition Width="17"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
                 <Grid>
@@ -61,8 +61,8 @@
                                         <ColumnDefinition Width="8*"></ColumnDefinition>
                                         <ColumnDefinition Width="4*"></ColumnDefinition>
                                         <ColumnDefinition Width="4*"></ColumnDefinition>
-                                        <ColumnDefinition Width="10*"></ColumnDefinition>
-                                        <ColumnDefinition Width="3*"></ColumnDefinition>
+                                        <ColumnDefinition Width="8*"></ColumnDefinition>
+                                        <ColumnDefinition Width="5*"></ColumnDefinition>
                                     </Grid.ColumnDefinitions>
                                     <Grid>
                                         <TextBlock Text="{Binding Count}" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml
index b671f871..d1b37827 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml
@@ -21,8 +21,8 @@
                     <ColumnDefinition Width="2*"></ColumnDefinition>
                     <ColumnDefinition Width="4*"></ColumnDefinition>
                     <ColumnDefinition Width="4*"></ColumnDefinition>
-                    <ColumnDefinition Width="14*"></ColumnDefinition>
-                    <ColumnDefinition Width="4*"></ColumnDefinition>
+                    <ColumnDefinition Width="12*"></ColumnDefinition>
+                    <ColumnDefinition Width="6*"></ColumnDefinition>
                     <ColumnDefinition Width="17"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
                 <Grid>
@@ -56,8 +56,8 @@
                                         <ColumnDefinition Width="2*"></ColumnDefinition>
                                         <ColumnDefinition Width="4*"></ColumnDefinition>
                                         <ColumnDefinition Width="4*"></ColumnDefinition>
-                                        <ColumnDefinition Width="14*"></ColumnDefinition>
-                                        <ColumnDefinition Width="4*"></ColumnDefinition>
+                                        <ColumnDefinition Width="12*"></ColumnDefinition>
+                                        <ColumnDefinition Width="6*"></ColumnDefinition>
                                     </Grid.ColumnDefinitions>
                                     <Grid>
                                         <TextBlock  Margin="5" Text="{Binding Count}" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
index d670c417..e434f984 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
@@ -49,18 +49,10 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-            <CheckBox
-                x:Name="AskRecipeFormSiemens"
-                Margin="0,0,10,0"
-                Content="向西门子请求订单"
-                FontFamily="楷体"
-                VerticalAlignment="Center"
-                Foreground="Aqua"
-                IsChecked="{Binding AskRecipeFormSiemens}" />
             <CheckBox
                 x:Name="NotUseSmallDosing"
                 Margin="0,0,10,0"
-                Content="不使用小料仓配料"
+                Content="不使用小料站配料"
                 FontFamily="楷体"
                 VerticalAlignment="Center"
                 Foreground="Aqua"
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml.cs
index 8e820597..9c42c922 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml.cs
@@ -25,10 +25,10 @@ namespace BPASmartClient.JXJFoodSmallStation.View
         public RecipeReceiveView()
         {
             InitializeComponent();
-            this.AskRecipeFormSiemens.Click += (o, e) => { GVL_SmallStation.GetInstance.RequestOrder = (bool)AskRecipeFormSiemens.IsChecked; };
             this.IsUseWindSend.Click += (o, e) => { GVL_SmallStation.GetInstance.IsUseWindSend = (bool)IsUseWindSend.IsChecked; };
             this.IsUseStockBin.Click += (o, e) => { GVL_SmallStation.GetInstance.IsUseLocalRecipe = (bool)IsUseStockBin.IsChecked; };
-            this.NotUseSmallDosing.Click += (o, e) => { GVL_SmallStation.GetInstance.NotUseSmallDosing = (bool)NotUseSmallDosing.IsChecked; };
+            this.NotUseSmallDosing.Click += (o, e) => { GVL_SmallStation.GetInstance.NotUseSmallStation = (bool)NotUseSmallDosing.IsChecked; };
+            
         }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
index 3f88eec8..ce2708f4 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
@@ -82,6 +82,10 @@
                     <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsHomed}"></TextBlock>
                 </WrapPanel>
                 <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人运行的程序号："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding IsRunProgramNum}"></TextBlock>
+                </WrapPanel>
+                <!--<WrapPanel>
                     <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="抓空桶完成："></TextBlock>
                     <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotGetEmptyBarrelComplete}"></TextBlock>
                 </WrapPanel>
@@ -96,7 +100,7 @@
                 <WrapPanel>
                     <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="放满桶完成："></TextBlock>
                     <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotPutFullBarrelComplete}"></TextBlock>
-                </WrapPanel>
+                </WrapPanel>-->
             </StackPanel>
         </Grid>
         <Grid Grid.Column="1">
@@ -134,7 +138,7 @@
                     Background="DodgerBlue"></Button>
             </Grid>
         </Grid>
-        <Grid Grid.Column="2">
+        <!--<Grid Grid.Column="2">
             <Grid.RowDefinitions>
                 <RowDefinition></RowDefinition>
                 <RowDefinition></RowDefinition>
@@ -186,7 +190,7 @@
                     FontSize="32"
                     Style="{StaticResource ImageButtonStyle}"></Button>
             </Grid>
-            <!--<ListView
+            --><!--<ListView
                 Grid.Row="1"
                 Background="Transparent"
                 BorderBrush="#00BEFA"
@@ -260,7 +264,7 @@
                         </Grid>
                     </DataTemplate>
                 </ListView.ItemTemplate>
-            </ListView>-->
+            </ListView>--><!--
             <Grid Grid.Row="1" Visibility="Hidden">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition></ColumnDefinition>
@@ -299,6 +303,6 @@
                         Style="{StaticResource ImageButtonStyle}"></Button>
                 </Grid>
             </Grid>
-        </Grid>
+        </Grid>-->
     </Grid>
 </UserControl>
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
index 596292e7..c2280e39 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
@@ -17,6 +17,7 @@ using System.Threading;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using BPASmartClient.CustomResource.Pages.Model;
+using System.Windows;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -27,23 +28,41 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             time = GVL_SmallStation.GetInstance.Time;
             Test1Command = new RelayCommand(() =>
             {
-                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX0.7", PlcVarType = PlcVarType.Bool, Value = true });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX8.0", PlcVarType = PlcVarType.Bool, Value = true });
+                Thread.Sleep(200);
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX8.0", PlcVarType = PlcVarType.Bool, Value = false });
                 //GVL_SmallStation.GetInstance.AGV_PutTray1Finish = true;
-                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV送托盘完成"); 
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV送托盘完成");
+
+                VisibilityBtn1 = Visibility.Hidden;
+                VisibilityBtn2 = Visibility.Visible;
+                VisibilityBtn3 = Visibility.Hidden;
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV送托盘完成");
             });
             Test2Command = new RelayCommand(() =>
             {
-                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX1.7", PlcVarType = PlcVarType.Bool, Value = true });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX4.0", PlcVarType = PlcVarType.Bool, Value = true });
+                //Thread.Sleep(200);
+                //ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX4.0", PlcVarType = PlcVarType.Bool, Value = false });
                 //GVL_SmallStation.GetInstance.WindSendDosingComple = true;
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，粉料仓配料完成");
+
+                VisibilityBtn1 = Visibility.Hidden;
+                VisibilityBtn2 = Visibility.Hidden;
+                VisibilityBtn3 = Visibility.Visible;
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，粉料仓配料完成");
             });
             Test3Command = new RelayCommand(() =>
             {
-                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX1.1", PlcVarType = PlcVarType.Bool, Value = true });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX10.0", PlcVarType = PlcVarType.Bool, Value = true });
+                Thread.Sleep(200);
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX10.0", PlcVarType = PlcVarType.Bool, Value = false });
                 //GVL_SmallStation.GetInstance.AGV_GetTray1Finish = true;
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV取托盘完成");
+
+                VisibilityBtn1 = Visibility.Visible;
+                VisibilityBtn2 = Visibility.Hidden;
+                VisibilityBtn3 = Visibility.Hidden;
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV取托盘完成");
             });
             Test4Command = new RelayCommand(() =>
@@ -65,22 +84,76 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             });
             CLearRecipeInfo = new RelayCommand(() => 
             {
-                ActionManage.GetInstance.Send("CLearRecipeInfo");
-                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，配方清零");
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    if (MessageNotify.GetInstance.ShowDialog("请确认，是否进行【PLC配方清零】操作"))
+                    {
+                        ActionManage.GetInstance.Send("CLearRecipeInfo");
+                        MessageNotify.GetInstance.ShowUserLog("手动点击按钮，PLC配方清零");
+                    }
+                });
             });
             SystemReset = new RelayCommand(() =>
             {
-                ActionManage.GetInstance.Send("ManualSystemReset");
-                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，PLC系统复位");
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    if (MessageNotify.GetInstance.ShowDialog("请确认，是否进行【PLC系统复位】操作"))
+                    {
+                        ActionManage.GetInstance.Send("ManualSystemReset");
+                        MessageNotify.GetInstance.ShowUserLog("手动点击按钮，PLC系统复位");
+                    }
+                });
             });
             BPAResetCommand = new RelayCommand(() =>
             {
-                ActionManage.GetInstance.Send("BPASystemReset");
-                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，上位机初始化");
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    if (MessageNotify.GetInstance.ShowDialog("请确认，是否进行【上位机初始化】操作"))
+                    {
+                        ActionManage.GetInstance.Send("BPASystemReset");
+                        MessageNotify.GetInstance.ShowUserLog("手动点击按钮，上位机初始化");
+                    }
+                });
+            });
+            StockbinDosingComple = new RelayCommand(() =>
+            {
+                int loc = StockbinDosingCompleNum;
+                if (loc >= 1 && loc <= 8)
+                {
+                    ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX12." + (loc - 1), PlcVarType = PlcVarType.Bool, Value = true });
+
+                    MessageNotify.GetInstance.ShowUserLog($"手动点击按钮，给plc料仓{loc}配料完成信号");
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，手动设置料仓{loc}配料完成");
+                }
+                else if (loc >= 9 && loc <= 15)
+                {
+                    ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX13." + (loc - 9), PlcVarType = PlcVarType.Bool, Value = true });
+
+                    MessageNotify.GetInstance.ShowUserLog($"手动点击按钮，给plc料仓{loc}配料完成信号");
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，手动设置料仓{loc}配料完成");
+                }
+                else 
+                {
+                    MessageNotify.GetInstance.ShowUserLog("料仓编号不正确");
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，手动设置料仓{loc}配料，料仓编号不正确");
+                }
+            });
+            StockbinDosingCompleClear = new RelayCommand(() =>
+            {
+                //for (int i = 0; i < GVL_SmallStation.GetInstance.StockInDosingComple.Length; i++) 
+                //{
+                //    GVL_SmallStation.GetInstance.StockInDosingComple[i] = false;
+                //}
+                //MessageNotify.GetInstance.ShowUserLog($"手动点击按钮，清除所有手动配料完成信号");
+                //NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"清除所有手动配料完成信号");
             });
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                DosingComplete = GVL_SmallStation.GetInstance.StockBinDosing.ToBinString();
+                Recipe1DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[0].ToBinString();
+                Recipe2DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[1].ToBinString();
+                Recipe3DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[2].ToBinString();
+                Recipe4DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[3].ToBinString();
+                Recipe5DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[4].ToBinString();
                 Heartbeat = GVL_SmallStation.GetInstance.HeartBeatFromPlc;
                 switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus) 
                 {
@@ -109,16 +182,72 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                         OrderStatus = "无意义";
                         break;
                 }
-                switch (GVL_SmallStation.GetInstance.RecipeStatusIDTray1)
+                switch (GVL_SmallStation.GetInstance.RecipeProcessStatus[0])
                 {
                     case 0:
-                        OrderDosingStatus = ProcessCondition.等待AGV到位.ToString();
+                        Recipe1DosingStatus = ProcessCondition.等待AGV到位.ToString();
                         break;
                     case 1:
-                        OrderDosingStatus = ProcessCondition.等待小料站PLC接受配方完成.ToString();
+                        Recipe1DosingStatus = ProcessCondition.等待小料站PLC接受配方完成.ToString();
                         break;
                     case 2:
-                        OrderDosingStatus = ProcessCondition.等待配方配料完成.ToString();
+                        Recipe1DosingStatus = ProcessCondition.等待配方配料完成.ToString();
+                        break;
+                    default:
+                        break;
+                }
+                switch (GVL_SmallStation.GetInstance.RecipeProcessStatus[1])
+                {
+                    case 0:
+                        Recipe2DosingStatus = ProcessCondition.等待AGV到位.ToString();
+                        break;
+                    case 1:
+                        Recipe2DosingStatus = ProcessCondition.等待小料站PLC接受配方完成.ToString();
+                        break;
+                    case 2:
+                        Recipe2DosingStatus = ProcessCondition.等待配方配料完成.ToString();
+                        break;
+                    default:
+                        break;
+                }
+                switch (GVL_SmallStation.GetInstance.RecipeProcessStatus[2])
+                {
+                    case 0:
+                        Recipe3DosingStatus = ProcessCondition.等待AGV到位.ToString();
+                        break;
+                    case 1:
+                        Recipe3DosingStatus = ProcessCondition.等待小料站PLC接受配方完成.ToString();
+                        break;
+                    case 2:
+                        Recipe3DosingStatus = ProcessCondition.等待配方配料完成.ToString();
+                        break;
+                    default:
+                        break;
+                }
+                switch (GVL_SmallStation.GetInstance.RecipeProcessStatus[3])
+                {
+                    case 0:
+                        Recipe4DosingStatus = ProcessCondition.等待AGV到位.ToString();
+                        break;
+                    case 1:
+                        Recipe4DosingStatus = ProcessCondition.等待小料站PLC接受配方完成.ToString();
+                        break;
+                    case 2:
+                        Recipe4DosingStatus = ProcessCondition.等待配方配料完成.ToString();
+                        break;
+                    default:
+                        break;
+                }
+                switch (GVL_SmallStation.GetInstance.RecipeProcessStatus[4])
+                {
+                    case 0:
+                        Recipe5DosingStatus = ProcessCondition.等待AGV到位.ToString();
+                        break;
+                    case 1:
+                        Recipe5DosingStatus = ProcessCondition.等待小料站PLC接受配方完成.ToString();
+                        break;
+                    case 2:
+                        Recipe5DosingStatus = ProcessCondition.等待配方配料完成.ToString();
                         break;
                     default:
                         break;
@@ -149,8 +278,18 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         private int _mtime;
         public static string OrderStatus { get { return _mOrderStatus; } set { _mOrderStatus = value; OnStaticPropertyChanged(); } }
         private static string _mOrderStatus = "无意义";
-        public static string OrderDosingStatus { get { return _mOrderDosingStatus; } set { _mOrderDosingStatus = value; OnStaticPropertyChanged(); } }
-        private static string _mOrderDosingStatus = "无意义";
+        public static string Recipe1DosingStatus { get { return _mRecipe1DosingStatus; } set { _mRecipe1DosingStatus = value; OnStaticPropertyChanged(); } }
+        private static string _mRecipe1DosingStatus = "无意义";
+        public static string Recipe2DosingStatus { get { return _mRecipe2DosingStatus; } set { _mRecipe2DosingStatus = value; OnStaticPropertyChanged(); } }
+        private static string _mRecipe2DosingStatus = "无意义";
+        public static string Recipe3DosingStatus { get { return _mRecipe3DosingStatus; } set { _mRecipe3DosingStatus = value; OnStaticPropertyChanged(); } }
+        private static string _mRecipe3DosingStatus = "无意义";
+        public static string Recipe4DosingStatus { get { return _mRecipe4DosingStatus; } set { _mRecipe4DosingStatus = value; OnStaticPropertyChanged(); } }
+        private static string _mRecipe4DosingStatus = "无意义";
+        public static string Recipe5DosingStatus { get { return _mRecipe5DosingStatus; } set { _mRecipe5DosingStatus = value; OnStaticPropertyChanged(); } }
+        private static string _mRecipe5DosingStatus = "无意义";
+
+
         public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
         public static void OnStaticPropertyChanged([CallerMemberName] string PropName = "")
         {
@@ -166,7 +305,32 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         private bool _WindSendIsConnect { get; set; }
         public bool WindSendIsConnect { get { return _WindSendIsConnect; } set { _WindSendIsConnect = value; OnPropertyChanged(); } }
 
-        private static string _DosingComplete { get; set; }
-        public static string DosingComplete { get { return _DosingComplete; } set { _DosingComplete = value; OnStaticPropertyChanged(); } }
+
+        private static string _Recipe1DosingComplete { get; set; }
+        public static string Recipe1DosingComplete { get { return _Recipe1DosingComplete; } set { _Recipe1DosingComplete = value; OnStaticPropertyChanged(); } }
+
+        private static string _Recipe2DosingComplete { get; set; }
+        public static string Recipe2DosingComplete { get { return _Recipe2DosingComplete; } set { _Recipe2DosingComplete = value; OnStaticPropertyChanged(); } }
+
+        private static string _Recipe3DosingComplete { get; set; }
+        public static string Recipe3DosingComplete { get { return _Recipe3DosingComplete; } set { _Recipe3DosingComplete = value; OnStaticPropertyChanged(); } }
+        private static string _Recipe4DosingComplete { get; set; }
+        public static string Recipe4DosingComplete { get { return _Recipe4DosingComplete; } set { _Recipe4DosingComplete = value; OnStaticPropertyChanged(); } }
+        private static string _Recipe5DosingComplete { get; set; }
+        public static string Recipe5DosingComplete { get { return _Recipe5DosingComplete; } set { _Recipe5DosingComplete = value; OnStaticPropertyChanged(); } }
+
+
+        public RelayCommand StockbinDosingComple { get; set; }
+        public RelayCommand StockbinDosingCompleClear { get; set; }
+        private static int _StockbinDosingCompleNum { get; set; }
+        public static int StockbinDosingCompleNum { get { return _StockbinDosingCompleNum; } set { _StockbinDosingCompleNum = value; OnStaticPropertyChanged(); } }
+
+
+        public static Visibility VisibilityBtn1 { get { return _VisibilityBtn1; } set { _VisibilityBtn1 = value; OnStaticPropertyChanged(); } }
+        private static Visibility _VisibilityBtn1 = Visibility.Visible;
+        public static Visibility VisibilityBtn2 { get { return _VisibilityBtn2; } set { _VisibilityBtn2 = value; OnStaticPropertyChanged(); } }
+        private static Visibility _VisibilityBtn2 = Visibility.Hidden;
+        public static Visibility VisibilityBtn3 { get { return _VisibilityBtn3; } set { _VisibilityBtn3 = value; OnStaticPropertyChanged(); } }
+        private static Visibility _VisibilityBtn3 = Visibility.Hidden;
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
index d330e421..04c7f34e 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
@@ -27,8 +27,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         //ObservableCollection<RemoteRecipeRawMaterial> RawMaterials { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>();
         public RecipeReceiveViewModel()
         {
-            AskRecipeFormSiemens = GVL_SmallStation.GetInstance.RequestOrder;
-            NotUseSmallDosing = GVL_SmallStation.GetInstance.NotUseSmallDosing;
+            NotUseSmallDosing = GVL_SmallStation.GetInstance.NotUseSmallStation;
             IsUseLocalRecipe = GVL_SmallStation.GetInstance.IsUseLocalRecipe;
             IsUseWindSendDosing = GVL_SmallStation.GetInstance.IsUseWindSend;
             Recipes = Json<LocalRecipeDataColl>.Data.Recipes;
@@ -148,23 +147,17 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             {
                 Json<LocalRecipeDataColl>.Data.Recipes.Clear();
             });
-        } 
-        public bool IsUseLocalRecipe { get { return _mIsUseLocalRecipe; }set { _mIsUseLocalRecipe = value; OnPropertyChanged(); } }
-        private bool _mIsUseLocalRecipe ;
-
+        }
 
         public bool NotUseSmallDosing { get { return _mNotUseSmallDosing; } set { _mNotUseSmallDosing = value; OnPropertyChanged(); } }
         private bool _mNotUseSmallDosing;
 
-        
+        public bool IsUseLocalRecipe { get { return _mIsUseLocalRecipe; }set { _mIsUseLocalRecipe = value; OnPropertyChanged(); } }
+        private bool _mIsUseLocalRecipe ;
+
         public bool IsUseWindSendDosing { get { return _mIsUseWindSendDosing; } set { _mIsUseWindSendDosing = value;OnPropertyChanged(); } }
         private bool _mIsUseWindSendDosing ;
 
-
-        public bool AskRecipeFormSiemens { get { return _mAskRecipeFormSiemens; } set { _mAskRecipeFormSiemens = value; OnPropertyChanged(); } }
-        private bool _mAskRecipeFormSiemens;
-
-
         public RelayCommand<object> DetailsCommand { get; set; }
         public RelayCommand<object> IssueRecipe { get; set; }
         public RelayCommand<object> RemoveRecipe { get; set; }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs
index 0be4f19e..b56317e6 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs
@@ -16,6 +16,7 @@ using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
 using System.Threading;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using BPASmartClient.CustomResource.Pages.Model;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -26,57 +27,62 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             ThreadManage.GetInstance().StartLong(() => 
             {
                 IsRunProgramNum = GVL_SmallStation.GetInstance.RobotProgramNum;
-                RobotIsAutoMode = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(1);
-                RobotIsAutoRun = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(2);
-                RobotIsStop = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(3);
-                RobotIsRun = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(4);
-                RobotIsAlarm = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(5);
-                RobotIsHomed = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(6);
-                RobotGetEmptyBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(8);
-                RobotPutEmptyBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(9);
-                RobotGetFullBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(10);
-                RobotPutFullBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(11);
+                RobotIsAutoMode = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(2);
+                RobotIsAutoRun = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(3);
+                RobotIsStop = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(4);
+                RobotIsRun = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(5);
+                RobotIsAlarm = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(6);
+                RobotIsHomed = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(7);
+                //RobotGetEmptyBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(8);
+                //RobotPutEmptyBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(9);
+                //RobotGetFullBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(10);
+                //RobotPutFullBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(11);
 
                 Thread.Sleep(10);
 
             },"机器人状态",true);
             SystemStart = new RelayCommand(() => {
-                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.0");
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX0.1");
+                MessageNotify.GetInstance.ShowUserLog($"手动控制，机器人启动");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"机器人启动，操作完成!");
             });
             SystemStop = new RelayCommand(() => {
-                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.1");
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX0.2");
+                MessageNotify.GetInstance.ShowUserLog($"手动控制，机器人停止");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"机器人停止，操作完成!");
             });
             EStopReset = new RelayCommand(() => {
-                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.2");
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX0.3");
+                MessageNotify.GetInstance.ShowUserLog($"手动控制，机器人急停复位");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"机器人急停复位，操作完成!");
             });
 
-            TestRobotRun = new RelayCommand(() => {
-                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.4");
-            });
-            AutoMode = new RelayCommand(() => {
-                ActionManage.GetInstance.Send("RobotSendFalseCommand", "DB4.DBX100.3");
-            });
-            TestMode = new RelayCommand(() => {
-                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.3");
-            });
+            //TestRobotRun = new RelayCommand(() => {
+            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.4");
+            //});
+            //AutoMode = new RelayCommand(() => {
+            //    ActionManage.GetInstance.Send("RobotSendFalseCommand", "DB4.DBX100.3");
+            //});
+            //TestMode = new RelayCommand(() => {
+            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.3");
+            //});
 
-            RobotGetEmptyBarrel = new RelayCommand(() => {
-                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.7");
-            });
-            RobotPutEmptyBarrel = new RelayCommand(() => {
-                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.0");
-            });
-            RobotGetFullBarrel = new RelayCommand(() => {
-                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.1");
-            });
-            RobotPutFullBarrel = new RelayCommand(() => {
-                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.2");
-            });
-            SetProgramNumCommand = new RelayCommand(() =>{
-                ActionManage.GetInstance.Send("RobotSetProgramNum", SetProgramNum);
-            });
+            //RobotGetEmptyBarrel = new RelayCommand(() => {
+            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.7");
+            //});
+            //RobotPutEmptyBarrel = new RelayCommand(() => {
+            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.0");
+            //});
+            //RobotGetFullBarrel = new RelayCommand(() => {
+            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.1");
+            //});
+            //RobotPutFullBarrel = new RelayCommand(() => {
+            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.2");
+            //});
+            //SetProgramNumCommand = new RelayCommand(() =>{
+            //    ActionManage.GetInstance.Send("RobotSetProgramNum", SetProgramNum);
+            //});
         }
-
         public RelayCommand SystemStart { get; set; }
         public RelayCommand SystemStop { get; set; }
         public RelayCommand EStopReset { get; set; }
@@ -91,23 +97,23 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public RelayCommand RobotPutFullBarrel { get; set; }
         public RelayCommand SetProgramNumCommand { get; set; }
 
-        public short IsRunProgramNum { get { return _runProgramNum; } set { _runProgramNum = value;OnPropertyChanged(); } }
-        private short _runProgramNum;
+        public static short IsRunProgramNum { get { return _runProgramNum; } set { _runProgramNum = value; OnStaticPropertyChanged(); } }
+        private static short _runProgramNum;
         public short SetProgramNum { get { return _SetProgramNum; } set { _SetProgramNum = value; OnPropertyChanged(); } }
         private short _SetProgramNum;
 
-        public bool RobotIsAutoMode { get { return _RobotIsAutoMode; } set { _RobotIsAutoMode = value; OnPropertyChanged(); } }
-        private bool _RobotIsAutoMode;
-        public bool RobotIsAutoRun { get { return _RobotIsAutoRun; } set { _RobotIsAutoRun = value; OnPropertyChanged(); } }
-        private bool _RobotIsAutoRun;
-        public bool RobotIsStop { get { return _RobotIsStop; } set { _RobotIsStop = value; OnPropertyChanged(); } }
-        private bool _RobotIsStop;
-        public bool RobotIsRun { get { return _RobotIsRun; } set { _RobotIsRun = value; OnPropertyChanged(); } }
-        private bool _RobotIsRun;
-        public bool RobotIsAlarm { get { return _RobotIsAlarm; } set { _RobotIsAlarm = value; OnPropertyChanged(); } }
-        private bool _RobotIsAlarm;
-        public bool RobotIsHomed { get { return _RobotIsHomed; } set { _RobotIsHomed = value; OnPropertyChanged(); } }
-        private bool _RobotIsHomed;
+        public static bool RobotIsAutoMode { get { return _RobotIsAutoMode; } set { _RobotIsAutoMode = value; OnStaticPropertyChanged(); } }
+        private static bool _RobotIsAutoMode;
+        public static bool RobotIsAutoRun { get { return _RobotIsAutoRun; } set { _RobotIsAutoRun = value; OnStaticPropertyChanged(); } }
+        private static bool _RobotIsAutoRun;
+        public static bool RobotIsStop { get { return _RobotIsStop; } set { _RobotIsStop = value; OnStaticPropertyChanged(); } }
+        private static bool _RobotIsStop;
+        public static bool RobotIsRun { get { return _RobotIsRun; } set { _RobotIsRun = value; OnStaticPropertyChanged(); } }
+        private static bool _RobotIsRun;
+        public static bool RobotIsAlarm { get { return _RobotIsAlarm; } set { _RobotIsAlarm = value; OnStaticPropertyChanged(); } }
+        private static bool _RobotIsAlarm;
+        public static bool RobotIsHomed { get { return _RobotIsHomed; } set { _RobotIsHomed = value; OnStaticPropertyChanged(); } }
+        private static bool _RobotIsHomed;
         public bool RobotGetEmptyBarrelComplete { get { return _RobotGetEmptyBarrelComplete; } set { _RobotGetEmptyBarrelComplete = value; OnPropertyChanged(); } }
         private bool _RobotGetEmptyBarrelComplete;
         public bool RobotPutEmptyBarrelComplete { get { return _RobotPutEmptyBarrelComplete; } set { _RobotPutEmptyBarrelComplete = value; OnPropertyChanged(); } }

From d522c1c5762d514ae3c5b34774c3439186048dbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Wed, 26 Apr 2023 10:17:49 +0800
Subject: [PATCH 34/96] =?UTF-8?q?=E5=B0=8F=E9=85=8D=E6=96=99=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.Helper/ThreadManage.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/BPASmartClient.Helper/ThreadManage.cs b/BPASmartClient.Helper/ThreadManage.cs
index 33d37d20..732d2364 100644
--- a/BPASmartClient.Helper/ThreadManage.cs
+++ b/BPASmartClient.Helper/ThreadManage.cs
@@ -197,8 +197,13 @@ namespace BPASmartClient.Helper
         /// <returns></returns>
         public bool IsCanncel(string key)
         {
-            if(CancellationTokenSources.ContainsKey(guid + key)) return CancellationTokenSources[guid + key].IsCancellationRequested;
+            if (CancellationTokenSources.ContainsKey(guid + key)) return CancellationTokenSources[guid + key].IsCancellationRequested;
             return false;
         }
+
+        public bool IsContainsKey(string key)
+        {
+            return Threads.ContainsKey(guid + key);
+        }
     }
 }

From cb8c1d5c550ba8bea307f1d9f3273b6515438ab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Thu, 27 Apr 2023 11:28:53 +0800
Subject: [PATCH 35/96] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../App.xaml.cs                               |   8 +-
 .../Model/ProcessControl.cs                   |  49 +--
 .../Model/RawMaterial/DeviceInquire.cs        | 107 +++--
 .../View/ManualControlView.xaml               | 243 ++++++-----
 .../View/ManualFlowView.xaml                  | 390 ++++++++++++++----
 .../View/NewLocalRecipeView.xaml              | 120 +++---
 .../ViewModel/ManualControlViewModel.cs       |  19 +-
 .../ViewModel/ManualFlowViewModel.cs          |  16 +-
 BPASmartClient.Modbus/ModbusTcp.cs            |  23 +-
 9 files changed, 656 insertions(+), 319 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
index 249d610c..8348228b 100644
--- a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
@@ -37,7 +37,7 @@ namespace BPASmartClient.JXJFoodSmallStation
             }
             BPASmartClient.Helper.SystemHelper.GetInstance.CreateDesktopShortcut();
             base.OnStartup(e);
-            
+
             MenuInit();
             DataInit();
             Init();
@@ -53,7 +53,7 @@ namespace BPASmartClient.JXJFoodSmallStation
                 mv.Close();
             MainWindow = mv;
         }
-        private async void Init() 
+        private async void Init()
         {
             await Task.Run(new Action(() =>
             {
@@ -153,7 +153,7 @@ namespace BPASmartClient.JXJFoodSmallStation
                 AssemblyName = "BPASmartClient.JXJFoodSmallStation",
                 ToggleWindowPath = "View.BomOfMaterialView"
             });
-            
+
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
             {
                 MainMenuIcon = "&#xe62d;",
@@ -187,7 +187,7 @@ namespace BPASmartClient.JXJFoodSmallStation
                 AssemblyName = "BPASmartClient.JXJFoodSmallStation",
                 ToggleWindowPath = "View.ManualFlowView"
 
-            }); 
+            });
             ManualControl.Add(new SubMenumodel()
             {
                 SubMenuName = "机器人设备控制",
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index 6cfae563..08fbc907 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -90,7 +90,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     GVL_SmallStation.GetInstance.HeartBeatToPlc = !GVL_SmallStation.GetInstance.HeartBeatToPlc;
                     HKDevice.HK_PLC_S7.Write("DB4.DBX0.0", GVL_SmallStation.GetInstance.HeartBeatToPlc);
                     GVL_SmallStation.GetInstance.HeartBeatFromPlc = HKDevice.HK_PLC_S7.Read<bool>("DB45.DBX0.0");
-                    if (DeviceInquire.GetInstance.devices.Count < 15 && HKDevice.IsConnected && Json<RemoteRecipeDataColl>.Data.Recipes.Count > 0 && GVL_SmallStation.GetInstance.DisEnableStockBinAlarm == false && DateTime.Now.Subtract(StockBinAlarmTime).TotalSeconds >= 60 & !GVL_SmallStation.GetInstance.DisEnableStockAlarm) 
+                    if (DeviceInquire.GetInstance.devices.Count < 15 && HKDevice.IsConnected && Json<RemoteRecipeDataColl>.Data.Recipes.Count > 0 && GVL_SmallStation.GetInstance.DisEnableStockBinAlarm == false && DateTime.Now.Subtract(StockBinAlarmTime).TotalSeconds >= 60 & !GVL_SmallStation.GetInstance.DisEnableStockAlarm)
                     {
                         HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
                         App.Current.Dispatcher.Invoke(() =>
@@ -268,7 +268,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 //GVL_SmallStation.GetInstance.Station2Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.4");
                 //GVL_SmallStation.GetInstance.RobotStatus = HKDevice.HK_PLC_S7.Read<ushort>("DB3.DBW100");
                 //GVL_SmallStation.GetInstance.RobotProgramNum = HKDevice.HK_PLC_S7.Read<byte>("DB3.DBB102");
-                if (Json<RemoteRecipeDataColl>.Data.Recipes.Count <= 3) 
+                if (Json<RemoteRecipeDataColl>.Data.Recipes.Count <= 3)
                 {
                     GVL_SmallStation.GetInstance.IsAllowSiemensSendRecipe = true;
                 }
@@ -312,11 +312,11 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     GVL_SmallStation.GetInstance.AGV_PutTray1Finish = false;
                 }
                 ushort AGV_Get = (ushort)SiemensDevice.XL_Status.AgvFinishGet;
-                if (AGV_Get.Get16bitValue(1)) 
+                if (AGV_Get.Get16bitValue(1))
                 {
-                    GVL_SmallStation.GetInstance.AGV_GetTray1Finish = true; 
+                    GVL_SmallStation.GetInstance.AGV_GetTray1Finish = true;
                 }
-                else 
+                else
                 {
                     GVL_SmallStation.GetInstance.AGV_GetTray1Finish = false;
                 }
@@ -331,12 +331,12 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     string code = GVL_SmallStation.GetInstance.Order_CancelRecipeCode;
                     int index = Array.FindIndex(Json<RemoteRecipeDataColl>.Data.Recipes.ToArray(), p => p.RecipeCode == code);
-                    int[] cnt = new int[5] { -1,-1,-1,-1,-1};
+                    int[] cnt = new int[5] { -1, -1, -1, -1, -1 };
                     int index1 = -1;
                     for (int i = 0; i < 5; i++)
                     {
-                        cnt[i]= Array.FindIndex(RecipeQueueTray[i].ToArray(), p => p == code);
-                        if (cnt[i] >= 0) 
+                        cnt[i] = Array.FindIndex(RecipeQueueTray[i].ToArray(), p => p == code);
+                        if (cnt[i] >= 0)
                         {
                             index1 = i;
                         }
@@ -351,7 +351,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             }
                             else
                             {
-                                if (index1>=0)
+                                if (index1 >= 0)
                                 {
                                     GVL_SmallStation.GetInstance.OrderCancelStep = 1;
                                 }
@@ -378,9 +378,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             }
                             break;
                         case 2:
-                            if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX42."+index1))
+                            if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX42." + index1))
                             {
-                                if (GVL_SmallStation.GetInstance.Station1Cylinder == false) 
+                                if (GVL_SmallStation.GetInstance.Station1Cylinder == false)
                                 {
                                     GVL_SmallStation.GetInstance.OrderCancelStep = 3;
                                     MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
@@ -541,7 +541,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         {
                             for (int i = 0; i < 5; i++)
                             {
-                                if (GVL_SmallStation.GetInstance.NotUseSmallStation) 
+                                if (GVL_SmallStation.GetInstance.NotUseSmallStation)
                                 {
                                     if (RecipeQueueTray[i].Count == 0 && !RecipeQueueTray[0].Contains(data.RecipeCode) && !RecipeQueueTray[1].Contains(data.RecipeCode) && !RecipeQueueTray[2].Contains(data.RecipeCode) && !RecipeQueueTray[3].Contains(data.RecipeCode) && !RecipeQueueTray[4].Contains(data.RecipeCode))
                                     {
@@ -549,9 +549,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                         MessageNotify.GetInstance.ShowRunLog($"本地配方配料 ，不使用小料配料，配方{data.RecipeCode}，加入配方{i}");
                                     }
                                 }
-                                else if(GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[i])
+                                else if (GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[i])
                                 {
-                                    if (RecipeQueueTray[i].Count==0 && !RecipeQueueTray[0].Contains(data.RecipeCode) && !RecipeQueueTray[1].Contains(data.RecipeCode) && !RecipeQueueTray[2].Contains(data.RecipeCode) && !RecipeQueueTray[3].Contains(data.RecipeCode) && !RecipeQueueTray[4].Contains(data.RecipeCode))
+                                    if (RecipeQueueTray[i].Count == 0 && !RecipeQueueTray[0].Contains(data.RecipeCode) && !RecipeQueueTray[1].Contains(data.RecipeCode) && !RecipeQueueTray[2].Contains(data.RecipeCode) && !RecipeQueueTray[3].Contains(data.RecipeCode) && !RecipeQueueTray[4].Contains(data.RecipeCode))
                                     {
                                         RecipeQueueTray[i].Enqueue(data.RecipeCode);
                                         MessageNotify.GetInstance.ShowRunLog($"本地配方配料 ，等待plc允许配料，配方{data.RecipeCode}，加入配方{i}");
@@ -829,7 +829,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                                             HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
                                                             App.Current.Dispatcher.Invoke(() =>
                                                             {
-                                                                MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{ RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
+                                                                MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
                                                                 HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
                                                             });
                                                         }
@@ -983,7 +983,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }
         }
-        public void RegisterInit() 
+        public void RegisterInit()
         {
             //手动控制气缸 DB5.DBX0.0~DB5.DBX4.5
             ActionManage.GetInstance.Register(new Action<object>((o) =>
@@ -1203,7 +1203,8 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     break;
                                 }
                             }
-                            App.Current.Dispatcher.Invoke(() => {
+                            App.Current.Dispatcher.Invoke(() =>
+                            {
                                 Json<RemoteRecipeDataColl>.Data.Recipes.Add(new RemoteRecipeData()
                                 {
                                     RecipeName = recipe.RecipeName,
@@ -1226,7 +1227,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     Json<RemoteRecipeDataColl>.Data.Recipes.Add(recipe);
                 }
             }), "LocalSimulationRecipeIssue", true);
-            
+
             //手动控制系统模式
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", true); }), "SystemStart", true);
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", false); }), "SystemStop", true);
@@ -1261,14 +1262,14 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             }), "BPASystemReset", true);
 
             //往海科PLC写值
-            ActionManage.GetInstance.Register(new Action<Object>((o) => 
+            ActionManage.GetInstance.Register(new Action<Object>((o) =>
             {
-                if (o != null && o is HKDeviceWrite data) 
+                if (o != null && o is HKDeviceWrite data)
                 {
-                    if (data.PlcVarType == PlcVarType.Bool) 
+                    if (data.PlcVarType == PlcVarType.Bool)
                     {
                         bool value = (bool)data.Value;
-                        HKDevice.HK_PLC_S7.Write<bool>(data.Address , value);
+                        HKDevice.HK_PLC_S7.Write<bool>(data.Address, value);
                     }
                     else if (data.PlcVarType == PlcVarType.Byte)
                     {
@@ -1352,9 +1353,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     HKDevice.HK_PLC_S7.Write("DB4.DBB1", (byte)Value);
                 }
             }), "RobotSetProgramNum", true);
-            
+
         }
-        public void DeviceConnect() 
+        public void DeviceConnect()
         {
             try
             {
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
index 8a093b5d..f978f85f 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
@@ -12,6 +12,7 @@ using System.Net.NetworkInformation;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Configuration;
+using System.Diagnostics;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model
 {
@@ -21,9 +22,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         public static DeviceInquire GetInstance => _Instance ?? (_Instance = new DeviceInquire());
         private DeviceInquire() { }
 
-        string IPSegment = "107.107.2."; 
+        string IPSegment = "107.107.2.";
 
-         ConcurrentDictionary<string, DeviceStatus> DeviceLists = new ConcurrentDictionary<string, DeviceStatus>();
+        ConcurrentDictionary<string, DeviceStatus> DeviceLists = new ConcurrentDictionary<string, DeviceStatus>();
         List<string> InvalidIP = new List<string>();//无效 IP 集合
         List<string> IPLists = new List<string>();//启动 Ping 任务IP集合
         ConcurrentQueue<string> IPQueues = new ConcurrentQueue<string>();//pincomplete 完成队列
@@ -57,14 +58,14 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     {
                         devices.ElementAt(deviceIndex).DeviceName = DeviceLists.ElementAt(i).Value.DeviceName;
                     }
-                    if (!ThreadManage.GetInstance().IsContainsKey($"{deviceName} 开始监听")) 
+                    if (!ThreadManage.GetInstance().IsContainsKey($"{deviceName} 开始监听"))
                     {
                         DeviceLists[DeviceLists.ElementAt(i).Key].Init(deviceName);
                     }
                 }
-                
+
                 Thread.Sleep(200);
-            }), "设备状态监听",true);
+            }), "设备状态监听", true);
         }
         private void TestData()
         {
@@ -169,7 +170,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             {
                 IPLists.Add($"{IPSegment}{i + 69}");
             }
-           
+
 
             IPLists.ForEach((item) =>
             {
@@ -361,7 +362,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         //允许配料即产线气缸抬起，发送给味魔方
                         if (deviceStatus.DeviceNum >= 1 && deviceStatus.DeviceNum <= 15)
                         {
-                            if (GVL_SmallStation.GetInstance.plcReadDataDB3.StockBinAllowIssue[deviceStatus.DeviceNum-1])
+                            if (GVL_SmallStation.GetInstance.plcReadDataDB3.StockBinAllowIssue[deviceStatus.DeviceNum - 1])
                             {
                                 this.modbusTcp.Write("LW41", (ushort)1);
                                 GVL_SmallStation.GetInstance.StockBinCylinderStatus.SetBitValue((byte)(deviceStatus.DeviceNum), true);
@@ -395,57 +396,85 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             ThreadManage.GetInstance().StopTask($"{DeviceName} 开始监听");
         }
 
+
         public void Start(float Value)
         {
+            //if (modbusTcp.Connected)
+            //{
+            //    var res = Json<DevicePar>.Data.deviceParModels.FirstOrDefault(p => p.MaterialName == DeviceName);
+            //    if (res != null)
+            //    {
+            //        prop1:
+            //        modbusTcp.SetReal(DeviceAddress.SlowlyAddWeight, res.SlowlyAddWeight);
+            //        var Value1 = (float)this.modbusTcp.GetReal(DeviceAddress.SlowlyAddWeight);
+            //        if (Value1 != null && Value1.ToString() != res.SlowlyAddWeight.ToString()) goto prop1;
+            //        prop2:
+            //        modbusTcp.SetReal(DeviceAddress.PreCloseValveWeight, res.PreCloseValveWeight);
+            //        var Value2 = (float)this.modbusTcp.GetReal(DeviceAddress.PreCloseValveWeight);
+            //        if (Value2 != null && Value2.ToString() != res.PreCloseValveWeight.ToString()) goto prop2;
+            //        prop3:
+            //        modbusTcp.SetUint(DeviceAddress.RapidAcceleration, (uint)res.RapidAcceleration);
+            //        var Value3 = this.modbusTcp.GetUint(DeviceAddress.RapidAcceleration);
+            //        if (Value3 != null && Value3.ToString() != res.RapidAcceleration.ToString()) goto prop3;
+            //        prop4:
+            //        modbusTcp.SetUint(DeviceAddress.SlowAcceleration, (uint)res.SlowAcceleration);
+            //        var Value4 = this.modbusTcp.GetUint(DeviceAddress.SlowAcceleration);
+            //        if (Value4 != null && Value4.ToString() != res.SlowAcceleration.ToString()) goto prop4;
+            //        prop5:
+            //        modbusTcp.SetUint(DeviceAddress.ServoManualSpeed, (uint)res.ServoManualSpeed);
+            //        var Value5 = this.modbusTcp.GetUint(DeviceAddress.ServoManualSpeed);
+            //        if (Value5 != null && Value5.ToString() != res.ServoManualSpeed.ToString()) goto prop5;
+            //        prop6:
+            //        modbusTcp.SetUint(DeviceAddress.SiloUpperLimitWeight, (uint)res.SiloUpperLimitWeight);
+            //        var Value6 = this.modbusTcp.GetUint(DeviceAddress.SiloUpperLimitWeight);
+            //        if (Value6 != null && Value6.ToString() != res.SiloUpperLimitWeight.ToString()) goto prop6;
+            //        prop7:
+            //        modbusTcp.SetUint(DeviceAddress.LowerLimitWeightOfSilo, (uint)res.LowerLimitWeightOfSilo);
+            //        var Value7 = this.modbusTcp.GetUint(DeviceAddress.LowerLimitWeightOfSilo);
+            //        if (Value7 != null && Value7.ToString() != res.LowerLimitWeightOfSilo.ToString()) goto prop7;
+            //        /*prop8:
+            //        var Value8 = this.modbusTcp.GetUint(DeviceAddress.StirringSpeed);
+            //        if (Value8 != null && Value8.ToString() != num.ToString()) goto prop8;*/
+            //        uint num = (uint)res.StirringSpeed * 100;
+            //        modbusTcp.SetUint(DeviceAddress.StirringSpeed, num);
+            //        MessageNotify.GetInstance.ShowRunLog($"{res.MaterialName},参数下发完成");
+            //    }
+            //    int Count = 0;
+            //Start:
+            //    Count++;
+            //    modbusTcp.SetReal(DeviceAddress.WeightSet, Value);//写入原料重量
+            //    modbusTcp.Write(DeviceAddress.Start, (ushort)1);//设备启动写入
+            //    MessageNotify.GetInstance.ShowRunLog($"{DeviceName},设置重量：{Value}，下发次数{Count}，柔性味魔方开始配料");
+            //    Thread.Sleep(200);
+            //    if (this.modbusTcp.ReadShort(DeviceAddress.DosingStatusFeedback) == (short)0 && Count <=10) goto Start;
+            //}
+
+
+
             if (modbusTcp.Connected)
             {
                 var res = Json<DevicePar>.Data.deviceParModels.FirstOrDefault(p => p.MaterialName == DeviceName);
                 if (res != null)
                 {
-                    prop1:
                     modbusTcp.SetReal(DeviceAddress.SlowlyAddWeight, res.SlowlyAddWeight);
-                    var Value1 = (float)this.modbusTcp.GetReal(DeviceAddress.SlowlyAddWeight);
-                    if (Value1 != null && Value1.ToString() != res.SlowlyAddWeight.ToString()) goto prop1;
-                    prop2:
                     modbusTcp.SetReal(DeviceAddress.PreCloseValveWeight, res.PreCloseValveWeight);
-                    var Value2 = (float)this.modbusTcp.GetReal(DeviceAddress.PreCloseValveWeight);
-                    if (Value2 != null && Value2.ToString() != res.PreCloseValveWeight.ToString()) goto prop2;
-                    prop3:
                     modbusTcp.SetUint(DeviceAddress.RapidAcceleration, (uint)res.RapidAcceleration);
-                    var Value3 = this.modbusTcp.GetUint(DeviceAddress.RapidAcceleration);
-                    if (Value3 != null && Value3.ToString() != res.RapidAcceleration.ToString()) goto prop3;
-                    prop4:
                     modbusTcp.SetUint(DeviceAddress.SlowAcceleration, (uint)res.SlowAcceleration);
-                    var Value4 = this.modbusTcp.GetUint(DeviceAddress.SlowAcceleration);
-                    if (Value4 != null && Value4.ToString() != res.SlowAcceleration.ToString()) goto prop4;
-                    prop5:
                     modbusTcp.SetUint(DeviceAddress.ServoManualSpeed, (uint)res.ServoManualSpeed);
-                    var Value5 = this.modbusTcp.GetUint(DeviceAddress.ServoManualSpeed);
-                    if (Value5 != null && Value5.ToString() != res.ServoManualSpeed.ToString()) goto prop5;
-                    prop6:
                     modbusTcp.SetUint(DeviceAddress.SiloUpperLimitWeight, (uint)res.SiloUpperLimitWeight);
-                    var Value6 = this.modbusTcp.GetUint(DeviceAddress.SiloUpperLimitWeight);
-                    if (Value6 != null && Value6.ToString() != res.SiloUpperLimitWeight.ToString()) goto prop6;
-                    prop7:
                     modbusTcp.SetUint(DeviceAddress.LowerLimitWeightOfSilo, (uint)res.LowerLimitWeightOfSilo);
-                    var Value7 = this.modbusTcp.GetUint(DeviceAddress.LowerLimitWeightOfSilo);
-                    if (Value7 != null && Value7.ToString() != res.LowerLimitWeightOfSilo.ToString()) goto prop7;
-                    /*prop8:
-                    var Value8 = this.modbusTcp.GetUint(DeviceAddress.StirringSpeed);
-                    if (Value8 != null && Value8.ToString() != num.ToString()) goto prop8;*/
-                    uint num = (uint)res.StirringSpeed * 100;
-                    modbusTcp.SetUint(DeviceAddress.StirringSpeed, num);
+                    modbusTcp.SetUint(DeviceAddress.StirringSpeed, (uint)res.StirringSpeed * 100);
                     MessageNotify.GetInstance.ShowRunLog($"{res.MaterialName},参数下发完成");
                 }
-                int Count = 0;
-            Start:
-                Count++;
                 modbusTcp.SetReal(DeviceAddress.WeightSet, Value);//写入原料重量
                 modbusTcp.Write(DeviceAddress.Start, (ushort)1);//设备启动写入
-                MessageNotify.GetInstance.ShowRunLog($"{DeviceName},设置重量：{Value}，下发次数{Count}，柔性味魔方开始配料");
-                Thread.Sleep(200);
-                if (this.modbusTcp.ReadShort(DeviceAddress.DosingStatusFeedback) == (short)0 && Count <=10) goto Start;
+                MessageNotify.GetInstance.ShowRunLog($"{DeviceName},设置重量：{Value}，柔性味魔方开始配料");
             }
+
+
+
+
+
         }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualControlView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ManualControlView.xaml
index be9d4c47..b65d8248 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualControlView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualControlView.xaml
@@ -55,10 +55,10 @@
 
     <Grid Margin="8">
         <Grid.RowDefinitions>
-            <RowDefinition Height="2*"/>
-            <RowDefinition Height="2*"/>
-            <RowDefinition Height="3*"/>
-            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*" />
+            <RowDefinition Height="2*" />
+            <RowDefinition Height="3*" />
+            <RowDefinition Height="2*" />
         </Grid.RowDefinitions>
         <Grid
             Name="jiu"
@@ -85,73 +85,102 @@
                 Text="总控制" />
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="5*"/>
-                    <ColumnDefinition Width="5*"/>
+                    <ColumnDefinition Width="5*" />
+                    <ColumnDefinition Width="5*" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0">
                     <Grid.RowDefinitions>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
+                        <RowDefinition />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
                     <Grid>
-                        <WrapPanel  VerticalAlignment="Center" HorizontalAlignment="Center">
-                            <TextBlock FontSize="24" Foreground="Aqua" Text="当前系统模式："/>
-                            <TextBlock FontSize="24" Foreground="Aqua" Text="{Binding SystemMode}"/>
+                        <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock
+                                FontSize="24"
+                                Foreground="Aqua"
+                                Text="当前系统模式：" />
+                            <TextBlock
+                                FontSize="24"
+                                Foreground="Aqua"
+                                Text="{Binding SystemMode}" />
                         </WrapPanel>
                     </Grid>
-                    <Grid Grid.Column="0" Grid.Row="1">
-                        <WrapPanel  VerticalAlignment="Center" HorizontalAlignment="Center">
-                            <TextBlock FontSize="24" Foreground="Aqua" Text="当前系统状态："/>
-                            <TextBlock FontSize="24" Foreground="Aqua" Text="{Binding SystemStatus}"/>
+                    <Grid Grid.Row="1" Grid.Column="0">
+                        <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock
+                                FontSize="24"
+                                Foreground="Aqua"
+                                Text="当前系统状态：" />
+                            <TextBlock
+                                FontSize="24"
+                                Foreground="Aqua"
+                                Text="{Binding SystemStatus}" />
                         </WrapPanel>
                     </Grid>
 
-                    <RadioButton Grid.Column="1" Grid.Row="0" Content="Auto模式" IsChecked="True" Margin="15" FontSize="20" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                Foreground="Aqua" Command="{Binding AutoMode}"></RadioButton>
-                    <RadioButton Grid.Column="1" Grid.Row="1" Content="Debug模式" IsChecked="false" Margin="15" FontSize="20" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                Foreground="Aqua" Command="{Binding DebugMode}"></RadioButton>
+                    <RadioButton
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Margin="15"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Command="{Binding AutoMode}"
+                        Content="Auto模式"
+                        FontSize="20"
+                        Foreground="Aqua"
+                        IsChecked="False" />
+                    <RadioButton
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="15"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Command="{Binding DebugMode}"
+                        Content="Debug模式"
+                        FontSize="20"
+                        Foreground="Aqua"
+                        IsChecked="false" />
                 </Grid>
-                
-                <Grid
-                    Grid.Column="3" >
+
+                <Grid Grid.Column="3">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <pry:IcoButton 
-                        Command="{Binding SystemStartCommand}"
+                    <pry:IcoButton
                         Grid.Column="0"
                         Margin="5,30"
+                        Command="{Binding SystemStartCommand}"
                         Content="启动"
                         FontSize="40"
                         Foreground="Aqua"
                         Style="{StaticResource IcoButtonStyle}" />
-                    <pry:IcoButton 
-                        Command="{Binding SystemStopCommand}"
+                    <pry:IcoButton
                         Grid.Column="1"
                         Margin="5,30"
+                        Command="{Binding SystemStopCommand}"
                         Content="停止"
                         FontSize="40"
                         Foreground="Aqua"
                         Style="{StaticResource IcoButtonStyle}" />
-                    <pry:IcoButton 
-                        Command="{Binding SystemPauseCommand}"
+                    <pry:IcoButton
                         Grid.Column="2"
                         Margin="5,30"
+                        Command="{Binding SystemPauseCommand}"
                         Content="暂停"
                         FontSize="40"
                         Foreground="Aqua"
                         Style="{StaticResource IcoButtonStyle}" />
-                    <pry:IcoButton 
-                        Command="{Binding SystemResetCommand}"
+                    <pry:IcoButton
                         Grid.Column="3"
                         Margin="5,30"
+                        Command="{Binding SystemResetCommand}"
                         Content="恢复"
                         FontSize="40"
                         Foreground="Aqua"
@@ -182,38 +211,44 @@
                 FontSize="16"
                 Foreground="Aqua"
                 Text="线体控制" />
-            <Grid  Grid.Row="1">
+            <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"></ColumnDefinition>
-                    <ColumnDefinition Width="1*"></ColumnDefinition>
-                    <ColumnDefinition Width="1*"></ColumnDefinition>
-                    <ColumnDefinition Width="1*"></ColumnDefinition>
-                    <ColumnDefinition Width="1*"></ColumnDefinition>
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
-                    <RowDefinition></RowDefinition>
+                    <RowDefinition />
                 </Grid.RowDefinitions>
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
+                        <RowDefinition />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
-                    <TextBlock Grid.ColumnSpan="2"  Margin="0,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"
-                            FontSize="16" Foreground="Aqua" Text="进桶侧调速电机"/>
-                    <pry:IcoButton 
-                        Margin="10"
+                    <TextBlock
+                        Grid.ColumnSpan="2"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Text="进桶侧调速电机" />
+                    <pry:IcoButton
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="10"
                         Command="{Binding StartAxisLoadCommand}"
                         Content="启动"
                         FontSize="16"
                         Foreground="Aqua"
                         Style="{StaticResource IcoButtonStyle}" />
-                    <pry:IcoButton 
+                    <pry:IcoButton
                         Grid.Row="1"
                         Grid.Column="1"
                         Margin="10"
@@ -225,29 +260,34 @@
                 </Grid>
 
 
-                <Border
-                    BorderThickness="1,0,1,0" />
+                <Border BorderThickness="1,0,1,0" />
                 <Grid Grid.Column="1">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
+                        <RowDefinition />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
-                    <TextBlock Grid.ColumnSpan="2"  Margin="0,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"
-                            FontSize="16" Foreground="Aqua" Text="过渡段调速电机"/>
-                    <pry:IcoButton 
-                        Margin="10"
+                    <TextBlock
+                        Grid.ColumnSpan="2"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Text="过渡段调速电机" />
+                    <pry:IcoButton
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="10"
                         Command="{Binding StartAxisMidCommand}"
                         Content="启动"
                         FontSize="16"
                         Foreground="Aqua"
                         Style="{StaticResource IcoButtonStyle}" />
-                    <pry:IcoButton 
+                    <pry:IcoButton
                         Grid.Row="1"
                         Grid.Column="1"
                         Margin="10"
@@ -259,25 +299,31 @@
                 </Grid>
                 <Grid Grid.Column="2">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
+                        <RowDefinition />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
-                    <TextBlock Grid.ColumnSpan="2"  Margin="0,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"
-                            FontSize="16" Foreground="Aqua" Text="出桶侧调速电机"/>
-                    <pry:IcoButton 
-                        Margin="10"
+                    <TextBlock
+                        Grid.ColumnSpan="2"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Text="出桶侧调速电机" />
+                    <pry:IcoButton
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="10"
                         Command="{Binding StartAxisUnLoadCommand}"
                         Content="启动"
                         FontSize="16"
                         Foreground="Aqua"
                         Style="{StaticResource IcoButtonStyle}" />
-                    <pry:IcoButton 
+                    <pry:IcoButton
                         Grid.Row="1"
                         Grid.Column="1"
                         Margin="10"
@@ -287,29 +333,34 @@
                         Foreground="Aqua"
                         Style="{StaticResource IcoButtonStyle}" />
                 </Grid>
-                <Border
-                    BorderThickness="1,0,1,0" />
+                <Border BorderThickness="1,0,1,0" />
                 <Grid Grid.Column="3">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
+                        <RowDefinition />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
-                    <TextBlock Grid.ColumnSpan="2"  Margin="0,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"
-                            FontSize="16" Foreground="Aqua" Text="伺服1调速电机"/>
-                    <pry:IcoButton 
-                        Margin="10"
+                    <TextBlock
+                        Grid.ColumnSpan="2"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Text="伺服1调速电机" />
+                    <pry:IcoButton
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="10"
                         Command="{Binding StartAxis1Command}"
                         Content="启动"
                         FontSize="16"
                         Foreground="Aqua"
                         Style="{StaticResource IcoButtonStyle}" />
-                    <pry:IcoButton 
+                    <pry:IcoButton
                         Grid.Row="1"
                         Grid.Column="1"
                         Margin="10"
@@ -321,25 +372,31 @@
                 </Grid>
                 <Grid Grid.Column="4">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
+                        <RowDefinition />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
-                    <TextBlock Grid.ColumnSpan="2"  Margin="0,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"
-                            FontSize="16" Foreground="Aqua" Text="伺服2调速电机"/>
-                    <pry:IcoButton 
-                        Margin="10"
+                    <TextBlock
+                        Grid.ColumnSpan="2"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Text="伺服2调速电机" />
+                    <pry:IcoButton
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="10"
                         Command="{Binding StartAxis2Command}"
                         Content="启动"
                         FontSize="16"
                         Foreground="Aqua"
                         Style="{StaticResource IcoButtonStyle}" />
-                    <pry:IcoButton 
+                    <pry:IcoButton
                         Grid.Row="1"
                         Grid.Column="1"
                         Margin="10"
@@ -454,7 +511,7 @@
         <!--#endregion-->
 
         <!--#region 阻挡气缸-->
-       
+
         <!--#endregion-->
 
         <!--#region 托盘气缸-->
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
index 5622c4c9..4b6e9284 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
@@ -1,12 +1,14 @@
-<UserControl x:Class="BPASmartClient.JXJFoodSmallStation.View.ManualFlowView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
-             mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920">
+<UserControl
+    x:Class="BPASmartClient.JXJFoodSmallStation.View.ManualFlowView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
     <UserControl.DataContext>
         <vm:ManualFlowViewModel />
 
@@ -20,56 +22,59 @@
         </Grid.RowDefinitions>
         <!--#region 表格标题栏设置-->
         <Grid>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center">
+            <StackPanel
+                HorizontalAlignment="left"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
                 <Button
                     Name="test1"
                     Width="200"
                     Height="40"
                     Margin="5"
+                    Panel.ZIndex="0"
                     Command="{Binding Test1Command}"
                     Content="AGV送托盘完成"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Visibility="{Binding VisibilityBtn1}"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}"
+                    Visibility="{Binding VisibilityBtn1}" />
                 <Button
                     Name="test2"
                     Width="200"
                     Height="40"
                     Margin="5"
+                    Panel.ZIndex="0"
                     Command="{Binding Test2Command}"
                     Content="粉料仓配料完成"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Visibility="{Binding VisibilityBtn2}"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}"
+                    Visibility="{Binding VisibilityBtn2}" />
                 <Button
                     Name="test3"
                     Width="200"
                     Height="40"
                     Margin="5"
+                    Panel.ZIndex="0"
                     Command="{Binding Test3Command}"
                     Content="AGV取托盘完成"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Visibility="{Binding VisibilityBtn3}"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}"
+                    Visibility="{Binding VisibilityBtn3}" />
                 <TextBlock
-                    Width="100" 
+                    Width="100"
+                    Margin="10"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    Foreground="#FF2AB2E7"
                     FontSize="25"
-                    Margin="10"></TextBlock>
+                    Foreground="#FF2AB2E7" />
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5"
+                    Panel.ZIndex="0"
                     Command="{Binding Test5Command}"
                     Content="粉料仓提升到位"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
                 <Button
                     Width="200"
                     Height="40"
@@ -77,29 +82,32 @@
                     Command="{Binding BPAResetCommand}"
                     Content="上位机初始化"
                     FontSize="20"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
             </StackPanel>
         </Grid>
         <Grid Grid.Row="1">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center">
+            <StackPanel
+                HorizontalAlignment="left"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
+                    Panel.ZIndex="0"
                     Command="{Binding SystemReset}"
                     Content="PLC系统复位"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
+                    Panel.ZIndex="0"
                     Command="{Binding CLearRecipeInfo}"
                     Content="PLC配方清零"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
             </StackPanel>
 
 
@@ -113,90 +121,292 @@
                     <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
                 </Grid.RowDefinitions>
 
-                <WrapPanel Grid.Column="1">
-                    <TextBlock Text="海科plc心跳：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding Heartbeat}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
-                </WrapPanel>
+                <StackPanel Grid.Column="1" Orientation="Vertical">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="海科plc心跳：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Heartbeat}" />
+                    </StackPanel>
+                </StackPanel>
                 <WrapPanel Grid.Row="0">
-                    <TextBlock Text="西门子 连接状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding SiemensIsConnect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
-                    <TextBlock Text="海科plc连接状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding HKPlcIsConnect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
-                    <TextBlock Text="风送plc连接状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding WindSendIsConnect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="西门子 连接状态：" />
+                    <TextBlock
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding SiemensIsConnect}" />
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="海科plc连接状态：" />
+                    <TextBlock
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding HKPlcIsConnect}" />
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="风送plc连接状态：" />
+                    <TextBlock
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding WindSendIsConnect}" />
                 </WrapPanel>
                 <WrapPanel Grid.Row="2">
-                    <TextBlock Text="当前下发配方状态：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding OrderStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="当前下发配方状态：" />
+                    <TextBlock
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding OrderStatus}" />
                 </WrapPanel>
                 <WrapPanel Grid.Row="0" Grid.Column="2">
-                    <TextBlock Text="柔性味魔方配料完成，延迟复位时间：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBox Text="{Binding time}" Width="150"  HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBox>
-                    <TextBlock Text="ms" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="柔性味魔方配料完成，延迟复位时间：" />
+                    <TextBox
+                        Width="150"
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding time}" />
+                    <TextBlock
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="ms" />
                     <Button
                         Width="100"
                         Height="40"
                         Margin="5,0,5,0"
+                        Panel.ZIndex="0"
                         Command="{Binding TimeSet}"
                         Content="设置"
                         FontSize="20"
-                        Panel.ZIndex="0"
-                        Style="{StaticResource ImageButtonStyle}"></Button>
+                        Style="{StaticResource ImageButtonStyle}" />
                 </WrapPanel>
-                <WrapPanel Grid.Column="0" Grid.Row="3" Grid.RowSpan="2">
-                    <TextBlock Text="当前配料状态：" Width="200" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                <WrapPanel
+                    Grid.Row="3"
+                    Grid.RowSpan="2"
+                    Grid.Column="0">
+                    <TextBlock
+                        Width="200"
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="当前配料状态：" />
                     <WrapPanel>
-                        <TextBlock Text="配方1：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                        <TextBlock Text="{Binding Recipe1DosingStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方1：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe1DosingStatus}" />
                     </WrapPanel>
                     <WrapPanel>
-                        <TextBlock Text="配方2：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                        <TextBlock Text="{Binding Recipe2DosingStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方2：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe2DosingStatus}" />
                     </WrapPanel>
                     <WrapPanel>
-                        <TextBlock Text="配方3：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                        <TextBlock Text="{Binding Recipe3DosingStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方3：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe3DosingStatus}" />
                     </WrapPanel>
                     <WrapPanel>
-                        <TextBlock Text="配方4：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                        <TextBlock Text="{Binding Recipe4DosingStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方4：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe4DosingStatus}" />
                     </WrapPanel>
                     <WrapPanel>
-                        <TextBlock Text="配方5：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                        <TextBlock Text="{Binding Recipe5DosingStatus}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方5：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe5DosingStatus}" />
                     </WrapPanel>
                 </WrapPanel>
-                <WrapPanel Grid.Column="1" Grid.Row="3" Grid.RowSpan="2">
-                    <TextBlock Text="配料情况：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
+                <WrapPanel
+                    Grid.Row="3"
+                    Grid.RowSpan="2"
+                    Grid.Column="1">
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="配料情况：" />
                     <WrapPanel>
-                        <TextBlock Text="配方1：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                        <TextBlock Text="{Binding Recipe1DosingComplete}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方1：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe1DosingComplete}" />
                     </WrapPanel>
                     <WrapPanel>
-                        <TextBlock Text="配方2：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                        <TextBlock Text="{Binding Recipe2DosingComplete}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方2：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe2DosingComplete}" />
                     </WrapPanel>
                     <WrapPanel>
-                        <TextBlock Text="配方3：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                        <TextBlock Text="{Binding Recipe3DosingComplete}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方3：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe3DosingComplete}" />
                     </WrapPanel>
                     <WrapPanel>
-                        <TextBlock Text="配方4：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                        <TextBlock Text="{Binding Recipe4DosingComplete}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方4：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe4DosingComplete}" />
                     </WrapPanel>
                     <WrapPanel>
-                        <TextBlock Text="配方5：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                        <TextBlock Text="{Binding Recipe5DosingComplete}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方5：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe5DosingComplete}" />
                     </WrapPanel>
                 </WrapPanel>
-                <WrapPanel  Grid.Row="1" Grid.Column="2">
+                <WrapPanel Grid.Row="1" Grid.Column="2">
                     <!--<ComboBox
                         x:Name="cmbList"
                         Width="70"
@@ -210,27 +420,39 @@
                         MouseLeave="ComboBox_MouseLeave"
                         Style="{StaticResource ComboBoxStyle}"
                         Text="{Binding RawMaterialName}"/>-->
-                    <TextBlock Text="料仓号:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBox Width="50" Text="{Binding StockbinDosingCompleNum}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBox>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓号:" />
+                    <TextBox
+                        Width="50"
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockbinDosingCompleNum}" />
                     <Button
                         Width="200"
                         Height="40"
                         Margin="5,0,5,0"
+                        Panel.ZIndex="0"
                         Command="{Binding StockbinDosingComple}"
                         Content="小料料仓配料完成"
                         FontSize="20"
-                        Panel.ZIndex="0"
-                        Style="{StaticResource ImageButtonStyle}"></Button>
+                        Style="{StaticResource ImageButtonStyle}" />
                     <Button
-                        HorizontalAlignment="Right"
                         Width="400"
                         Height="40"
                         Margin="10"
+                        HorizontalAlignment="Right"
+                        Panel.ZIndex="0"
                         Command="{Binding StockbinDosingCompleClear}"
                         Content="清除所有小料料仓配料完成信号"
                         FontSize="20"
-                        Panel.ZIndex="0"
-                        Style="{StaticResource ImageButtonStyle}"></Button>
+                        Style="{StaticResource ImageButtonStyle}" />
                 </WrapPanel>
             </Grid>
         </Grid>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
index 05c57b81..40a7fdf4 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
@@ -69,10 +69,13 @@
             </Grid.RowDefinitions>
             <Grid Grid.Row="0">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
                 </Grid.ColumnDefinitions>
-                <StackPanel VerticalAlignment="Center" Grid.Column="0" Orientation="Horizontal">
+                <StackPanel
+                    Grid.Column="0"
+                    VerticalAlignment="Center"
+                    Orientation="Horizontal">
                     <TextBlock
                         Width="100"
                         Margin="10,0,10,0"
@@ -86,7 +89,10 @@
                         FontSize="16"
                         Text="{Binding RecipeName}" />
                 </StackPanel>
-                <WrapPanel VerticalAlignment="Center" Grid.Column="1" HorizontalAlignment="Left">
+                <WrapPanel
+                    Grid.Column="1"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center">
                     <TextBlock
                         Width="100"
                         Margin="2,0,10,0"
@@ -106,7 +112,7 @@
                     <ColumnDefinition Width="1*" />
                     <ColumnDefinition Width="1*" />
                 </Grid.ColumnDefinitions>
-                <WrapPanel VerticalAlignment="Center" Grid.Column="0">
+                <WrapPanel Grid.Column="0" VerticalAlignment="Center">
                     <TextBlock
                         Width="100"
                         Margin="10,0,10,0"
@@ -120,7 +126,10 @@
                         FontSize="16"
                         Text="{Binding TrayNum}" />
                 </WrapPanel>
-                <WrapPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Column="1">
+                <WrapPanel
+                    Grid.Column="1"
+                    HorizontalAlignment="Left"
+                    Orientation="Horizontal">
                     <Button
                         Width="80"
                         Height="40"
@@ -146,7 +155,7 @@
                         FontSize="16"
                         Style="{StaticResource ImageButtonStyle}" />
                     <Button
-                        Name ="Close"
+                        Name="Close"
                         Width="80"
                         Height="40"
                         Margin="2,0,2,0"
@@ -159,35 +168,55 @@
 
             <!--#region 表格标题栏设置-->
             <Grid
-            Grid.Row="2"
-            Margin="0,10,0,0"
-            Background="#ff0C255F">
+                Grid.Row="2"
+                Margin="0,10,0,0"
+                Background="#ff0C255F">
 
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0">
-                    <TextBlock Text="原料名称"  HorizontalAlignment="Center" FontSize="16"/>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        FontSize="16"
+                        Text="原料名称" />
                     <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                 </Grid>
                 <Grid Grid.Column="1">
-                    <TextBlock Text="原料类型"  HorizontalAlignment="Center" FontSize="16"/>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        FontSize="16"
+                        Text="原料类型" />
                     <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                 </Grid>
-                <TextBlock  Grid.Column="2" Text="原料位置" HorizontalAlignment="Center" FontSize="16"/>
+                <TextBlock
+                    Grid.Column="2"
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    Text="原料位置" />
                 <Grid Grid.Column="3">
-                    <TextBlock Text="原料桶号"  HorizontalAlignment="Center" FontSize="16"/>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        FontSize="16"
+                        Text="原料桶号" />
                     <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                 </Grid>
-                <TextBlock Grid.Column="4" Text="原料重量(kg)" HorizontalAlignment="Center" FontSize="16" />
+                <TextBlock
+                    Grid.Column="4"
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    Text="原料重量(kg)" />
                 <Grid Grid.Column="5">
-                    <TextBlock  Text="功能操作" HorizontalAlignment="Center" FontSize="16" />
-                    <Border BorderThickness="1,0,1,0"  Cursor="SizeWE" />
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        FontSize="16"
+                        Text="功能操作" />
+                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                 </Grid>
                 <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,0" />
             </Grid>
@@ -206,49 +235,32 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <Grid Grid.Column="0">
-                                        <TextBox
-                                        Text="{Binding RawMaterialName}" />
-                                        <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
+                                        <TextBox Text="{Binding RawMaterialName}" />
+                                        <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                     </Grid>
                                     <Grid Grid.Column="1">
-                                        <TextBox
-                                        Text="{Binding RawMaterialType}" />
-                                        <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
+                                        <TextBox Text="{Binding RawMaterialType}" />
+                                        <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                     </Grid>
-                                    <TextBox
-                                    Grid.Column="2"
-                                    Text="{Binding RawMaterialLocation }" />
+                                    <TextBox Grid.Column="2" Text="{Binding RawMaterialLocation}" />
 
                                     <Grid Grid.Column="3">
-                                        <TextBox
-                                        Text="{Binding RawMaterialBarrelNum}" />
-                                        <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
+                                        <TextBox Text="{Binding RawMaterialBarrelNum}" />
+                                        <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                     </Grid>
 
-                                    <TextBox
-                                    Grid.Column="4"
-                                    Text="{Binding RawMaterialWeight}" />
+                                    <TextBox Grid.Column="4" Text="{Binding RawMaterialWeight}" />
 
                                     <Grid Grid.Column="5">
                                         <Button
-                                        Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                        CommandParameter="{Binding RawMaterialLocation}"
-                                        Content="删除"
-                                        FontSize="16" />
-                                        <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
+                                            Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                            CommandParameter="{Binding RawMaterialLocation}"
+                                            Content="删除"
+                                            FontSize="16" />
+                                        <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                     </Grid>
 
-                                    <Border
-                                    Grid.ColumnSpan="10"
-                                    BorderThickness="1,0,1,1" />
+                                    <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,1" />
 
                                 </Grid>
                                 <DataTemplate.Triggers>
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
index c72321b9..c3e8859e 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
@@ -23,6 +23,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
                 SystemMode = GVL_SmallStation.GetInstance.PlcSystemMode ? "手动" : "自动";
+                if (GVL_SmallStation.GetInstance.PlcSystemMode) ManualMode = true;
+                else AutoModeStatus = true;
                 if (GVL_SmallStation.GetInstance.PlcSystemIsAutoRun)
                 {
                     if (GVL_SmallStation.GetInstance.PlcSystemIsPause)
@@ -230,7 +232,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             StopAxisLoadCommand = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("StopAxisLoadCommand");
-            }); 
+            });
             StartAxisMidCommand = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("StartAxisMidCommand");
@@ -264,7 +266,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 ActionManage.GetInstance.Send("StopAxis2Command");
             });
 
-            SystemStartCommand = new RelayCommand(() => 
+            SystemStartCommand = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("SystemStart");
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"系统启动!");
@@ -309,7 +311,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         /// </summary>
         public static ObservableCollection<CylinderModel> PalletCylinders { get; set; } = new ObservableCollection<CylinderModel>();
         public static string SystemMode { get { return _mSystemMode; } set { _mSystemMode = value; OnStaticPropertyChanged(); } }
-        private static string _mSystemMode =String.Empty;
+        private static string _mSystemMode = String.Empty;
 
 
         public static string SystemStatus { get { return _mSystemStatus; } set { _mSystemStatus = value; OnStaticPropertyChanged(); } }
@@ -339,13 +341,22 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public RelayCommand SystemStopCommand { get; set; }
         public RelayCommand SystemPauseCommand { get; set; }
 
-        
+
 
         public RelayCommand SystemResetCommand { get; set; }
 
         public RelayCommand AutoMode { get; set; }
         public RelayCommand DebugMode { get; set; }
 
+
+        public bool AutoModeStatus { get { return _mAutoModeStatus; } set { _mAutoModeStatus = value; OnPropertyChanged(); } }
+        private bool _mAutoModeStatus;
+
+        public bool ManualMode { get { return _mManualMode; } set { _mManualMode = value; OnPropertyChanged(); } }
+        private bool _mManualMode;
+
+
+
     }
 
     public class CylinderModel : ObservableObject
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
index c2280e39..6fa8cbc4 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
@@ -21,7 +21,7 @@ using System.Windows;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
-    public class ManualFlowViewModel:ObservableObject
+    public class ManualFlowViewModel : ObservableObject
     {
         public ManualFlowViewModel()
         {
@@ -82,7 +82,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 ActionManage.GetInstance.Send("AGVPutTrayFinish");
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV放货架流程完成");
             });
-            CLearRecipeInfo = new RelayCommand(() => 
+            CLearRecipeInfo = new RelayCommand(() =>
             {
                 App.Current.Dispatcher.Invoke(() =>
                 {
@@ -132,7 +132,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     MessageNotify.GetInstance.ShowUserLog($"手动点击按钮，给plc料仓{loc}配料完成信号");
                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，手动设置料仓{loc}配料完成");
                 }
-                else 
+                else
                 {
                     MessageNotify.GetInstance.ShowUserLog("料仓编号不正确");
                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，手动设置料仓{loc}配料，料仓编号不正确");
@@ -155,7 +155,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 Recipe4DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[3].ToBinString();
                 Recipe5DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[4].ToBinString();
                 Heartbeat = GVL_SmallStation.GetInstance.HeartBeatFromPlc;
-                switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus) 
+                switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus)
                 {
                     case 0:
                         OrderStatus = IssueRecipeCondition.等待小料站PLC允许下配方.ToString();
@@ -253,7 +253,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                         break;
                 }
                 Thread.Sleep(100);
-            }), "流程手动设备状态读取",true);
+            }), "流程手动设备状态读取", true);
             TimeSet = new RelayCommand(() =>
             {
                 GVL_SmallStation.GetInstance.Time = time;
@@ -273,7 +273,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public RelayCommand TimeSet { get; set; }
         public static bool Heartbeat { get { return _mHeartbeat; } set { _mHeartbeat = value; OnStaticPropertyChanged(); } }
         private static bool _mHeartbeat;
-        
+
         public int time { get { return _mtime; } set { _mtime = value; OnStaticPropertyChanged(); } }
         private int _mtime;
         public static string OrderStatus { get { return _mOrderStatus; } set { _mOrderStatus = value; OnStaticPropertyChanged(); } }
@@ -298,8 +298,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public RelayCommand CLearRecipeInfo { get; set; }
         public RelayCommand SystemReset { get; set; }
         public RelayCommand BPAResetCommand { get; set; }
-        private bool _SiemensIsConnect { get; set; } 
-        public bool SiemensIsConnect { get { return _SiemensIsConnect; } set { _SiemensIsConnect = value; OnPropertyChanged(); } } 
+        private bool _SiemensIsConnect { get; set; }
+        public bool SiemensIsConnect { get { return _SiemensIsConnect; } set { _SiemensIsConnect = value; OnPropertyChanged(); } }
         private bool _HKPlcIsConnect { get; set; }
         public bool HKPlcIsConnect { get { return _HKPlcIsConnect; } set { _HKPlcIsConnect = value; OnPropertyChanged(); } }
         private bool _WindSendIsConnect { get; set; }
diff --git a/BPASmartClient.Modbus/ModbusTcp.cs b/BPASmartClient.Modbus/ModbusTcp.cs
index 132808f6..84ea817e 100644
--- a/BPASmartClient.Modbus/ModbusTcp.cs
+++ b/BPASmartClient.Modbus/ModbusTcp.cs
@@ -56,7 +56,7 @@ namespace BPASmartClient.Modbus
             IPAdress = ip;
             Port = port;
             modbusFactory = new ModbusFactory();
-             Connect();
+            Connect();
             if (Connected)
             {
                 master.Transport.ReadTimeout = 3000;//读取超时时间
@@ -150,7 +150,7 @@ namespace BPASmartClient.Modbus
                         {
                             if (ExitAddress >= 0 && ExitAddress <= 7)
                             {
-                                return (firstAddress * 8)  + ExitAddress;
+                                return (firstAddress * 8) + ExitAddress;
                             }
                         }
                     }
@@ -163,12 +163,12 @@ namespace BPASmartClient.Modbus
                         return int.Parse(res);
                     }
                 }
-                else if(address.ToUpper().Contains("LB") && address.Length >= 3)
+                else if (address.ToUpper().Contains("LB") && address.Length >= 3)
                 {
                     var res = address.Substring(2);
                     if (res != null && res.Length > 0)
                     {
-                        if(int.TryParse(res, out int firstAddress))
+                        if (int.TryParse(res, out int firstAddress))
                         {
                             return firstAddress;
                         }
@@ -272,7 +272,7 @@ namespace BPASmartClient.Modbus
             CommandType commandType = CommandType.Coils;
             try
             {
-                if (address.ToUpper().Contains("M") || address.ToUpper().Contains("GM")) 
+                if (address.ToUpper().Contains("M") || address.ToUpper().Contains("GM"))
                 {
                     commandType = CommandType.Coils;
                     return master.ReadCoils(slaveAddress, startAddress, len);
@@ -297,7 +297,7 @@ namespace BPASmartClient.Modbus
                 {
                     commandType = CommandType.HoldingRegisters;
                     var var1 = master.ReadHoldingRegisters(slaveAddress, startAddress, len);
-                    var var2 = master.ReadHoldingRegisters(slaveAddress, (ushort)(startAddress+2), len);
+                    var var2 = master.ReadHoldingRegisters(slaveAddress, (ushort)(startAddress + 2), len);
                     int dest = 0;
                     dest |= (var2[0] & 0x0000ffff);
                     dest = (dest << 16) | (var1[0] & 0x0000ffff);
@@ -377,6 +377,7 @@ namespace BPASmartClient.Modbus
                         master.WriteSingleCoil(slaveAddress, startAddress, boolValue);
                     else if (value is bool[] boolsValue)
                         master.WriteMultipleCoils(slaveAddress, startAddress, boolsValue);
+                    else return false;
                 }
                 if (address.ToUpper().Contains("GM") && address.Length >= 3)
                 {
@@ -385,14 +386,16 @@ namespace BPASmartClient.Modbus
                         master.WriteSingleCoil(slaveAddress, startAddress, boolValue);
                     else if (value is bool[] boolsValue)
                         master.WriteMultipleCoils(slaveAddress, startAddress, boolsValue);
+                    else return false;
                 }
-                else if(address.ToUpper().Contains("LB"))
+                else if (address.ToUpper().Contains("LB"))
                 {
                     commandType = CommandType.Coils;
                     if (value is bool boolValue)
                         master.WriteSingleCoil(slaveAddress, startAddress, boolValue);
                     else if (value is bool[] boolsValue)
                         master.WriteMultipleCoils(slaveAddress, startAddress, boolsValue);
+                    else return false;
                 }
                 else if (address.ToUpper().Contains("VD"))
                 {
@@ -405,6 +408,7 @@ namespace BPASmartClient.Modbus
                         master.WriteSingleRegister(slaveAddress, startAddress, val1);
                         master.WriteSingleRegister(slaveAddress, (ushort)(startAddress + 1), val2);
                     }
+                    else return false;
 
                 }
                 else if (address.ToUpper().Contains("VW") || address.ToUpper().Contains("LW") || address.ToUpper().Contains("D"))
@@ -439,6 +443,7 @@ namespace BPASmartClient.Modbus
                             master.WriteMultipleRegisters(slaveAddress, startAddress, ushortsValue);
                         }
                     }
+                    else return false;
                 }
                 else if (address.ToUpper().Contains("I"))
                 {
@@ -497,10 +502,10 @@ namespace BPASmartClient.Modbus
         /// </summary>
         /// <param name="StartAddress"></param>
         /// <param name="value"></param>
-        public void SetReal(string StartAddress, float value,int Retries = 1)
+        public bool SetReal(string StartAddress, float value, int Retries = 1)
         {
             var bytes = BitConverter.GetBytes(value);
-            Write(StartAddress, bytes.BytesToUshorts(), Retries);
+            return Write(StartAddress, bytes.BytesToUshorts(), Retries);
         }
 
         /// <summary>

From 98ba49489d5dcbe73d4a11c9a2751c3ff75fac1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Thu, 27 Apr 2023 17:33:01 +0800
Subject: [PATCH 36/96] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/View/MainView.xaml                  |  51 +++--
 .../Resource/MyStyle.xaml                     | 113 ++++++++++
 .../View/BomOfMaterialView.xaml               | 213 ++++++++++++++----
 .../View/DeviceMaterialParView.xaml           | 129 ++---------
 .../View/ManualControlView.xaml               |   4 +-
 .../View/NewLocalRecipeView.xaml              |   2 +-
 .../View/PlcVarMonitorView.xaml               | 196 ++++++++++++----
 .../View/ProcessMonitorView.xaml              | 175 ++++++++++----
 .../View/RecipeInfosView.xaml                 | 162 ++++++++++---
 .../View/RecipeReceiveView.xaml               |  24 +-
 .../View/SiemensRecipeReceiveView.xaml        |   6 +-
 .../View/StockBinRawMaterialView.xaml         | 205 ++++++++++-------
 .../View/SystemParView.xaml                   | 146 +++++++++---
 .../View/WindSendParView.xaml                 | 168 ++++++++++----
 .../ViewModel/ManualControlViewModel.cs       |  91 ++++++--
 15 files changed, 1173 insertions(+), 512 deletions(-)
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Resource/MyStyle.xaml

diff --git a/BPASmartClient.CustomResource/Pages/View/MainView.xaml b/BPASmartClient.CustomResource/Pages/View/MainView.xaml
index fb4ce75c..4577d212 100644
--- a/BPASmartClient.CustomResource/Pages/View/MainView.xaml
+++ b/BPASmartClient.CustomResource/Pages/View/MainView.xaml
@@ -21,7 +21,7 @@
     </Window.DataContext>
 
     <Window.Resources>
-        
+
 
         <!--#region 静态资源-->
         <ImageBrush x:Key="leftImage" ImageSource="../../Image/leftImage.png" />
@@ -376,33 +376,33 @@
                         <ControlTemplate TargetType="ToggleButton">
                             <Grid Cursor="Hand">
                                 <Border
-                                x:Name="bd1"
-                                Width="25"
-                                Height="13"
-                                Margin="0,-10,-5,0"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Top"
-                                Panel.ZIndex="100"
-                                Background="#2600CAFF"
-                                CornerRadius="3"
-                                Cursor="Hand"
-                                Visibility="Collapsed">
+                                    x:Name="bd1"
+                                    Width="25"
+                                    Height="13"
+                                    Margin="0,-10,-5,0"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Top"
+                                    Panel.ZIndex="100"
+                                    Background="#2600CAFF"
+                                    CornerRadius="3"
+                                    Cursor="Hand"
+                                    Visibility="Collapsed">
                                     <TextBlock
-                                    HorizontalAlignment="Center"
-                                    FontSize="8"
-                                    Foreground="#FF00E6F7"
-                                    Text="{Binding ListNum, Mode=TwoWay}" />
+                                        HorizontalAlignment="Center"
+                                        FontSize="8"
+                                        Foreground="#FF00E6F7"
+                                        Text="{Binding ListNum, Mode=TwoWay}" />
                                     <!--    -->
                                 </Border>
                                 <Image
-                                x:Name="image1"
-                                Width="{TemplateBinding Width}"
-                                Height="{TemplateBinding Height}"
-                                Panel.ZIndex="0"
-                                RenderOptions.BitmapScalingMode="HighQuality"
-                                SnapsToDevicePixels="True"
-                                Source="/BPASmartClient.CustomResource;component/Image/告警/无告警.png"
-                                UseLayoutRounding="True" />
+                                    x:Name="image1"
+                                    Width="{TemplateBinding Width}"
+                                    Height="{TemplateBinding Height}"
+                                    Panel.ZIndex="0"
+                                    RenderOptions.BitmapScalingMode="HighQuality"
+                                    SnapsToDevicePixels="True"
+                                    Source="/BPASmartClient.CustomResource;component/Image/告警/无告警.png"
+                                    UseLayoutRounding="True" />
                             </Grid>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsChecked" Value="true">
@@ -581,12 +581,13 @@
                 </Grid.RowDefinitions>
                 <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                     <ToggleButton
+                        Margin="0,0,8,0"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Cursor="Hand"
                         IsChecked="{Binding IsAlarm}"
                         Style="{DynamicResource StatusBtnStyle告警}"
-                        ToolTip="心跳检测报警" Margin="0,0,8,0"/>
+                        ToolTip="心跳检测报警" />
                     <CheckBox
                         Margin="5,0,8,0"
                         Content="开机启动"
diff --git a/BPASmartClient.JXJFoodSmallStation/Resource/MyStyle.xaml b/BPASmartClient.JXJFoodSmallStation/Resource/MyStyle.xaml
new file mode 100644
index 00000000..e784e829
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Resource/MyStyle.xaml
@@ -0,0 +1,113 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:con="clr-namespace:BPASmartClient.JXJFoodSmallStation.Converter">
+
+    <SolidColorBrush x:Key="tabColor" Color="#FF2AB2E7" />
+    <!--<SolidColorBrush x:Key="bordColor" Color="#33ffffff" />-->
+    <SolidColorBrush x:Key="bordColor" Color="#552AB2E7" />
+    <con:DataTableRedundantConverter x:Key="tabConvert" />
+
+
+    <Style x:Key="RowRadioButtonStyle" TargetType="{x:Type RadioButton}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RadioButton}">
+                    <Border
+                        x:Name="NvaBor"
+                        Background="Transparent"
+                        BorderBrush="#FF2AB2E7"
+                        BorderThickness="0">
+                        <ContentControl
+                            Margin="10,4"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            HorizontalContentAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Content="{TemplateBinding Content}"
+                            FontSize="16" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
+                            <Setter TargetName="NvaBor" Property="BorderThickness" Value="0" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsChecked" Value="false" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.Setters>
+                                <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
+                            </MultiTrigger.Setters>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="InputTextboxStyle" TargetType="TextBox">
+        <Setter Property="Margin" Value="5,0,0,0" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Width" Value="150" />
+        <Setter Property="Height" Value="40" />
+        <Setter Property="CaretBrush" Value="{StaticResource TitleBorderColor}" />
+        <Setter Property="Foreground" Value="{StaticResource TitleBorderColor}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+
+    <Style x:Key="ControlButtonStyle" TargetType="Button">
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="#FFF53F62" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+        <Setter Property="FontFamily" Value="楷体" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border
+                        Name="TitleBarBr"
+                        BorderBrush="#00c2f4"
+                        BorderThickness="0"
+                        CornerRadius="0"
+                        Opacity="0.8">
+
+                        <ContentPresenter
+                            Margin="{TemplateBinding Margin}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        <Border.Background>
+                            <ImageBrush
+                                ImageSource="/BPASmartClient.CustomResource;component/Image/组合边框1.1.png"
+                                Opacity="0.8"
+                                Stretch="Fill" />
+                        </Border.Background>
+
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="TitleBarBr" Property="Opacity" Value="1" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TitleTextblockStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Foreground" Value="{StaticResource tabColor}" />
+        <Setter Property="FontFamily" Value="楷体" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+    </Style>
+
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml b/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml
index a3b512d6..de8dcec5 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/BomOfMaterialView.xaml
@@ -1,19 +1,32 @@
-<UserControl x:Class="BPASmartClient.JXJFoodSmallStation.View.BomOfMaterialView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-            xmlns:con="clr-namespace:BPASmartClient.JXJFoodSmallStation.Converter"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
-             mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920">
+<UserControl
+    x:Class="BPASmartClient.JXJFoodSmallStation.View.BomOfMaterialView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:con="clr-namespace:BPASmartClient.JXJFoodSmallStation.Converter"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
     <UserControl.DataContext>
         <vm:BomOfMaterialViewModel />
     </UserControl.DataContext>
+
     <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.JXJFoodSmallStation;component/Resource/MyStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    <!--<UserControl.Resources>
         <SolidColorBrush x:Key="tabColor" Color="#FF2AB2E7" />
-        <!--<SolidColorBrush x:Key="bordColor" Color="#33ffffff" />-->
+    -->
+    <!--<SolidColorBrush x:Key="bordColor" Color="#33ffffff" />-->
+    <!--
         <SolidColorBrush x:Key="bordColor" Color="#332AB2E7" />
         <con:DataTableRedundantConverter x:Key="tabConvert" />
 
@@ -117,108 +130,222 @@
             <Setter Property="FontWeight" Value="SemiBold" />
         </Style>
 
-    </UserControl.Resources>
-    
+    </UserControl.Resources>-->
+
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="60" />
-            <RowDefinition Height="40" />
+            <RowDefinition Height="50" />
             <RowDefinition />
         </Grid.RowDefinitions>
         <!--#region 表格标题栏设置-->
         <Grid>
-            <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+            <StackPanel
+                Margin="0,0,10,0"
+                HorizontalAlignment="Right"
+                Orientation="Horizontal">
                 <Button
+                    Width="200"
                     Height="50"
                     Margin="5"
                     Command="{Binding GetBomMaterialData}"
                     Content="拉取本地数据"
                     FontSize="28"
-                    Foreground="Aqua"
+                    Foreground="DeepSkyBlue"
                     Style="{StaticResource ImageButtonStyle}" />
                 <Button
+                    Width="200"
                     Height="50"
                     Margin="5"
                     Command="{Binding DeleteAllMaterial}"
                     Content="删除所有数据"
                     FontSize="28"
-                    Foreground="Aqua"
+                    Foreground="DeepSkyBlue"
                     Style="{StaticResource ImageButtonStyle}" />
                 <Button
+                    Width="200"
                     Height="50"
                     Margin="5"
                     Command="{Binding AddMaterial}"
                     Content="新增数据"
                     FontSize="28"
-                    Foreground="Aqua"
+                    Foreground="DeepSkyBlue"
                     Style="{StaticResource ImageButtonStyle}" />
                 <Button
+                    Width="200"
                     Height="50"
                     Margin="5"
                     Command="{Binding SaveMaterials}"
                     Content="保存参数"
                     FontSize="28"
-                    Foreground="Aqua"
+                    Foreground="DeepSkyBlue"
                     Style="{StaticResource ImageButtonStyle}" />
             </StackPanel>
-            
+
         </Grid>
         <Grid
             Grid.Row="1"
-            Margin="0,10,0,0"
+            Margin="0,10,17,0"
             Background="#ff0C255F">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
             </Grid.ColumnDefinitions>
-            <Grid Grid.Column="0">
-                <TextBlock  Text="序号" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"/>
-                <!--<Border BorderThickness="1,1,1,1" Cursor="SizeWE" 
+
+            <TextBlock
+                Grid.Column="0"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="序号" />
+
+            <TextBlock
+                Grid.Column="1"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="原料编号" />
+
+            <TextBlock
+                Grid.Column="2"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="原料名称" />
+
+            <TextBlock
+                Grid.Column="3"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="操作" />
+
+            <Border
+                Grid.Column="0"
+                Grid.ColumnSpan="4"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,1,1,1" />
+            <Border
+                Grid.Column="1"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,0,1,0" />
+            <Border
+                Grid.Column="3"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,0,1,0" />
+
+
+
+            <!--<Grid Grid.Column="0">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="24"
+                    Foreground="Aqua"
+                    Text="序号" />
+            -->
+            <!--<Border BorderThickness="1,1,1,1" Cursor="SizeWE"
                     BorderBrush="{StaticResource bordColor}"  />-->
+            <!--
             </Grid>
-            <TextBlock  Grid.Column="1" FontSize="24" Text="原料编号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
-            <TextBlock  Grid.Column="2" FontSize="24" Text="原料名称" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
-            <TextBlock  Grid.Column="3" FontSize="24" Text="操作" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <TextBlock
+                Grid.Column="1"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="24"
+                Foreground="Aqua"
+                Text="原料编号" />
+            <TextBlock
+                Grid.Column="2"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="24"
+                Foreground="Aqua"
+                Text="原料名称" />
+            <TextBlock
+                Grid.Column="3"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="24"
+                Foreground="Aqua"
+                Text="操作" />-->
         </Grid>
         <Grid Grid.Row="2">
-            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Visible"  >
-                <ItemsControl ItemsSource="{Binding RawMaterialInfo}" Foreground="Aqua">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Visible">
+                <ItemsControl Foreground="DeepSkyBlue" ItemsSource="{Binding RawMaterialInfo}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <Grid Name="gr" >
+                            <Grid Name="gr">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition />
                                     <ColumnDefinition />
                                     <ColumnDefinition />
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
-                                <Grid Grid.Column="0" Margin="5">
+
+                                <TextBlock
+                                    Grid.Column="0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    Text="{Binding Count}" />
+
+                                <TextBox
+                                    Grid.Column="1"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding MaterialCode}" />
+
+                                <TextBox
+                                    Grid.Column="2"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding MaterialName}" />
+
+                                <Button
+                                    Grid.Column="3"
+                                    Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                    CommandParameter="{Binding RawMaterialLocation}"
+                                    Content="删除"
+                                    FontSize="16"
+                                    Style="{StaticResource ControlButtonStyle}" />
+
+                                <Border
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="4"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,1" />
+                                <Border
+                                    Grid.Column="1"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,0" />
+                                <Border
+                                    Grid.Column="3"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,0" />
+
+
+                                <!--<Grid Grid.Column="0" Margin="5">
                                     <TextBlock
-                                        FontSize="16"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
+                                        FontSize="16"
                                         Text="{Binding Count}" />
                                 </Grid>
                                 <Grid Grid.Column="1" Margin="5">
                                     <TextBox
                                         Width="50"
-                                        FontSize="16"
                                         HorizontalAlignment="Center"
-                                        VerticalAlignment="Center" 
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
                                         Text="{Binding MaterialCode}" />
                                 </Grid>
                                 <Grid Grid.Column="2" Margin="5">
                                     <TextBox
                                         Width="200"
-                                        FontSize="16"
                                         HorizontalAlignment="Center"
-                                        VerticalAlignment="Center" 
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
                                         Text="{Binding MaterialName}" />
                                 </Grid>
                                 <Grid Grid.Column="3" Margin="5">
-                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                    <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                                         <pry:IcoButton
                                             Margin="3,4,4,0"
                                             HorizontalAlignment="Center"
@@ -233,9 +360,9 @@
                                             IcoText="&#xe68e;"
                                             Style="{StaticResource IcoButtonStyle}" />
                                     </StackPanel>
-                                </Grid>
+                                </Grid>-->
                             </Grid>
-                            
+
                             <DataTemplate.Triggers>
                                 <Trigger Property="IsMouseOver" Value="true">
                                     <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
diff --git a/BPASmartClient.JXJFoodSmallStation/View/DeviceMaterialParView.xaml b/BPASmartClient.JXJFoodSmallStation/View/DeviceMaterialParView.xaml
index 66182267..2ce29854 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/DeviceMaterialParView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/DeviceMaterialParView.xaml
@@ -16,111 +16,11 @@
     </UserControl.DataContext>
 
     <UserControl.Resources>
-        <SolidColorBrush x:Key="tabColor" Color="#FF2AB2E7" />
-        <!--<SolidColorBrush x:Key="bordColor" Color="#33ffffff" />-->
-        <SolidColorBrush x:Key="bordColor" Color="#332AB2E7" />
-        <con:DataTableRedundantConverter x:Key="tabConvert" />
-
-        <Style x:Key="RowRadioButtonStyle" TargetType="{x:Type RadioButton}">
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type RadioButton}">
-                        <Border
-                            x:Name="NvaBor"
-                            Background="Transparent"
-                            BorderBrush="#FF2AB2E7"
-                            BorderThickness="0">
-                            <ContentControl
-                                Margin="10,4"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                HorizontalContentAlignment="Center"
-                                VerticalContentAlignment="Center"
-                                Content="{TemplateBinding Content}"
-                                FontSize="16" />
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsChecked" Value="True">
-                                <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
-                                <Setter TargetName="NvaBor" Property="BorderThickness" Value="0" />
-                            </Trigger>
-                            <MultiTrigger>
-                                <MultiTrigger.Conditions>
-                                    <Condition Property="IsChecked" Value="false" />
-                                    <Condition Property="IsMouseOver" Value="True" />
-                                </MultiTrigger.Conditions>
-                                <MultiTrigger.Setters>
-                                    <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
-                                </MultiTrigger.Setters>
-                            </MultiTrigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <Style x:Key="InputTextboxStyle" TargetType="TextBox">
-            <Setter Property="Margin" Value="5,0,0,0" />
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="Width" Value="150" />
-            <Setter Property="Height" Value="40" />
-            <Setter Property="CaretBrush" Value="{StaticResource TitleBorderColor}" />
-            <Setter Property="Foreground" Value="{StaticResource TitleBorderColor}" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="FontSize" Value="14" />
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-
-        <Style x:Key="ControlButtonStyle" TargetType="Button">
-            <Setter Property="Margin" Value="0" />
-            <Setter Property="FontSize" Value="18" />
-            <Setter Property="Foreground" Value="#FFF53F62" />
-            <Setter Property="FontWeight" Value="SemiBold" />
-            <Setter Property="FontFamily" Value="楷体" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border
-                            Name="TitleBarBr"
-                            BorderBrush="#00c2f4"
-                            BorderThickness="0"
-                            CornerRadius="0"
-                            Opacity="0.8">
-
-                            <ContentPresenter
-                                Margin="{TemplateBinding Margin}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-                            <Border.Background>
-                                <ImageBrush
-                                    ImageSource="/BPASmartClient.CustomResource;component/Image/组合边框1.1.png"
-                                    Opacity="0.8"
-                                    Stretch="Fill" />
-                            </Border.Background>
-
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="true">
-                                <Setter TargetName="TitleBarBr" Property="Opacity" Value="1" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <Style x:Key="TitleTextblockStyle" TargetType="TextBlock">
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="HorizontalAlignment" Value="Center" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-            <Setter Property="Foreground" Value="{StaticResource tabColor}" />
-            <Setter Property="FontFamily" Value="楷体" />
-            <Setter Property="FontWeight" Value="SemiBold" />
-        </Style>
-
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.JXJFoodSmallStation;component/Resource/MyStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </UserControl.Resources>
 
     <Grid Margin="10">
@@ -342,9 +242,9 @@
                                     Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
                                     Style="{StaticResource InputTextboxStyle}"
                                     Text="{Binding StirringSpeed}" />
-                                
+
                                 <Grid Grid.Column="9">
-                                    <TextBox 
+                                    <TextBox
                                         Foreground="Red"
                                         Style="{StaticResource InputTextboxStyle}"
                                         Text="{Binding ErrorRange}" />
@@ -354,13 +254,14 @@
                                         Cursor="SizeWE" />
                                 </Grid>
 
-                                <Button Grid.Column="10"
-                                        Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                        CommandParameter="{Binding MaterialName}"
-                                        Content="删除"
-                                        FontSize="16"
-                                        Style="{StaticResource ControlButtonStyle}" />
-                                   
+                                <Button
+                                    Grid.Column="10"
+                                    Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                    CommandParameter="{Binding MaterialName}"
+                                    Content="删除"
+                                    FontSize="16"
+                                    Style="{StaticResource ControlButtonStyle}" />
+
                                 <Border
                                     Grid.ColumnSpan="11"
                                     BorderBrush="{StaticResource bordColor}"
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualControlView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ManualControlView.xaml
index b65d8248..3a9df1bd 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualControlView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualControlView.xaml
@@ -132,7 +132,7 @@
                         Content="Auto模式"
                         FontSize="20"
                         Foreground="Aqua"
-                        IsChecked="False" />
+                        IsChecked="{Binding AutoModeStatus}" />
                     <RadioButton
                         Grid.Row="1"
                         Grid.Column="1"
@@ -143,7 +143,7 @@
                         Content="Debug模式"
                         FontSize="20"
                         Foreground="Aqua"
-                        IsChecked="false" />
+                        IsChecked="{Binding ManualMode}" />
                 </Grid>
 
                 <Grid Grid.Column="3">
diff --git a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
index 40a7fdf4..d9cb3f60 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
@@ -11,7 +11,7 @@
     Height="645"
     AllowsTransparency="True"
     Background="{x:Null}"
-    Topmost="false"
+    Topmost="True"
     WindowStartupLocation="CenterScreen"
     WindowStyle="None"
     mc:Ignorable="d">
diff --git a/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml b/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
index 58899358..082d2106 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
@@ -1,92 +1,190 @@
-<UserControl x:Class="BPASmartClient.JXJFoodSmallStation.View.PlcVarMonitorView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
-             mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920">
+<UserControl
+    x:Class="BPASmartClient.JXJFoodSmallStation.View.PlcVarMonitorView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
     <UserControl.DataContext>
         <vm:PlcVarMonitorViewModel />
     </UserControl.DataContext>
-    <Border BorderThickness="0" BorderBrush="{StaticResource bordColor}">
+    <Border BorderBrush="{StaticResource bordColor}" BorderThickness="0">
         <Grid Margin="0,10">
             <Grid.RowDefinitions>
-                <RowDefinition Height="60"></RowDefinition>
-                <RowDefinition></RowDefinition>
+                <RowDefinition Height="60" />
+                <RowDefinition />
             </Grid.RowDefinitions>
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="3*"></ColumnDefinition>
-                    <ColumnDefinition Width="8*"></ColumnDefinition>
-                    <ColumnDefinition Width="4*"></ColumnDefinition>
-                    <ColumnDefinition Width="4*"></ColumnDefinition>
-                    <ColumnDefinition Width="8*"></ColumnDefinition>
-                    <ColumnDefinition Width="5*"></ColumnDefinition>
-                    <ColumnDefinition Width="17"></ColumnDefinition>
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="8*" />
+                    <ColumnDefinition Width="4*" />
+                    <ColumnDefinition Width="4*" />
+                    <ColumnDefinition Width="8*" />
+                    <ColumnDefinition Width="5*" />
+                    <ColumnDefinition Width="17" />
                 </Grid.ColumnDefinitions>
                 <Grid>
-                    <TextBlock Text="序号" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="序号" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
                 </Grid>
                 <Grid Grid.Column="1">
-                    <TextBlock Text="名称" FontSize="32"  HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="名称" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
                 </Grid>
                 <Grid Grid.Column="2">
-                    <TextBlock Text="地址" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="地址" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
                 </Grid>
                 <Grid Grid.Column="3">
-                    <TextBlock Text="类型" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="类型" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
                 </Grid>
                 <Grid Grid.Column="4">
-                    <TextBlock Text="描述" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="描述" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
                 </Grid>
                 <Grid Grid.Column="5">
-                    <TextBlock Text="当前值" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="当前值" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
                 </Grid>
             </Grid>
             <Grid Grid.Row="1">
                 <ScrollViewer>
-                    <ItemsControl ItemsSource="{Binding plcInfos}" Foreground="Aqua">
+                    <ItemsControl Foreground="Aqua" ItemsSource="{Binding plcInfos}">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
                                 <Grid Name="gr">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="3*"></ColumnDefinition>
-                                        <ColumnDefinition Width="8*"></ColumnDefinition>
-                                        <ColumnDefinition Width="4*"></ColumnDefinition>
-                                        <ColumnDefinition Width="4*"></ColumnDefinition>
-                                        <ColumnDefinition Width="8*"></ColumnDefinition>
-                                        <ColumnDefinition Width="5*"></ColumnDefinition>
+                                        <ColumnDefinition Width="3*" />
+                                        <ColumnDefinition Width="8*" />
+                                        <ColumnDefinition Width="4*" />
+                                        <ColumnDefinition Width="4*" />
+                                        <ColumnDefinition Width="8*" />
+                                        <ColumnDefinition Width="5*" />
                                     </Grid.ColumnDefinitions>
                                     <Grid>
-                                        <TextBlock Text="{Binding Count}" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                        <TextBlock
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Count}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
                                     </Grid>
                                     <Grid Grid.Column="1">
-                                        <TextBlock Text="{Binding Name}" FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                        <TextBlock
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Name}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
                                     </Grid>
                                     <Grid Grid.Column="2">
-                                        <TextBlock Text="{Binding Address}" FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                        <TextBlock
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Address}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
                                     </Grid>
                                     <Grid Grid.Column="3">
-                                        <TextBlock Text="{Binding Type}" FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                        <TextBlock
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Type}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
                                     </Grid>
                                     <Grid Grid.Column="4">
-                                        <TextBlock Text="{Binding Describe}" FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                        <TextBlock
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Describe}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
                                     </Grid>
                                     <Grid Grid.Column="5">
-                                        <TextBlock Text="{Binding Value}" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                        <TextBlock
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Value}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
                                     </Grid>
                                 </Grid>
                                 <DataTemplate.Triggers>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml
index d1b37827..17794e2b 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ProcessMonitorView.xaml
@@ -1,83 +1,170 @@
-<UserControl x:Class="BPASmartClient.JXJFoodSmallStation.View.ProcessMonitorView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:BPASmartClient.JXJFoodSmallStation.View"
-             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
-             mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920">
+<UserControl
+    x:Class="BPASmartClient.JXJFoodSmallStation.View.ProcessMonitorView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.JXJFoodSmallStation.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
     <UserControl.DataContext>
         <vm:ProcessMonitorViewModel />
     </UserControl.DataContext>
-    <Border BorderThickness="0" BorderBrush="{StaticResource bordColor}">
+    <Border BorderBrush="{StaticResource bordColor}" BorderThickness="0">
         <Grid Margin="0,10">
             <Grid.RowDefinitions>
-                <RowDefinition Height="60"></RowDefinition>
-                <RowDefinition></RowDefinition>
+                <RowDefinition Height="60" />
+                <RowDefinition />
             </Grid.RowDefinitions>
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="2*"></ColumnDefinition>
-                    <ColumnDefinition Width="4*"></ColumnDefinition>
-                    <ColumnDefinition Width="4*"></ColumnDefinition>
-                    <ColumnDefinition Width="12*"></ColumnDefinition>
-                    <ColumnDefinition Width="6*"></ColumnDefinition>
-                    <ColumnDefinition Width="17"></ColumnDefinition>
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="4*" />
+                    <ColumnDefinition Width="4*" />
+                    <ColumnDefinition Width="12*" />
+                    <ColumnDefinition Width="6*" />
+                    <ColumnDefinition Width="17" />
                 </Grid.ColumnDefinitions>
                 <Grid>
-                    <TextBlock Text="序号" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="序号" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
                 </Grid>
                 <Grid Grid.Column="1">
-                    <TextBlock Text="名称" FontSize="32"  HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="名称" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
                 </Grid>
                 <Grid Grid.Column="2">
-                    <TextBlock Text="类型" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="类型" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
                 </Grid>
                 <Grid Grid.Column="3">
-                    <TextBlock Text="描述" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="描述" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
                 </Grid>
                 <Grid Grid.Column="4">
-                    <TextBlock Text="当前值" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                    <Border BorderThickness="1,1,0,0" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="当前值" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
                 </Grid>
             </Grid>
             <Grid Grid.Row="1">
                 <ScrollViewer>
-                    <ItemsControl ItemsSource="{Binding plcInfos}" Foreground="Aqua">
+                    <ItemsControl Foreground="Aqua" ItemsSource="{Binding plcInfos}">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
                                 <Grid>
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="2*"></ColumnDefinition>
-                                        <ColumnDefinition Width="4*"></ColumnDefinition>
-                                        <ColumnDefinition Width="4*"></ColumnDefinition>
-                                        <ColumnDefinition Width="12*"></ColumnDefinition>
-                                        <ColumnDefinition Width="6*"></ColumnDefinition>
+                                        <ColumnDefinition Width="2*" />
+                                        <ColumnDefinition Width="4*" />
+                                        <ColumnDefinition Width="4*" />
+                                        <ColumnDefinition Width="12*" />
+                                        <ColumnDefinition Width="6*" />
                                     </Grid.ColumnDefinitions>
                                     <Grid>
-                                        <TextBlock  Margin="5" Text="{Binding Count}" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                        <TextBlock
+                                            Margin="5"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Count}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
                                     </Grid>
                                     <Grid Grid.Column="1">
-                                        <TextBlock  Margin="5" Text="{Binding Name}" FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                        <TextBlock
+                                            Margin="5"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Name}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
                                     </Grid>
                                     <Grid Grid.Column="2">
-                                        <TextBlock Margin="5"  Text="{Binding Type}" FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                        <TextBlock
+                                            Margin="5"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Type}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
                                     </Grid>
                                     <Grid Grid.Column="3">
-                                        <TextBlock  Margin="5" Text="{Binding Describe}" FontSize="14" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                        <TextBlock
+                                            Margin="5"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="14"
+                                            Foreground="Aqua"
+                                            Text="{Binding Describe}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
                                     </Grid>
                                     <Grid Grid.Column="4">
-                                        <TextBlock Margin="5" Text="{Binding Value}" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"></TextBlock>
-                                        <Border BorderThickness="1" Cursor="SizeWE" BorderBrush="{StaticResource bordColor}"></Border>
+                                        <TextBlock
+                                            Margin="5"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Value}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
                                     </Grid>
                                 </Grid>
                             </DataTemplate>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml
index c1e0de8e..f7602989 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml
@@ -52,9 +52,10 @@
         </ResourceDictionary>
     </Window.Resources>
 
-    <Border  Name="br"
+    <Border
+        Name="br"
         BorderBrush="#0CADF5"
-        BorderThickness="1" >
+        BorderThickness="1">
         <Border.Background>
             <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" />
         </Border.Background>
@@ -69,63 +70,150 @@
                 </Grid.RowDefinitions>
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
+                        <RowDefinition />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
                     <WrapPanel>
-                        <TextBlock Margin="10,10"  Background="Transparent"  FontSize="16"  Foreground="#FF2AB2E7" Text="配方名称：" />
-                        <TextBlock Margin="10,10"  Background="Transparent"  FontSize="16"  Foreground="#FF2AB2E7" Text="{Binding RecipeName}" />
+                        <TextBlock
+                            Margin="10,10"
+                            Background="Transparent"
+                            FontSize="16"
+                            Foreground="#FF2AB2E7"
+                            Text="配方名称：" />
+                        <TextBlock
+                            Margin="10,10"
+                            Background="Transparent"
+                            FontSize="16"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding RecipeName}" />
                     </WrapPanel>
                     <WrapPanel Grid.Column="1">
-                        <TextBlock  Margin="10,10"  Background="Transparent"  FontSize="16"  Foreground="#FF2AB2E7" Text="配方编号：" />
-                        <TextBlock  Margin="10,10"  Background="Transparent"  FontSize="16"  Foreground="#FF2AB2E7" Text="{Binding RecipeCode}" />
+                        <TextBlock
+                            Margin="10,10"
+                            Background="Transparent"
+                            FontSize="16"
+                            Foreground="#FF2AB2E7"
+                            Text="配方编号：" />
+                        <TextBlock
+                            Margin="10,10"
+                            Background="Transparent"
+                            FontSize="16"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding RecipeCode}" />
                     </WrapPanel>
 
                     <WrapPanel Grid.Row="1">
-                        <TextBlock  Margin="10,0,0,0"  Background="Transparent"  FontSize="16"  Foreground="#FF2AB2E7" Text="托盘编号：" />
-                        <TextBlock Grid.Row="1" Margin="10,10"  Background="Transparent"  FontSize="16"  Foreground="#FF2AB2E7" Text="{Binding TrayCode}" />
-                       
+                        <TextBlock
+                            Margin="10,0,0,0"
+                            Background="Transparent"
+                            FontSize="16"
+                            Foreground="#FF2AB2E7"
+                            Text="托盘编号：" />
+                        <TextBlock
+                            Grid.Row="1"
+                            Margin="10,10"
+                            Background="Transparent"
+                            FontSize="16"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding TrayCode}" />
+
                     </WrapPanel>
-                    <Button Grid.Column="1" Grid.Row="1" Width="100" Command="{Binding ReturnPage}" HorizontalAlignment="Left" Margin="10,0,0,0">返回</Button>
+                    <Button
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Width="100"
+                        Margin="10,0,0,0"
+                        HorizontalAlignment="Left"
+                        Command="{Binding ReturnPage}">
+                        返回
+                    </Button>
                 </Grid>
-                
+
                 <Grid Grid.Row="3">
                     <Grid Grid.Column="1">
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="20"></RowDefinition>
-                            <RowDefinition></RowDefinition>
+                            <RowDefinition Height="20" />
+                            <RowDefinition />
                         </Grid.RowDefinitions>
-                        <Grid Grid.Row="0"  >
+                        <Grid Grid.Row="0">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="2*"/>
-                                <ColumnDefinition Width="2*"/>
-                                <ColumnDefinition Width="2*"/>
-                                <ColumnDefinition Width="2*"/>
+                                <ColumnDefinition Width="2*" />
+                                <ColumnDefinition Width="2*" />
+                                <ColumnDefinition Width="2*" />
+                                <ColumnDefinition Width="2*" />
                             </Grid.ColumnDefinitions>
-                            <TextBlock FontSize="16" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Top">原料名称</TextBlock>
-                            <TextBlock FontSize="16" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Top">原料位置</TextBlock>
-                            <TextBlock FontSize="16" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Top">原料桶号</TextBlock>
-                            <TextBlock FontSize="16" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Top">原料重量</TextBlock>
+                            <TextBlock
+                                Grid.Column="0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontSize="16">
+                                原料名称
+                            </TextBlock>
+                            <TextBlock
+                                Grid.Column="1"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontSize="16">
+                                原料位置
+                            </TextBlock>
+                            <TextBlock
+                                Grid.Column="2"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontSize="16">
+                                原料桶号
+                            </TextBlock>
+                            <TextBlock
+                                Grid.Column="3"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontSize="16">
+                                原料重量
+                            </TextBlock>
                         </Grid>
-                        <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Hidden" >
-                            <ItemsControl ItemsSource="{Binding RawMaterialsInfo}" Width="548" >
+                        <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Hidden">
+                            <ItemsControl Width="548" ItemsSource="{Binding RawMaterialsInfo}">
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate>
-                                        <Grid x:Name="grb" Height="25" >
+                                        <Grid x:Name="grb" Height="25">
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="2*"/>
-                                                <ColumnDefinition Width="2*"/>
-                                                <ColumnDefinition Width="2*"/>
-                                                <ColumnDefinition Width="2*"/>
+                                                <ColumnDefinition Width="2*" />
+                                                <ColumnDefinition Width="2*" />
+                                                <ColumnDefinition Width="2*" />
+                                                <ColumnDefinition Width="2*" />
                                             </Grid.ColumnDefinitions>
-                                            <TextBlock Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Top" FontSize="20"  Foreground="#FF2AB2E7" Text="{Binding RawMaterialName}"></TextBlock>
-                                            <TextBlock Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Top" FontSize="20"  Foreground="#FF2AB2E7" Text="{Binding RawMaterialLocation}"></TextBlock>
-                                            <TextBlock Grid.Column="2"  HorizontalAlignment="Center" VerticalAlignment="Top" FontSize="20"  Foreground="#FF2AB2E7" Text="{Binding RawMaterialBarrelNum}"></TextBlock>
-                                            <TextBlock Grid.Column="3"  HorizontalAlignment="Center" VerticalAlignment="Top"  FontSize="20"  Foreground="#FF2AB2E7" Text="{Binding RawMaterialWeight}"></TextBlock>
+                                            <TextBlock
+                                                Grid.Column="0"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Top"
+                                                FontSize="20"
+                                                Foreground="#FF2AB2E7"
+                                                Text="{Binding RawMaterialName}" />
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Top"
+                                                FontSize="20"
+                                                Foreground="#FF2AB2E7"
+                                                Text="{Binding RawMaterialLocation}" />
+                                            <TextBlock
+                                                Grid.Column="2"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Top"
+                                                FontSize="20"
+                                                Foreground="#FF2AB2E7"
+                                                Text="{Binding RawMaterialBarrelNum}" />
+                                            <TextBlock
+                                                Grid.Column="3"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Top"
+                                                FontSize="20"
+                                                Foreground="#FF2AB2E7"
+                                                Text="{Binding RawMaterialWeight}" />
                                         </Grid>
                                         <DataTemplate.Triggers>
                                             <Trigger Property="IsMouseOver" Value="true">
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
index e434f984..07b8ba80 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
@@ -45,34 +45,40 @@
 
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="50"/>
+            <RowDefinition Height="50" />
             <RowDefinition />
         </Grid.RowDefinitions>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
             <CheckBox
                 x:Name="NotUseSmallDosing"
                 Margin="0,0,10,0"
+                VerticalAlignment="Center"
+                VerticalContentAlignment="Center"
                 Content="不使用小料站配料"
                 FontFamily="楷体"
-                VerticalAlignment="Center"
+                FontSize="20"
                 Foreground="Aqua"
                 IsChecked="{Binding NotUseSmallDosing}" />
             <CheckBox
                 x:Name="IsUseWindSend"
                 Margin="0,0,10,0"
+                VerticalAlignment="Center"
+                VerticalContentAlignment="Center"
                 Content="使用粉料仓配料"
                 FontFamily="楷体"
-                VerticalAlignment="Center"
+                FontSize="20"
                 Foreground="Aqua"
                 IsChecked="{Binding IsUseWindSendDosing}" />
             <CheckBox
                 x:Name="IsUseStockBin"
+                VerticalAlignment="Center"
+                VerticalContentAlignment="Center"
                 Content="本地小料仓配方配料"
                 FontFamily="楷体"
-                VerticalAlignment="Center"
+                FontSize="20"
                 Foreground="Aqua"
-                IsChecked="{Binding IsUseLocalRecipe}"/>
-            <pry:IcoButton 
+                IsChecked="{Binding IsUseLocalRecipe}" />
+            <pry:IcoButton
                 Width="140"
                 Margin="10"
                 HorizontalAlignment="Right"
@@ -82,7 +88,7 @@
                 Foreground="Aqua"
                 IcoText="&#xe626;"
                 Style="{StaticResource IcoButtonStyle}" />
-            <pry:IcoButton 
+            <pry:IcoButton
                 Width="140"
                 Margin="10"
                 HorizontalAlignment="Right"
@@ -93,7 +99,7 @@
                 IcoText="&#xe626;"
                 Style="{StaticResource IcoButtonStyle}" />
 
-            <pry:IcoButton 
+            <pry:IcoButton
                 Width="140"
                 Margin="10"
                 HorizontalAlignment="Right"
diff --git a/BPASmartClient.JXJFoodSmallStation/View/SiemensRecipeReceiveView.xaml b/BPASmartClient.JXJFoodSmallStation/View/SiemensRecipeReceiveView.xaml
index fff5a9cd..116df357 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/SiemensRecipeReceiveView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/SiemensRecipeReceiveView.xaml
@@ -45,10 +45,10 @@
 
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="50"/>
+            <RowDefinition Height="50" />
             <RowDefinition />
         </Grid.RowDefinitions>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
             <pry:IcoButton
                 Grid.Column="3"
                 Width="140"
@@ -115,7 +115,7 @@
                                         Foreground="#dd000000"
                                         Text="{Binding TrayCode}" />
                                 </WrapPanel>
-                                
+
                                 <Grid
                                     Name="gr"
                                     Grid.Row="2"
diff --git a/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml b/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml
index 6da027df..ab223731 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/StockBinRawMaterialView.xaml
@@ -1,43 +1,58 @@
-<UserControl x:Class="BPASmartClient.JXJFoodSmallStation.View.StockBinRawMaterialView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
-             mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920">
+<UserControl
+    x:Class="BPASmartClient.JXJFoodSmallStation.View.StockBinRawMaterialView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
     <UserControl.DataContext>
         <vm:StockBinRawMaterialViewModel />
     </UserControl.DataContext>
-    
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.JXJFoodSmallStation;component/Resource/MyStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="60" />
-            <RowDefinition Height="40" />
+            <RowDefinition Height="50" />
             <RowDefinition />
         </Grid.RowDefinitions>
         <!--#region 表格标题栏设置-->
         <Grid>
-            <StackPanel HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
+            <StackPanel
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
                 <Button
+                    Width="150"
                     Height="50"
                     Margin="5"
                     Command="{Binding UpdateRawMaterial}"
                     Content="新增数据"
                     FontSize="28"
-                    Foreground="Aqua"
-                    Style="{StaticResource ImageButtonStyle}"  />
+                    Foreground="DeepSkyBlue"
+                    Style="{StaticResource ImageButtonStyle}" />
                 <Button
+                    Width="150"
                     Height="50"
                     Margin="5"
                     Command="{Binding SaveRawMaterialPara}"
                     Content="保存参数"
                     FontSize="28"
-                    Foreground="Aqua"
-                    Style="{StaticResource ImageButtonStyle}"/>
+                    Foreground="DeepSkyBlue"
+                    Style="{StaticResource ImageButtonStyle}" />
             </StackPanel>
-            
+
         </Grid>
         <Grid
             Grid.Row="1"
@@ -45,87 +60,105 @@
             Background="#ff0C255F">
 
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
             </Grid.ColumnDefinitions>
-            <Grid Grid.Column="0">
-                <TextBlock  Text="序号" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"/>
-                <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
-            </Grid>
-            <TextBlock  Grid.Column="1" FontSize="24" Text="料仓位置" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
-            
-            <TextBlock  Grid.Column="2" FontSize="24" Text="原料编号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
-            <TextBlock  Grid.Column="3" FontSize="24" Text="编辑" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+
+            <TextBlock
+                Grid.Column="0"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="序号" />
+
+            <TextBlock
+                Grid.Column="1"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="料仓位置" />
+
+            <TextBlock
+                Grid.Column="2"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="原料编号" />
+
+            <TextBlock
+                Grid.Column="3"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="编辑" />
+
+            <Border
+                Grid.Column="0"
+                Grid.ColumnSpan="4"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,1,1,1" />
+            <Border
+                Grid.Column="1"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,0,1,0" />
+            <Border
+                Grid.Column="3"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,0,1,0" />
+
+
         </Grid>
         <Grid Grid.Row="2">
-            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"  >
-                <ItemsControl ItemsSource="{Binding RawMaterialInfo}" Foreground="Aqua">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                <ItemsControl Foreground="DeepSkyBlue" ItemsSource="{Binding RawMaterialInfo}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <Grid Name="gr" >
+                            <Grid Name="gr">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition />
                                     <ColumnDefinition />
                                     <ColumnDefinition />
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
-                                <Grid Grid.Column="0" Margin="5">
-                                    <TextBlock
-                                        FontSize="16"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Text="{Binding  RawMaterialCount}" />
-                                    <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
-                                    
-                                </Grid>
-                                <Grid Grid.Column="1" Margin="5">
-                                    <TextBox
-                                        Width="50"
-                                        FontSize="16"
-                                        TextAlignment="Center"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Text="{Binding  RawMaterialLocation}" />
-                                    <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
-
-                                </Grid>
-                                <Grid Grid.Column="2" Margin="5">
-                                    <TextBox
-                                        Width="50"
-                                        FontSize="16"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center" 
-                                        Text="{Binding  RawMaterialName}" />
-                                    <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE"  />
-                                </Grid>
-                                <Grid Grid.Column="3">
-                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                        <pry:IcoButton
-                                            Margin="3,4,4,0"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            Background="#11F53F62"
-                                            BorderThickness="0"
-                                            Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                            CommandParameter="{Binding RawMaterialLocation}"
-                                            Content="删除"
-                                            EnterBackground="#22F53F62"
-                                            Foreground="#FFF53F62"
-                                            IcoText="&#xe68e;"
-                                            Style="{StaticResource IcoButtonStyle}" />
-                                    </StackPanel>
-                                    
-                                </Grid>
+
+                                <TextBlock
+                                    Grid.Column="0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    Text="{Binding RawMaterialCount}" />
+
+                                <TextBox
+                                    Grid.Column="1"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding RawMaterialLocation}" />
+
+                                <TextBox
+                                    Grid.Column="2"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding RawMaterialName}" />
+
+                                <Button
+                                    Grid.Column="3"
+                                    Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                    CommandParameter="{Binding RawMaterialLocation}"
+                                    Content="删除"
+                                    FontSize="16"
+                                    Style="{StaticResource ControlButtonStyle}" />
+
+                                <Border
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="4"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,1" />
+                                <Border
+                                    Grid.Column="1"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,0" />
+                                <Border
+                                    Grid.Column="3"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,0" />
                             </Grid>
-                            
+
                             <DataTemplate.Triggers>
                                 <Trigger Property="IsMouseOver" Value="true">
                                     <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
diff --git a/BPASmartClient.JXJFoodSmallStation/View/SystemParView.xaml b/BPASmartClient.JXJFoodSmallStation/View/SystemParView.xaml
index ba3465e3..79c43cc1 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/SystemParView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/SystemParView.xaml
@@ -131,8 +131,8 @@
         </Grid.RowDefinitions>
 
         <Grid.ColumnDefinitions>
-            <ColumnDefinition></ColumnDefinition>
-            <ColumnDefinition></ColumnDefinition>
+            <ColumnDefinition />
+            <ColumnDefinition />
         </Grid.ColumnDefinitions>
 
         <Button
@@ -154,70 +154,144 @@
             Content="下发参数"
             FontSize="24"
             Style="{StaticResource ImageButtonStyle}" />
-        <StackPanel Orientation="Vertical"  HorizontalAlignment="Left" Grid.Row="1"
-            Margin="10,0,10,0" >
+        <StackPanel
+            Grid.Row="1"
+            Margin="10,0,10,0"
+            HorizontalAlignment="Left"
+            Orientation="Vertical">
             <CheckBox
                 Margin="0,10,10,0"
+                VerticalAlignment="Center"
                 Content="西门子设备连接"
                 FontFamily="楷体"
-                VerticalAlignment="Center"
                 FontSize="20"
                 Foreground="Aqua"
                 IsChecked="{Binding SiemensConnect}" />
             <CheckBox
                 Margin="0,10,10,0"
+                VerticalAlignment="Center"
                 Content="粉料仓设备连接"
                 FontFamily="楷体"
                 FontSize="20"
-                VerticalAlignment="Center"
                 Foreground="Aqua"
-                IsChecked="{Binding WindSendConnect}"/>
+                IsChecked="{Binding WindSendConnect}" />
             <CheckBox
                 Margin="0,10,10,0"
+                VerticalAlignment="Center"
                 Content="小料站产线PLC设备连接"
                 FontFamily="楷体"
                 FontSize="20"
-                VerticalAlignment="Center"
                 Foreground="Aqua"
-                IsChecked="{Binding HKPlcConnect}"/>
+                IsChecked="{Binding HKPlcConnect}" />
 
         </StackPanel>
-        <Grid Grid.Row="1" Grid.Column="1" VerticalAlignment="Top">
+        <Grid
+            Grid.Row="1"
+            Grid.Column="1"
+            VerticalAlignment="Top">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="37*" ></ColumnDefinition>
-                <ColumnDefinition Width="163*"/>
+                <ColumnDefinition Width="37*" />
+                <ColumnDefinition Width="163*" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-                <RowDefinition></RowDefinition>
-                <RowDefinition></RowDefinition>
-                <RowDefinition></RowDefinition>
-                <RowDefinition></RowDefinition>
-                <RowDefinition></RowDefinition>
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
             </Grid.RowDefinitions>
             <WrapPanel Grid.ColumnSpan="2" Margin="0,0,0,38">
-                <TextBlock Margin="10" FontSize="16" Foreground="Aqua" Text="调速电机速度(进桶侧)" />
-                <TextBox Width="50" Margin="10" FontSize="16"  Text="{Binding AxisLoadSpeed}"/>
-                <TextBlock  FontSize="16" Foreground="Aqua" Text="" />
+                <TextBlock
+                    Margin="10"
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="调速电机速度(进桶侧)" />
+                <TextBox
+                    Width="50"
+                    Margin="10"
+                    FontSize="16"
+                    Text="{Binding AxisLoadSpeed}" />
+                <TextBlock
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="" />
             </WrapPanel>
-            <WrapPanel Grid.ColumnSpan="2" Margin="0,42,0,75" Grid.RowSpan="2">
-                <TextBlock  Margin="10" FontSize="16" Foreground="Aqua" Text="调速电机速度(过渡侧)" />
-                <TextBox Width="50" Margin="10" FontSize="16" Text="{Binding AxisMidSpeed}" />
-                <TextBlock  FontSize="16" Foreground="Aqua" Text="" />
+            <WrapPanel
+                Grid.RowSpan="2"
+                Grid.ColumnSpan="2"
+                Margin="0,42,0,75">
+                <TextBlock
+                    Margin="10"
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="调速电机速度(过渡侧)" />
+                <TextBox
+                    Width="50"
+                    Margin="10"
+                    FontSize="16"
+                    Text="{Binding AxisMidSpeed}" />
+                <TextBlock
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="" />
             </WrapPanel>
-            <WrapPanel Grid.Row="1" Grid.ColumnSpan="2" Margin="0,5,0,33">
-                <TextBlock  Margin="10" FontSize="16" Foreground="Aqua" Text="调速电机速度(出桶侧)" />
-                <TextBox Width="50" Margin="10" FontSize="16" Text="{Binding AxisUnLoadSpeed}" />
-                <TextBlock  FontSize="16" Foreground="Aqua" Text="" />
+            <WrapPanel
+                Grid.Row="1"
+                Grid.ColumnSpan="2"
+                Margin="0,5,0,33">
+                <TextBlock
+                    Margin="10"
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="调速电机速度(出桶侧)" />
+                <TextBox
+                    Width="50"
+                    Margin="10"
+                    FontSize="16"
+                    Text="{Binding AxisUnLoadSpeed}" />
+                <TextBlock
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="" />
             </WrapPanel>
-            <WrapPanel Grid.Row="1" Grid.ColumnSpan="2" Margin="0,47,0,71" Grid.RowSpan="2">
-                <TextBlock  Margin="10" FontSize="16" Foreground="Aqua" Text="伺服1速度(进桶侧)" />
-                <TextBox Width="50" Margin="10" FontSize="16" Text="{Binding Axis1Speed}" />
-                <TextBlock  FontSize="16" Foreground="Aqua" Text="" />
+            <WrapPanel
+                Grid.Row="1"
+                Grid.RowSpan="2"
+                Grid.ColumnSpan="2"
+                Margin="0,47,0,71">
+                <TextBlock
+                    Margin="10"
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="伺服1速度(进桶侧)" />
+                <TextBox
+                    Width="50"
+                    Margin="10"
+                    FontSize="16"
+                    Text="{Binding Axis1Speed}" />
+                <TextBlock
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="" />
             </WrapPanel>
-            <WrapPanel Grid.Row="2" Grid.ColumnSpan="2" Margin="0,9,0,28" >
-                <TextBlock Margin="10" FontSize="16" Foreground="Aqua" Text="伺服2速度(出桶侧)" />
-                <TextBox Width="50" Margin="10" FontSize="16" Text="{Binding Axis2Speed}" />
-                <TextBlock  FontSize="16" Foreground="Aqua" Text="" />
+            <WrapPanel
+                Grid.Row="2"
+                Grid.ColumnSpan="2"
+                Margin="0,9,0,28">
+                <TextBlock
+                    Margin="10"
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="伺服2速度(出桶侧)" />
+                <TextBox
+                    Width="50"
+                    Margin="10"
+                    FontSize="16"
+                    Text="{Binding Axis2Speed}" />
+                <TextBlock
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="" />
             </WrapPanel>
         </Grid>
     </Grid>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml b/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml
index 85e2a6f7..0cdbad63 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/WindSendParView.xaml
@@ -6,8 +6,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:BPASmartClient.JXJFoodSmallStation.View"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
     xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
     d:DesignHeight="1080"
     d:DesignWidth="1920"
     mc:Ignorable="d">
@@ -16,6 +16,14 @@
         <vm:WindSendParViewModel />
     </UserControl.DataContext>
 
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.JXJFoodSmallStation;component/Resource/MyStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="60" />
@@ -24,7 +32,10 @@
         </Grid.RowDefinitions>
         <!--#region 表格标题栏设置-->
         <Grid>
-            <StackPanel HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
+            <StackPanel
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
                 <!--<pry:IcoButton
                     Margin="10"
                     Command="{Binding UpdateRawMaterial}"
@@ -32,13 +43,22 @@
                     FontSize="28"
                     Foreground="Aqua"
                     Style="{StaticResource IcoButtonStyle}" />-->
-                <pry:IcoButton
+                <Button
+                    Width="150"
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding SaveRawMaterialPara}"
+                    Content="保存参数"
+                    FontSize="28"
+                    Foreground="DeepSkyBlue"
+                    Style="{StaticResource ImageButtonStyle}" />
+                <!--<pry:IcoButton
                     Margin="10"
                     Command="{Binding SaveRawMaterialPara}"
                     Content="保存参数"
                     FontSize="28"
                     Foreground="Aqua"
-                    Style="{StaticResource IcoButtonStyle}" />
+                    Style="{StaticResource IcoButtonStyle}" />-->
             </StackPanel>
 
         </Grid>
@@ -48,79 +68,141 @@
             Background="#ff0C255F">
 
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
             </Grid.ColumnDefinitions>
-            <Grid Grid.Column="0">
-                <TextBlock  Text="序号" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"/>
-                <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
-            </Grid>
-            <TextBlock  Grid.Column="1" FontSize="24" Text="料仓位置" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
 
-            <TextBlock  Grid.Column="2" FontSize="24" Text="原料编号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <TextBlock
+                Grid.Column="0"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="序号" />
+
+            <TextBlock
+                Grid.Column="1"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="料仓位置" />
+
+            <TextBlock
+                Grid.Column="2"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="原料编号" />
+
+            <TextBlock
+                Grid.Column="3"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="原料名称" />
 
-            <TextBlock  Grid.Column="3" FontSize="24" Text="原料名称" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <Border
+                Grid.Column="0"
+                Grid.ColumnSpan="4"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,1,1,1" />
+            <Border
+                Grid.Column="1"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,0,1,0" />
+            <Border
+                Grid.Column="3"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,0,1,0" />
         </Grid>
         <Grid Grid.Row="2">
-            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"  >
-                <ItemsControl ItemsSource="{Binding WindSendRawMaterial}" Foreground="Aqua">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                <ItemsControl Foreground="DeepSkyBlue" ItemsSource="{Binding WindSendRawMaterial}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <Grid Name="gr" >
+                            <Grid Name="gr">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition />
                                     <ColumnDefinition />
                                     <ColumnDefinition />
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
-                                <Grid Grid.Column="0" Margin="5">
+
+                                <TextBlock
+                                    Grid.Column="0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    Text="{Binding Location}" />
+
+                                <TextBlock
+                                    Grid.Column="1"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    Text="{Binding Location}" />
+
+                                <TextBox
+                                    Grid.Column="2"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding RawMaterialName}" />
+
+                                <TextBlock
+                                    Grid.Column="3"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    Text="{Binding RawMaterialChineseName}" />
+
+                                <Border
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="4"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,1" />
+                                <Border
+                                    Grid.Column="1"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,0" />
+                                <Border
+                                    Grid.Column="3"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,0" />
+
+                                <!--<Grid Grid.Column="0" Margin="5">
                                     <TextBlock
-                                        FontSize="16"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
-                                        Text="{Binding  Location}" />
-                                    <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
+                                        FontSize="16"
+                                        Text="{Binding Location}" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
 
                                 </Grid>
                                 <Grid Grid.Column="1" Margin="5">
                                     <TextBlock
                                         Width="50"
-                                        FontSize="16"
-                                        TextAlignment="Center"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
-                                        Text="{Binding  Location}" />
-                                    <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
+                                        FontSize="16"
+                                        Text="{Binding Location}"
+                                        TextAlignment="Center" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
 
                                 </Grid>
                                 <Grid Grid.Column="2" Margin="5">
                                     <TextBox
                                         Name="name"
                                         Width="50"
-                                        FontSize="16"
                                         HorizontalAlignment="Center"
-                                        VerticalAlignment="Center" 
-                                        Text="{Binding  RawMaterialName}"/>
-                                    <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE"  />
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding RawMaterialName}" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                 </Grid>
                                 <Grid Grid.Column="3" Margin="5">
                                     <TextBlock
-                                        FontSize="16"
                                         HorizontalAlignment="Center"
-                                        VerticalAlignment="Center" 
-                                        Text="{Binding  RawMaterialChineseName}" />
-                                    <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE"  />
-                                </Grid>
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding RawMaterialChineseName}" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
+                                </Grid>-->
                             </Grid>
                             <DataTemplate.Triggers>
                                 <Trigger Property="IsMouseOver" Value="true">
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
index c3e8859e..5f35d0e9 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
@@ -22,19 +22,21 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         {
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                SystemMode = GVL_SmallStation.GetInstance.PlcSystemMode ? "手动" : "自动";
-                if (GVL_SmallStation.GetInstance.PlcSystemMode) ManualMode = true;
-                else AutoModeStatus = true;
+                PlcSystemMode = GVL_SmallStation.GetInstance.PlcSystemMode;
+                //SystemMode = GVL_SmallStation.GetInstance.PlcSystemMode ? "手动" : "自动";
+                //if (GVL_SmallStation.GetInstance.PlcSystemMode) ManualMode = true;
+                //else AutoModeStatus = true;
                 if (GVL_SmallStation.GetInstance.PlcSystemIsAutoRun)
                 {
-                    if (GVL_SmallStation.GetInstance.PlcSystemIsPause)
-                    {
-                        SystemStatus = "暂停";
-                    }
-                    else
-                    {
-                        SystemStatus = "运行";
-                    }
+                    SystemStatus = GVL_SmallStation.GetInstance.PlcSystemIsPause ? "暂停" : "运行";
+                    //if (GVL_SmallStation.GetInstance.PlcSystemIsPause)
+                    //{
+                    //    SystemStatus = "暂停";
+                    //}
+                    //else
+                    //{
+                    //    SystemStatus = "运行";
+                    //}
                 }
                 else
                 {
@@ -288,11 +290,11 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             });
             DebugMode = new RelayCommand(() =>
             {
-                ActionManage.GetInstance.Send("SystemDebugMode");
+                // ActionManage.GetInstance.Send("SystemDebugMode");
             });
             AutoMode = new RelayCommand(() =>
             {
-                ActionManage.GetInstance.Send("SystemAutoMode");
+                // ActionManage.GetInstance.Send("SystemAutoMode");
             });
         }
 
@@ -341,24 +343,73 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public RelayCommand SystemStopCommand { get; set; }
         public RelayCommand SystemPauseCommand { get; set; }
 
-
-
         public RelayCommand SystemResetCommand { get; set; }
 
         public RelayCommand AutoMode { get; set; }
         public RelayCommand DebugMode { get; set; }
 
+        /// <summary>
+        /// 系统模式改变
+        /// </summary>
+        public static bool PlcSystemMode
+        {
+            get { return _mPlcSystemMode; }
+            set
+            {
+                if (_mPlcSystemMode != value || string.IsNullOrEmpty(SystemMode))
+                {
+                    _mPlcSystemMode = value;
+                    SystemMode = value ? "手动" : "自动";
+                    if (value) ManualMode = true;
+                    else AutoModeStatus = true;
+                }
 
-        public bool AutoModeStatus { get { return _mAutoModeStatus; } set { _mAutoModeStatus = value; OnPropertyChanged(); } }
-        private bool _mAutoModeStatus;
-
-        public bool ManualMode { get { return _mManualMode; } set { _mManualMode = value; OnPropertyChanged(); } }
-        private bool _mManualMode;
+            }
+        }
+        private static bool _mPlcSystemMode;
 
 
+        /// <summary>
+        /// 自动模式
+        /// </summary>
+        public static bool AutoModeStatus
+        {
+            get { return _mAutoModeStatus; }
+            set
+            {
+                if (_mAutoModeStatus != value || (!_mAutoModeStatus && !_mManualMode))
+                {
+                    if (value)
+                        ProcessControl.GetInstance.HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.1", false);
+                    _mAutoModeStatus = value;
+                    OnStaticPropertyChanged();
+                }
+            }
+        }
+        private static bool _mAutoModeStatus;
 
+        /// <summary>
+        /// 手动模式
+        /// </summary>
+        public static bool ManualMode
+        {
+            get { return _mManualMode; }
+            set
+            {
+                if (_mManualMode != value || (!_mAutoModeStatus && !_mManualMode))
+                {
+                    if (value)
+                        ProcessControl.GetInstance.HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.1", true);
+                    _mManualMode = value;
+                    OnStaticPropertyChanged();
+                }
+            }
+        }
+        private static bool _mManualMode;
     }
 
+
+
     public class CylinderModel : ObservableObject
     {
         public bool LeftTog { get { return _mLeftTog; } set { _mLeftTog = value; OnPropertyChanged(); } }

From a6ddd750454a62c46d222f9d7f1658ef6fd8aed2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Fri, 28 Apr 2023 16:19:15 +0800
Subject: [PATCH 37/96] =?UTF-8?q?=E5=B0=8F=E9=85=8D=E6=96=99=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Model/MessageNotify.cs              |  36 +-
 .../Pages/Model/RecipeCompleteLog.cs          |  22 ++
 .../Pages/View/RecipeCompleteView.xaml        | 340 ++++++++++++++++++
 .../Pages/View/RecipeCompleteView.xaml.cs     |  28 ++
 .../Pages/View/RunLogView.xaml                |   7 +-
 .../ViewModel/RecipeCompleteViewModel.cs      | 126 +++++++
 .../App.xaml.cs                               |   8 +
 .../Model/ProcessControl.cs                   |   2 +
 .../Model/RawMaterial/DeviceInquire.cs        |   5 +-
 9 files changed, 568 insertions(+), 6 deletions(-)
 create mode 100644 BPASmartClient.CustomResource/Pages/Model/RecipeCompleteLog.cs
 create mode 100644 BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml
 create mode 100644 BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml.cs
 create mode 100644 BPASmartClient.CustomResource/Pages/ViewModel/RecipeCompleteViewModel.cs

diff --git a/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs b/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs
index 4e15c59e..b240c0c5 100644
--- a/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs
+++ b/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs
@@ -20,6 +20,7 @@ namespace BPASmartClient.CustomResource.Pages.Model
         public static readonly object runLock = new object();
         public static readonly object userlock = new object();
         public static readonly object alarmlock = new object();
+        public static readonly object recipeLogslock = new object();
         private MessageNotify() { }
 
         public Action<string> UserLog { get; set; }
@@ -28,17 +29,46 @@ namespace BPASmartClient.CustomResource.Pages.Model
 
         public Action<string> AlarmLog { get; set; }
 
-        public ObservableCollection<RunLog> runLogs { get; set; } = new ObservableCollection<RunLog>();
+        public Action<string> RecipeCompleteLogs { get; set; }
 
-        public ObservableCollection<UserLog> userLogs { get; set; } = new ObservableCollection<UserLog>();
+        public ObservableCollection<RunLog> runLogs { get; set; } = new();
 
-        public ObservableCollection<Alarm> alarmLogs { get; set; } = new ObservableCollection<Alarm>();
+        public ObservableCollection<UserLog> userLogs { get; set; } = new();
+
+        public ObservableCollection<Alarm> alarmLogs { get; set; } = new();
+
+        public ObservableCollection<RecipeCompleteLog> recipeLogs { get; set; } = new();
 
         public void LogSave()
         {
             Sqlite<UserLog>.GetInstance.Save();
             Sqlite<RunLog>.GetInstance.Save();
             Sqlite<Alarm>.GetInstance.Save();
+            Sqlite<RecipeCompleteLog>.GetInstance.Save();
+        }
+
+        public void ShowRecipeLog(string info)
+        {
+            lock (recipeLogslock)
+            {
+                try
+                {
+                    RecipeCompleteLog runLog = new RecipeCompleteLog()
+                    {
+                        Date = DateTime.Now.ToString("yyyy-MM-dd"),
+                        Time = DateTime.Now.ToString("HH:mm:ss"),
+                        RecipeName = info
+                    };
+                    Sqlite<RecipeCompleteLog>.GetInstance.Base.Add(runLog);
+                    Application.Current.Dispatcher.Invoke(new Action(() => { recipeLogs.Insert(0, runLog); }));
+                    RecipeCompleteLogs?.Invoke(info);
+                }
+                catch (Exception)
+                {
+
+                    // throw;
+                }
+            }
         }
 
         public void ShowUserLog(string info)
diff --git a/BPASmartClient.CustomResource/Pages/Model/RecipeCompleteLog.cs b/BPASmartClient.CustomResource/Pages/Model/RecipeCompleteLog.cs
new file mode 100644
index 00000000..efbeb527
--- /dev/null
+++ b/BPASmartClient.CustomResource/Pages/Model/RecipeCompleteLog.cs
@@ -0,0 +1,22 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.CustomResource.Pages.Model
+{
+    public class RecipeCompleteLog : ObservableObject
+    {
+        [Key]
+        public int Id { get; set; }
+
+        public string Date { get; set; }
+
+        public string Time { get; set; }
+
+        public string RecipeName { get; set; }
+    }
+}
diff --git a/BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml b/BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml
new file mode 100644
index 00000000..db6b3f59
--- /dev/null
+++ b/BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml
@@ -0,0 +1,340 @@
+<UserControl
+    x:Class="BPASmartClient.CustomResource.Pages.View.RecipeCompleteView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.CustomResource.Pages.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.CustomResource.Pages.ViewModel"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <UserControl.DataContext>
+        <vm:RecipeCompleteViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <!--<convert:TextDisplayConvert x:Key="textDisplayConvert" />
+                    <convert:IsEnableConvert x:Key="isEnableConvert" />
+                    <convert:AnalogAlarmConvert x:Key="analogAlarmConvert" />
+                    <convert:DiscreteAlarmConvert x:Key="discreteAlarmConvert" />
+                    <convert:AlarmTypeTextConvert x:Key="alarmTypeTextConvert" />-->
+                    <SolidColorBrush x:Key="BorderSolid" Color="#5523CACA" />
+                    <SolidColorBrush x:Key="FontColor" Color="#FF2AB2E7" />
+                    <SolidColorBrush x:Key="TitleFontColor" Color="#FF2AB2E7" />
+                    <SolidColorBrush x:Key="CursorColor" Color="Aqua" />
+                    <SolidColorBrush x:Key="TitleBorderColor" Color="#332AB2E7" />
+
+                    <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="18" />
+                        <Setter Property="Foreground" Value="{StaticResource TextBlockForeground}" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                        <Setter Property="HorizontalAlignment" Value="Center" />
+                    </Style>
+
+                    <Style x:Key="TextBoxStyle" TargetType="TextBox">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="22" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Foreground" Value="{StaticResource TextBlockForeground}" />
+                        <Setter Property="BorderBrush" Value="#FF23CACA" />
+                        <Setter Property="CaretBrush" Value="Aqua" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+
+                    <Style x:Key="DataTextBlockStyle" TargetType="TextBlock">
+                        <Setter Property="HorizontalAlignment" Value="Center" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Foreground" Value="#FF2BD06F" />
+                        <Setter Property="FontSize" Value="14" />
+                    </Style>
+
+                    <ControlTemplate x:Key="ButTemplate" TargetType="Button">
+                        <Border
+                            x:Name="br"
+                            Background="Transparent"
+                            BorderBrush="#FF19B7EC"
+                            BorderThickness="2">
+                            <StackPanel
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Orientation="Horizontal">
+                                <ContentControl
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding Content}"
+                                    Foreground="{TemplateBinding Foreground}" />
+                            </StackPanel>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="br" Property="Background" Value="#2219B7EC" />
+                            </Trigger>
+
+                            <Trigger Property="IsPressed" Value="true">
+                                <Setter TargetName="br" Property="Background" Value="#2219B7EC" />
+                            </Trigger>
+
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50" />
+            <RowDefinition Height="30" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <StackPanel
+            Margin="0,8"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal">
+
+            <DatePicker
+                Background="Transparent"
+                BorderBrush="#aa3aa7f3"
+                BorderThickness="2"
+                SelectedDate="{Binding StartDateTime}"
+                Style="{StaticResource PickerStyle}"
+                Text="请输入开始时间"
+                Visibility="{Binding IsVisibility}" />
+
+            <DatePicker
+                Margin="20,0,20,0"
+                Background="Transparent"
+                BorderBrush="#aa3aa7f3"
+                BorderThickness="2"
+                SelectedDate="{Binding EndDateTime}"
+                Style="{StaticResource PickerStyle}"
+                Text="请输入结束时间"
+                Visibility="{Binding IsVisibility}" />
+
+            <Button
+                Width="140"
+                Height="30"
+                Background="#FF19B7EC"
+                Command="{Binding ControlCommand}"
+                Content="{Binding ControlButText}"
+                FontFamily="楷体"
+                FontSize="18"
+                Template="{StaticResource ButTemplate}"
+                Visibility="{Binding IsVisibility}">
+                <Button.Foreground>
+                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                        <GradientStop Color="#FFBB662A" />
+                        <GradientStop Offset="1" Color="White" />
+                    </LinearGradientBrush>
+                </Button.Foreground>
+            </Button>
+
+            <Button
+                Width="140"
+                Height="30"
+                Margin="20,0,0,0"
+                Background="#FF19B7EC"
+                Command="{Binding SwitchCommand}"
+                Content="{Binding ButContent}"
+                FontFamily="楷体"
+                FontSize="18"
+                Template="{StaticResource ButTemplate}">
+                <Button.Foreground>
+                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                        <GradientStop Color="#FFBB662A" />
+                        <GradientStop Offset="1" Color="White" />
+                    </LinearGradientBrush>
+                </Button.Foreground>
+            </Button>
+
+        </StackPanel>
+
+        <!--#region 表格标题栏设置-->
+        <Grid
+            Grid.Row="1"
+            Margin="0,0,17,0"
+            Background="#ff0C255F">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="0.2*" />
+                <ColumnDefinition Width="0.2*" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock
+                Grid.Column="0"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="{StaticResource TitleFontColor}"
+                Text="日期" />
+
+            <Grid Grid.Column="1">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Foreground="{StaticResource TitleFontColor}"
+                    Text="时间" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>
+
+            <TextBlock
+                Grid.Column="2"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="{StaticResource TitleFontColor}"
+                Text="配方名称" />
+
+            <!--<Grid Grid.Column="3">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Foreground="{StaticResource TitleFontColor}"
+                    Text="报警信息" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>-->
+
+            <!--<TextBlock
+                Grid.Column="4"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="{StaticResource TitleFontColor}"
+                Text="报警值" />
+
+            <Grid Grid.Column="5">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Foreground="{StaticResource TitleFontColor}"
+                    Text="报警等级" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>-->
+        </Grid>
+        <!--#endregion-->
+
+        <!--#region 表格数据显示-->
+        <ScrollViewer
+            Grid.Row="2"
+            HorizontalScrollBarVisibility="Hidden"
+            VerticalScrollBarVisibility="Visible">
+
+            <Grid>
+                <!--#region 实时报警信息-->
+                <ItemsControl ItemsSource="{Binding Log}" Visibility="{Binding CurrentDataVis}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid x:Name="gr" Height="30">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="0.2*" />
+                                    <ColumnDefinition Width="0.2*" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+
+                                <TextBlock
+                                    Grid.Column="0"
+                                    Style="{StaticResource DataTextBlockStyle}"
+                                    Text="{Binding Date}" />
+
+                                <Grid Grid.Column="1">
+                                    <TextBlock Style="{StaticResource DataTextBlockStyle}" Text="{Binding Time}" />
+                                    <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
+                                </Grid>
+
+                                <TextBlock
+                                    Grid.Column="2"
+                                    Margin="10,0,0,0"
+                                    HorizontalAlignment="Left"
+                                    Style="{StaticResource DataTextBlockStyle}"
+                                    Text="{Binding RunLogInfo}"
+                                    TextWrapping="Wrap" />
+
+                                <Border
+                                    Grid.ColumnSpan="6"
+                                    BorderBrush="{StaticResource BorderSolid}"
+                                    BorderThickness="1" />
+
+                            </Grid>
+
+                            <DataTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                </Trigger>
+                            </DataTemplate.Triggers>
+
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+                <!--#endregion-->
+
+                <!--#region  历史报警信息-->
+                <ItemsControl ItemsSource="{Binding HistoryRunLog}" Visibility="{Binding HistoryDataVis}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid x:Name="gr" Height="30">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="0.2*" />
+                                    <ColumnDefinition Width="0.2*" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+
+                                <TextBlock
+                                    Grid.Column="0"
+                                    Style="{StaticResource DataTextBlockStyle}"
+                                    Text="{Binding Date}" />
+
+                                <Grid Grid.Column="1">
+                                    <TextBlock Style="{StaticResource DataTextBlockStyle}" Text="{Binding Time}" />
+                                    <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
+                                </Grid>
+
+                                <TextBlock
+                                    Grid.Column="2"
+                                    Margin="10,0,0,0"
+                                    HorizontalAlignment="Left"
+                                    Style="{StaticResource DataTextBlockStyle}"
+                                    Text="{Binding RunLogInfo}" />
+
+                                <Border
+                                    Grid.ColumnSpan="6"
+                                    BorderBrush="{StaticResource BorderSolid}"
+                                    BorderThickness="1" />
+
+                            </Grid>
+
+                            <DataTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                </Trigger>
+                            </DataTemplate.Triggers>
+
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+                <!--#endregion-->
+            </Grid>
+        </ScrollViewer>
+        <!--#endregion-->
+
+
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml.cs b/BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml.cs
new file mode 100644
index 00000000..105c3e7b
--- /dev/null
+++ b/BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.CustomResource.Pages.View
+{
+    /// <summary>
+    /// RecipeCompleteView.xaml 的交互逻辑
+    /// </summary>
+    public partial class RecipeCompleteView : UserControl
+    {
+        public RecipeCompleteView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml b/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
index 3067d1df..c032a4eb 100644
--- a/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
+++ b/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
@@ -158,7 +158,10 @@
         </StackPanel>
 
         <!--#region 表格标题栏设置-->
-        <Grid Grid.Row="1" Background="#ff0C255F">
+        <Grid
+            Grid.Row="1"
+            Margin="0,0,17,0"
+            Background="#ff0C255F">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="0.2*" />
                 <ColumnDefinition Width="0.2*" />
@@ -264,7 +267,7 @@
                                     HorizontalAlignment="Left"
                                     Style="{StaticResource DataTextBlockStyle}"
                                     Text="{Binding RunLogInfo}"
-                                    TextWrapping="Wrap"/>
+                                    TextWrapping="Wrap" />
 
                                 <Border
                                     Grid.ColumnSpan="6"
diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/RecipeCompleteViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/RecipeCompleteViewModel.cs
new file mode 100644
index 00000000..787bb5b7
--- /dev/null
+++ b/BPASmartClient.CustomResource/Pages/ViewModel/RecipeCompleteViewModel.cs
@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System.Collections.ObjectModel;
+using BPASmartClient.CustomResource.Pages.Model;
+using System.Windows;
+using BPASmartClient.Helper;
+
+namespace BPASmartClient.CustomResource.Pages.ViewModel
+{
+    public class RecipeCompleteViewModel : ObservableObject
+    {
+        public RecipeCompleteViewModel()
+        {
+            Sqlite<RecipeCompleteLog>.GetInstance.Save();
+            SwitchCommand = new RelayCommand(() =>
+            {
+                if (ButContent == "历史日志")
+                {
+                    GetHistoryRunLog();
+                    CurrentDataVis = Visibility.Hidden;
+                    HistoryDataVis = Visibility.Visible;
+                    IsVisibility = Visibility.Visible;
+                    ControlButText = "开始查询";
+                    ButContent = "实时日志";
+                    return;
+                }
+
+                if (ButContent == "实时日志")
+                {
+                    HistoryDataVis = Visibility.Hidden;
+                    CurrentDataVis = Visibility.Visible;
+                    IsVisibility = Visibility.Hidden;
+                    ButContent = "历史日志";
+                    return;
+                }
+
+            });
+
+            ControlCommand = new RelayCommand(() =>
+            {
+
+                if (ControlButText == "报警复位") return;
+                if (ControlButText == "开始查询")
+                {
+                    var lists = Sqlite<RecipeCompleteLog>.GetInstance.GetData();
+                    var res = lists.Where(p => Convert.ToDateTime(p.Date) >= StartDateTime && Convert.ToDateTime(p.Date) <= EndDateTime).ToList();
+                    if (res != null)
+                    {
+                        HistoryRunLog.Clear();
+                        foreach (var item in res)
+                        {
+                            HistoryRunLog.Add(item);
+                        }
+                    }
+                }
+
+            });
+        }
+
+        private void GetHistoryRunLog()
+        {
+            var data = Sqlite<RecipeCompleteLog>.GetInstance.GetData();
+            if (data != null)
+            {
+                HistoryRunLog.Clear();
+                foreach (var item in data)
+                {
+                    int day = DateTime.Now.Subtract(Convert.ToDateTime(item.Date)).Days;
+                    if (day == 0)
+                    {
+                        HistoryRunLog.Add(item);
+                    }
+                }
+            }
+        }
+
+        public RelayCommand SwitchCommand { get; set; }
+
+        public RelayCommand ControlCommand { get; set; }
+
+        public Visibility CurrentDataVis { get { return _mCurrentDataVis; } set { _mCurrentDataVis = value; OnPropertyChanged(); } }
+        private Visibility _mCurrentDataVis = Visibility.Visible;
+
+        public Visibility HistoryDataVis { get { return _mHistoryDataVis; } set { _mHistoryDataVis = value; OnPropertyChanged(); } }
+        private Visibility _mHistoryDataVis = Visibility.Hidden;
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        public Visibility IsVisibility { get { return _mIsVisibility; } set { _mIsVisibility = value; OnPropertyChanged(); } }
+        private Visibility _mIsVisibility = Visibility.Hidden;
+
+        /// <summary>
+        /// 文字显示
+        /// </summary>
+        public string ButContent { get { return _mButContent; } set { _mButContent = value; OnPropertyChanged(); } }
+        private string _mButContent = "历史日志";
+
+        /// <summary>
+        /// 控制按钮文本显示
+        /// </summary>
+        public string ControlButText { get { return _mControlButText; } set { _mControlButText = value; OnPropertyChanged(); } }
+        private string _mControlButText = "报警复位";
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime StartDateTime { get { return _mStartDateTime; } set { _mStartDateTime = value; OnPropertyChanged(); } }
+        private DateTime _mStartDateTime = DateTime.Now;
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime EndDateTime { get { return _mEndDateTime; } set { _mEndDateTime = value; OnPropertyChanged(); } }
+        private DateTime _mEndDateTime = DateTime.Now;
+
+        public ObservableCollection<RecipeCompleteLog> HistoryRunLog { get; set; } = new ObservableCollection<RecipeCompleteLog>();
+
+        public ObservableCollection<RecipeCompleteLog> Log { get; set; } = MessageNotify.GetInstance.recipeLogs;
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
index 8348228b..f047bd73 100644
--- a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
@@ -224,6 +224,14 @@ namespace BPASmartClient.JXJFoodSmallStation
                 ToggleWindowPath = "Pages.View.RunLogView"
             });
 
+            InfoLog.Add(new SubMenumodel()
+            {
+                SubMenuName = "配方日志",
+                SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.RecipeCompleteView"
+            });
+
             InfoLog.Add(new SubMenumodel()
             {
                 SubMenuName = "报警记录",
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index 08fbc907..7646c814 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -898,10 +898,12 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                             SiemensDevice.Siemens_PLC_S7.WriteClass<XL_Finish_DB>(RecipeFinishInfo, 2261);
 
                                             MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据反馈给西门子");
+                                            MessageNotify.GetInstance.ShowRecipeLog(res.RecipeName);
                                         }
                                         else
                                         {
                                             MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据无法反馈给西门子，西门子设备未连接或处于本地配方");
+                                            MessageNotify.GetInstance.ShowRecipeLog(res.RecipeName);
                                         }
                                         GVL_SmallStation.GetInstance.WindSendDosing = false;
                                         App.Current.Dispatcher.Invoke(() =>
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
index f978f85f..0163f1c3 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
@@ -467,7 +467,10 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     MessageNotify.GetInstance.ShowRunLog($"{res.MaterialName},参数下发完成");
                 }
                 modbusTcp.SetReal(DeviceAddress.WeightSet, Value);//写入原料重量
-                modbusTcp.Write(DeviceAddress.Start, (ushort)1);//设备启动写入
+                if (!modbusTcp.Write(DeviceAddress.Start, (ushort)1))//设备启动写入
+                {
+                    MessageNotify.GetInstance.ShowRunLog($"{DeviceName},设置重量：{Value}，启动信号写入失败");
+                }
                 MessageNotify.GetInstance.ShowRunLog($"{DeviceName},设置重量：{Value}，柔性味魔方开始配料");
             }
 

From 3084fe4bfd0ce2d12c851b210ce4f559579f53c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Sat, 29 Apr 2023 10:54:03 +0800
Subject: [PATCH 38/96] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/View/RunLogView.xaml                | 16 +++++++-------
 .../Pages/View/UserLogView.xaml               |  2 +-
 .../Pages/ViewModel/RunLogViewModel.cs        | 21 +++++++++++++------
 BPASmartClient.Helper/Sqlite.cs               |  8 +++++--
 .../Model/ProcessControl.cs                   |  6 ++++--
 .../View/PlcVarMonitorView.xaml               |  2 +-
 .../ViewModel/ManualFlowViewModel.cs          |  8 +++----
 7 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml b/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
index c032a4eb..503c0b8b 100644
--- a/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
+++ b/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
@@ -163,8 +163,8 @@
             Margin="0,0,17,0"
             Background="#ff0C255F">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="0.2*" />
-                <ColumnDefinition Width="0.2*" />
+                <ColumnDefinition Width="150" />
+                <ColumnDefinition Width="150" />
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
 
@@ -244,10 +244,10 @@
                 <ItemsControl ItemsSource="{Binding Log}" Visibility="{Binding CurrentDataVis}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <Grid x:Name="gr" Height="30">
+                            <Grid x:Name="gr" MinHeight="30">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="0.2*" />
-                                    <ColumnDefinition Width="0.2*" />
+                                    <ColumnDefinition Width="150" />
+                                    <ColumnDefinition Width="150" />
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
 
@@ -291,10 +291,10 @@
                 <ItemsControl ItemsSource="{Binding HistoryRunLog}" Visibility="{Binding HistoryDataVis}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <Grid x:Name="gr" Height="30">
+                            <Grid x:Name="gr" MinHeight="30">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="0.2*" />
-                                    <ColumnDefinition Width="0.2*" />
+                                    <ColumnDefinition Width="150" />
+                                    <ColumnDefinition Width="150" />
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
 
diff --git a/BPASmartClient.CustomResource/Pages/View/UserLogView.xaml b/BPASmartClient.CustomResource/Pages/View/UserLogView.xaml
index 58ac02a5..d03dfa62 100644
--- a/BPASmartClient.CustomResource/Pages/View/UserLogView.xaml
+++ b/BPASmartClient.CustomResource/Pages/View/UserLogView.xaml
@@ -240,7 +240,7 @@
         </StackPanel>
 
         <!--#region 表格标题栏设置-->
-        <Grid Grid.Row="1" Background="#ff0C255F">
+        <Grid Grid.Row="1" Margin="0 0 17 0" Background="#ff0C255F">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="0.3*" />
                 <ColumnDefinition Width="0.3*" />
diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs
index b8ac842a..81234dd5 100644
--- a/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs
+++ b/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs
@@ -9,6 +9,7 @@ using System.Collections.ObjectModel;
 using BPASmartClient.CustomResource.Pages.Model;
 using System.Windows;
 using BPASmartClient.Helper;
+using System.Diagnostics;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
@@ -67,15 +68,23 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel
             var data = Sqlite<RunLog>.GetInstance.GetData();
             if (data != null)
             {
-                HistoryRunLog.Clear();
-                foreach (var item in data)
+                var res = data.Where(p => p.Date == DateTime.Now.ToString("yyyy-MM-dd")).ToList();
+                if (res != null)
                 {
-                    int day = DateTime.Now.Subtract(Convert.ToDateTime(item.Date)).Days;
-                    if (day == 0)
+                    HistoryRunLog.Clear();
+                    res.ForEach(item =>
                     {
                         HistoryRunLog.Add(item);
-                    }
+                    });
                 }
+                //foreach (var item in data)
+                //{
+                //    int day = DateTime.Now.Subtract(Convert.ToDateTime(item.Date)).Days;
+                //    if (day == 0)
+                //    {
+                //        HistoryRunLog.Add(item);
+                //    }
+                //}
             }
         }
 
@@ -106,7 +115,7 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel
         /// </summary>
         public string ControlButText { get { return _mControlButText; } set { _mControlButText = value; OnPropertyChanged(); } }
         private string _mControlButText = "报警复位";
-        
+
         /// <summary>
         /// 开始时间
         /// </summary>
diff --git a/BPASmartClient.Helper/Sqlite.cs b/BPASmartClient.Helper/Sqlite.cs
index 03b78159..e5597fb5 100644
--- a/BPASmartClient.Helper/Sqlite.cs
+++ b/BPASmartClient.Helper/Sqlite.cs
@@ -27,8 +27,10 @@ namespace BPASmartClient.Helper
         {
             get
             {
-                Directory.CreateDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"AccessFile\\DB"));
-                return $"{AppDomain.CurrentDomain.BaseDirectory}AccessFile\\DB\\{typeof(T).Name}.db";
+                int Year = DateTime.Now.Year;
+                int Month = DateTime.Now.Month;
+                Directory.CreateDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"AccessFile\\DB\\{Year}-{Month}"));
+                return $"{AppDomain.CurrentDomain.BaseDirectory}AccessFile\\DB\\{Year}-{Month}\\{typeof(T).Name}.db";
             }
         }
         public bool DataBaseExist()
@@ -48,5 +50,7 @@ namespace BPASmartClient.Helper
             return Base.ToList();
         }
 
+
+
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index 7646c814..0c571639 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -957,12 +957,13 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             {
                 if (Attribute.IsDefined(item, typeof(VarCommAttribute)))
                 {
+                    string type = item.PropertyType.ToString();
                     CommData.Add(new PlcInfos()
                     {
                         Count = CommData.Count + 1,
                         Name = item.Name,
                         Address = item.GetCustomAttribute<VarCommAttribute>().Address,
-                        Type = item.PropertyType.ToString(),
+                        Type = type.Substring(type.IndexOf(".") + 1),
                         Describe = item.GetCustomAttribute<VarCommAttribute>().Describe,
                         Value = item.GetValue(GVL_SmallStation.GetInstance.plcReadDataDB3).ToString(),
                     });
@@ -973,11 +974,12 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             {
                 if (Attribute.IsDefined(item, typeof(VarCommAttribute)))
                 {
+                    string type = item.PropertyType.ToString();
                     ProcessVar.Add(new PlcInfos()
                     {
                         Count = ProcessVar.Count + 1,
                         Name = item.Name,
-                        Type = item.PropertyType.ToString(),
+                        Type = type.Substring(type.IndexOf(".") + 1),
                         Address = item.GetCustomAttribute<VarCommAttribute>().Address,
                         Describe = item.GetCustomAttribute<VarCommAttribute>().Describe,
                         Value = item.GetValue(GVL_SmallStation.GetInstance).ToString()
diff --git a/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml b/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
index 082d2106..3c18f7fd 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/PlcVarMonitorView.xaml
@@ -105,7 +105,7 @@
                     <ItemsControl Foreground="Aqua" ItemsSource="{Binding plcInfos}">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
-                                <Grid Name="gr">
+                                <Grid Name="gr" Height="30">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="3*" />
                                         <ColumnDefinition Width="8*" />
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
index 6fa8cbc4..aed63cb4 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
@@ -29,8 +29,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             Test1Command = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX8.0", PlcVarType = PlcVarType.Bool, Value = true });
-                Thread.Sleep(200);
-                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX8.0", PlcVarType = PlcVarType.Bool, Value = false });
+                //Thread.Sleep(200);
+                //ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX8.0", PlcVarType = PlcVarType.Bool, Value = false });
                 //GVL_SmallStation.GetInstance.AGV_PutTray1Finish = true;
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV送托盘完成");
 
@@ -55,8 +55,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             Test3Command = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX10.0", PlcVarType = PlcVarType.Bool, Value = true });
-                Thread.Sleep(200);
-                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX10.0", PlcVarType = PlcVarType.Bool, Value = false });
+                //Thread.Sleep(200);
+                //ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX10.0", PlcVarType = PlcVarType.Bool, Value = false });
                 //GVL_SmallStation.GetInstance.AGV_GetTray1Finish = true;
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV取托盘完成");
 

From b8afd80fd4d649a47aa149c51677f17850e8b036 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Thu, 4 May 2023 11:07:32 +0800
Subject: [PATCH 39/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/HK_PLC/HKDeviceStatus.cs            | 102 +++++++++++++++++-
 .../Model/ProcessControl.cs                   |  36 +++----
 2 files changed, 118 insertions(+), 20 deletions(-)

diff --git a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
index 1aaeb292..87fb00f2 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
@@ -58,9 +58,9 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
             }),"海科数据交互",true);
         }
         /// <summary>
-        /// 下发配方数据
+        /// 往plc下发配方数据
         /// </summary>
-        public void StockBinPar(RecipeData recipe)
+        public void WritePlcRecipeData(RecipeData recipe)
         {
             if (IsConnected)
             {
@@ -135,5 +135,103 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
                 }
             }
         }
+        /// <summary>
+        /// 读取plc收到的配方数据
+        /// </summary>
+        /// <param name="recipe"></param>
+        /// <returns></returns>
+        public bool ReadPlcRecipeData(RecipeData recipe)
+        {
+            if (IsConnected)
+            {
+                if (recipe != null)
+                {
+                    ushort Code1 = HK_PLC_S7.Read<ushort>("DB99.DBW2.0");
+                    ushort Code2 = HK_PLC_S7.Read<ushort>("DB99.DBW4.0");
+                    if (recipe.TrayCode != Code1 || recipe.TrayCode != Code2)
+                    {
+                        MessageNotify.GetInstance.ShowRunLog($"下发的配方数据，DB99.DBW2.0:{recipe.TrayCode},DB99.DBW2.0:{recipe.TrayCode}");
+                        return false;
+                    }
+                    MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，下发完成");
+                    for (int barrel = 1; barrel < 6; barrel++)
+                    {
+                        if (barrel != 3)//桶的编号不为3 只为1，2，4，5号桶 
+                        {
+                            for (int loc = 1; loc < 15; loc++)
+                            {
+                                int index = Array.FindIndex(recipe.RawMaterial.ToArray(), p => p.RawMaterialBarrelNum == barrel && p.RawMaterialLocation == loc);
+                                if (index == -1)
+                                {
+                                    float weight0 = (float)0.0;
+                                    float ReadWeight = (float)0.0;
+                                    string Address = "";
+                                    switch (barrel)
+                                    {
+                                        case 1:
+                                            Address = "DB99.DBD" + (6 + 4 * (loc - 1));
+                                            ReadWeight = HK_PLC_S7.Read<float>(Address);
+                                            break;
+                                        case 2:
+                                            Address = "DB99.DBD" + (62 + 4 * (loc - 1));
+                                            ReadWeight = HK_PLC_S7.Read<float>(Address);
+                                            break;
+                                        case 4:
+                                            Address = "DB99.DBD" + (118 + 4 * (loc - 1));
+                                            ReadWeight = HK_PLC_S7.Read<float>(Address);
+                                            break;
+                                        case 5:
+                                            Address = "DB99.DBD" + (174 + 4 * (loc - 1));
+                                            ReadWeight = HK_PLC_S7.Read<float>(Address);
+                                            break;
+                                        default:
+                                            break;
+                                    }
+                                    if (Math.Round(weight0, 1) != Math.Round(ReadWeight, 1))
+                                    {
+                                        MessageNotify.GetInstance.ShowRunLog($"地址：{Address}，配方重量0，读取plc值{ReadWeight}");
+                                        return false;
+                                    }
+                                }
+                                else
+                                {
+                                    string Address = "";
+                                    float ReadWeight = (float)0.0;
+                                    MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
+                                    switch (barrel)
+                                    {
+                                        case 1:
+                                            Address = "DB99.DBD" + (6 + 4 * (loc - 1));
+                                            ReadWeight = HK_PLC_S7.Read<float>(Address);
+                                            break;
+                                        case 2:
+                                            Address = "DB99.DBD" + (62 + 4 * (loc - 1));
+                                            ReadWeight = HK_PLC_S7.Read<float>(Address);
+                                            break;
+                                        case 4:
+                                            Address = "DB99.DBD" + (118 + 4 * (loc - 1));
+                                            ReadWeight = HK_PLC_S7.Read<float>(Address);
+                                            break;
+                                        case 5:
+                                            Address = "DB99.DBD" + (174 + 4 * (loc - 1));
+                                            ReadWeight = HK_PLC_S7.Read<float>(Address);
+                                            break;
+                                        default:
+                                            break;
+                                    }
+                                    if (Math.Floor(recipe.RawMaterial.ElementAt(index).RawMaterialWeight) != Math.Floor(ReadWeight))
+                                    {
+                                        return false;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    return true;
+                }
+                return false;
+            }
+            return false;
+        }
     }
 }   
diff --git a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
index 43fc46f2..a45b6463 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
@@ -227,7 +227,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
                                 MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
 
-                                HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                                HKDevice.WritePlcRecipeData(LocalRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
                                 GVL_BigStation.Recipe1DosingStatus = 1;
                                 MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
@@ -235,7 +235,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         else
                         {
-                            HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                            HKDevice.WritePlcRecipeData(LocalRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
                             GVL_BigStation.Recipe1DosingStatus = 1;
                             MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
@@ -392,7 +392,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
                                 MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
 
-                                HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                                HKDevice.WritePlcRecipeData(LocalRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", true);
                                 GVL_BigStation.Recipe2DosingStatus = 1;
                                 MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
@@ -400,7 +400,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         else
                         {
-                            HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                            HKDevice.WritePlcRecipeData(LocalRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", true);
                             GVL_BigStation.Recipe2DosingStatus = 1;
                             MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
@@ -554,7 +554,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
                                 MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
 
-                                HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                                HKDevice.WritePlcRecipeData(LocalRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
                                 GVL_BigStation.Recipe3DosingStatus = 1;
                                 MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
@@ -562,7 +562,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         else
                         {
-                            HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                            HKDevice.WritePlcRecipeData(LocalRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
                             GVL_BigStation.Recipe3DosingStatus = 1;
                             MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
@@ -717,7 +717,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
                                 MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
 
-                                HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                                HKDevice.WritePlcRecipeData(LocalRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
                                 GVL_BigStation.Recipe4DosingStatus = 1;
                                 MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
@@ -725,7 +725,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         else
                         {
-                            HKDevice.StockBinPar(LocalRecipes.ElementAt(index));
+                            HKDevice.WritePlcRecipeData(LocalRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
                             GVL_BigStation.Recipe4DosingStatus = 1;
                             MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}下发完成");
@@ -1303,7 +1303,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
 
                                 GVL_BigStation.DosingRecipe1Time = DateTime.Now;
-                                HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                                HKDevice.WritePlcRecipeData(SiemensRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
                                 GVL_BigStation.Recipe1DosingStatus = 1;
                                 MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，下发完成");
@@ -1312,7 +1312,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         else
                         {
                             GVL_BigStation.DosingRecipe1Time = DateTime.Now;
-                            HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                            HKDevice.WritePlcRecipeData(SiemensRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
                             GVL_BigStation.Recipe1DosingStatus = 1;
                             MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，下发完成");
@@ -1417,7 +1417,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
 
                                 GVL_BigStation.DosingRecipe2Time = DateTime.Now;
-                                HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                                HKDevice.WritePlcRecipeData(SiemensRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", true);
                                 GVL_BigStation.Recipe2DosingStatus = 1;
                                 MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，下发完成");
@@ -1426,7 +1426,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         else
                         {
                             GVL_BigStation.DosingRecipe2Time = DateTime.Now;
-                            HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                            HKDevice.WritePlcRecipeData(SiemensRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.4", true);
                             GVL_BigStation.Recipe2DosingStatus = 1;
                             MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，下发完成");
@@ -1530,7 +1530,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
                                 MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
                                 GVL_BigStation.DosingRecipe3Time = DateTime.Now;
-                                HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                                HKDevice.WritePlcRecipeData(SiemensRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
                                 GVL_BigStation.Recipe3DosingStatus = 1;
                                 MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，下发完成");
@@ -1539,7 +1539,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         else
                         {
                             GVL_BigStation.DosingRecipe3Time = DateTime.Now;
-                            HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                            HKDevice.WritePlcRecipeData(SiemensRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.5", true);
                             GVL_BigStation.Recipe3DosingStatus = 1;
                             MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，下发完成");
@@ -1643,7 +1643,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
                                 MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
                                 GVL_BigStation.DosingRecipe4Time = DateTime.Now;
-                                HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                                HKDevice.WritePlcRecipeData(SiemensRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
                                 GVL_BigStation.Recipe4DosingStatus = 1;
                                 MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，下发完成");
@@ -1652,7 +1652,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         else
                         {
                             GVL_BigStation.DosingRecipe4Time = DateTime.Now;
-                            HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                            HKDevice.WritePlcRecipeData(SiemensRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.6", true);
                             GVL_BigStation.Recipe4DosingStatus = 1;
                             MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，下发完成");
@@ -2248,7 +2248,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
 
                                 GVL_BigStation.RecipeDosingTime[data.Key] = DateTime.Now;
-                                HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                                HKDevice.WritePlcRecipeData(SiemensRecipes.ElementAt(index));
                                 HKDevice.HK_PLC_S7.Write($"DB99.DBX0.{2 + data.Key}", true);
                                 GVL_BigStation.RecipeDosingStatus[data.Key] = 1;
                                 MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
@@ -2257,7 +2257,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         else
                         {
                             GVL_BigStation.RecipeDosingTime[data.Key] = DateTime.Now;
-                            HKDevice.StockBinPar(SiemensRecipes.ElementAt(index));
+                            HKDevice.WritePlcRecipeData(SiemensRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write($"DB99.DBX0.{2 + data.Key}", true);
                             GVL_BigStation.RecipeDosingStatus[data.Key] = 1;
                             MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");

From fb878bb4e7ec51a60ac63203a65714506e04b55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Fri, 5 May 2023 13:35:10 +0800
Subject: [PATCH 40/96] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.Helper/ThreadManage.cs |  1 +
 BPASmartClient.MorkS/Control_Morks.cs | 84 +++++++++++++++------------
 BPASmartClient.MorkS/GVL_MORKS.cs     |  2 +
 3 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/BPASmartClient.Helper/ThreadManage.cs b/BPASmartClient.Helper/ThreadManage.cs
index 732d2364..c16fb029 100644
--- a/BPASmartClient.Helper/ThreadManage.cs
+++ b/BPASmartClient.Helper/ThreadManage.cs
@@ -65,6 +65,7 @@ namespace BPASmartClient.Helper
                     catch (Exception ex)
                     {
                         MessageLog.GetInstance.ShowEx(ex.ToString());
+                        MessageLog.GetInstance.ShowEx(ex.Message);
                         if (IsRestart)
                         {
                             Thread.Sleep(2000);
diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index 4ebb59fb..8e4c8d2a 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -129,51 +129,60 @@ namespace BPASmartClient.MorkS
 
         private void OrderChange(string subid, ORDER_STATUS oRDER_STATUS)
         {
-            var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
+            //var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
             string goodName = string.Empty;
             string SortNum = string.Empty;
-            if (res != null)
-            {
-                goodName = res.MorkOrder.GoodsName;
-                SortNum = res.MorkOrder.SortNum.ToString();
-            }
-
-            EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+            //if (res != null)
+            //{
+            //    goodName = res.MorkOrder.GoodsName;
+            //    SortNum = res.MorkOrder.SortNum.ToString();
+            //}
 
-            var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
-            if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
+            if (mORKS.doe.ContainsKey(subid))
             {
-                if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
+                goodName = mORKS.doe[subid].MorkOrder.GoodsName;
+                SortNum = mORKS.doe[subid].MorkOrder.SortNum.ToString();
+                if (!string.IsNullOrEmpty(goodName) && !string.IsNullOrEmpty(SortNum))
                 {
-                    DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
-                    DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
+                    EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+                    var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
+                    if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
                     {
-                        Status = oRDER_STATUS,
-                        GoodName = goodName,
-                        SortNum = SortNum,
-                        StopTime = DateTime.Now.ToString("HH:mm:ss")
-                    });
-                }
-                else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
-                {
-                    var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
-                    if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
-                }
-                else
-                {
-                    DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
+                        if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
+                        {
+                            DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
+                            DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
+                            {
+                                Status = oRDER_STATUS,
+                                GoodName = goodName,
+                                SortNum = SortNum,
+                                StopTime = DateTime.Now.ToString("HH:mm:ss")
+                            });
+                        }
+                        else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
+                        {
+                            var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
+                            if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
+                        }
+                        else
+                        {
+                            DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
+                        }
+                    }
+                    else
+                    {
+                        DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
+                        {
+                            Status = oRDER_STATUS,
+                            GoodName = goodName,
+                            SortNum = SortNum,
+                            StartTime = DateTime.Now.ToString("HH:mm:ss")
+                        });
+                    }
+                    mORKS.doe.Remove(subid, out _);
                 }
             }
-            else
-            {
-                DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
-                {
-                    Status = oRDER_STATUS,
-                    GoodName = goodName,
-                    SortNum = SortNum,
-                    StartTime = DateTime.Now.ToString("HH:mm:ss")
-                });
-            }
+
         }
 
         private void GetStatus(string key, Action<object> action)
@@ -322,6 +331,7 @@ namespace BPASmartClient.MorkS
                 if (@event is DoOrderEvent order)
                 {
                     mORKS.doOrderEvents.Add(order);
+                    mORKS.doe.TryAdd(order.MorkOrder.SuborderId, order);
                     DeviceProcessLogShow($"接收到{order.MorkOrder.SortNum}号订单");
                     if (order.MorkOrder.GoodBatchings == null) return;
                     if (mORKS.HistorySuborderId.Contains(order.MorkOrder.SuborderId)) return;
diff --git a/BPASmartClient.MorkS/GVL_MORKS.cs b/BPASmartClient.MorkS/GVL_MORKS.cs
index 4cebd61e..64aa162c 100644
--- a/BPASmartClient.MorkS/GVL_MORKS.cs
+++ b/BPASmartClient.MorkS/GVL_MORKS.cs
@@ -313,6 +313,8 @@ namespace BPASmartClient.MorkS
 
         public List<DoOrderEvent> doOrderEvents { get; set; } = new List<DoOrderEvent>();
 
+        public ConcurrentDictionary<string, DoOrderEvent> doe { get; set; } = new ConcurrentDictionary<string, DoOrderEvent>();
+
         /// <summary>
         /// 是否有面条
         /// </summary>

From e268f15dcb7c21bc667967f78148f45390e17116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Fri, 5 May 2023 13:37:51 +0800
Subject: [PATCH 41/96] morks

---
 BPASmartClient.MorkS/Control_Morks.cs         |   2 +-
 .../Control_MorkSUpgradedVer.cs               | 135 +++++++++++++-----
 .../GVL_MorkSUpgradedVer.cs                   |   2 +
 3 files changed, 100 insertions(+), 39 deletions(-)

diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index 8e4c8d2a..625a964d 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -330,7 +330,7 @@ namespace BPASmartClient.MorkS
                 if (@event == null) return;
                 if (@event is DoOrderEvent order)
                 {
-                    mORKS.doOrderEvents.Add(order);
+                    //mORKS.doOrderEvents.Add(order);
                     mORKS.doe.TryAdd(order.MorkOrder.SuborderId, order);
                     DeviceProcessLogShow($"接收到{order.MorkOrder.SortNum}号订单");
                     if (order.MorkOrder.GoodBatchings == null) return;
diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index 6a26a374..715f43dc 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -128,51 +128,109 @@ namespace BPASmartClient.MorkSUpgradedVer
 
         private void OrderChange(string subid, ORDER_STATUS oRDER_STATUS)
         {
-            var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
+
+
+            //var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
             string goodName = string.Empty;
             string SortNum = string.Empty;
-            if (res != null)
-            {
-                goodName = res.MorkOrder.GoodsName;
-                SortNum = res.MorkOrder.SortNum.ToString();
-            }
+            //if (res != null)
+            //{
+            //    goodName = res.MorkOrder.GoodsName;
+            //    SortNum = res.MorkOrder.SortNum.ToString();
+            //}
 
-            EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
-
-            var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
-            if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
+            if (mORKS.doe.ContainsKey(subid))
             {
-                if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
+                goodName = mORKS.doe[subid].MorkOrder.GoodsName;
+                SortNum = mORKS.doe[subid].MorkOrder.SortNum.ToString();
+                if (!string.IsNullOrEmpty(goodName) && !string.IsNullOrEmpty(SortNum))
                 {
-                    DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
-                    DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
+                    EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+                    var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
+                    if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
                     {
-                        Status = oRDER_STATUS,
-                        GoodName = goodName,
-                        SortNum = SortNum,
-                        StopTime = DateTime.Now.ToString("HH:mm:ss")
-                    });
-                }
-                else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
-                {
-                    var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
-                    if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
-                }
-                else
-                {
-                    DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
+                        if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
+                        {
+                            DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
+                            DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
+                            {
+                                Status = oRDER_STATUS,
+                                GoodName = goodName,
+                                SortNum = SortNum,
+                                StopTime = DateTime.Now.ToString("HH:mm:ss")
+                            });
+                        }
+                        else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
+                        {
+                            var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
+                            if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
+                        }
+                        else
+                        {
+                            DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
+                        }
+                    }
+                    else
+                    {
+                        DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
+                        {
+                            Status = oRDER_STATUS,
+                            GoodName = goodName,
+                            SortNum = SortNum,
+                            StartTime = DateTime.Now.ToString("HH:mm:ss")
+                        });
+                    }
+                    mORKS.doe.Remove(subid, out _);
                 }
             }
-            else
-            {
-                DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
-                {
-                    Status = oRDER_STATUS,
-                    GoodName = goodName,
-                    SortNum = SortNum,
-                    StartTime = DateTime.Now.ToString("HH:mm:ss")
-                });
-            }
+
+
+
+            //var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
+            //string goodName = string.Empty;
+            //string SortNum = string.Empty;
+            //if (res != null)
+            //{
+            //    goodName = res.MorkOrder.GoodsName;
+            //    SortNum = res.MorkOrder.SortNum.ToString();
+            //}
+
+            //EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+
+            //var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
+            //if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
+            //{
+            //    if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
+            //    {
+            //        DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
+            //        DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
+            //        {
+            //            Status = oRDER_STATUS,
+            //            GoodName = goodName,
+            //            SortNum = SortNum,
+            //            StopTime = DateTime.Now.ToString("HH:mm:ss")
+            //        });
+            //    }
+            //    else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
+            //    {
+            //        var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
+            //        if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
+            //    }
+            //    else
+            //    {
+            //        DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
+            //    }
+            //}
+            //else
+            //{
+            //    DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
+            //    {
+            //        Status = oRDER_STATUS,
+            //        GoodName = goodName,
+            //        SortNum = SortNum,
+            //        StartTime = DateTime.Now.ToString("HH:mm:ss")
+            //    });
+            //}
         }
 
         private void GetStatus(string key, Action<object> action)
@@ -342,7 +400,8 @@ namespace BPASmartClient.MorkSUpgradedVer
                  if (@event == null) return;
                  if (@event is DoOrderEvent order)
                  {
-                     mORKS.doOrderEvents.Add(order);
+                     //mORKS.doOrderEvents.Add(order);
+                     mORKS.doe.TryAdd(order.MorkOrder.SuborderId, order);
                      if (order.MorkOrder.GoodBatchings == null) return;
                      if (mORKS.HistorySuborderId.Contains(order.MorkOrder.SuborderId)) return;
                      OrderCount++;
diff --git a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
index 7060f697..72a1f0b9 100644
--- a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
@@ -106,6 +106,8 @@ namespace BPASmartClient.MorkSUpgradedVer
 
         public List<DoOrderEvent> doOrderEvents { get; set; } = new List<DoOrderEvent>();
 
+        public ConcurrentDictionary<string, DoOrderEvent> doe { get; set; } = new ConcurrentDictionary<string, DoOrderEvent>();
+
         public List<string> HistorySuborderId { get; set; } = new List<string>();
 
         public NoodleShidModel[] nsm { get; set; } = new NoodleShidModel[6] { new NoodleShidModel(), new NoodleShidModel(), new NoodleShidModel(), new NoodleShidModel(), new NoodleShidModel(), new NoodleShidModel() };

From ee563fbfd3f3329e4838daadaa57aaa14c87c103 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Fri, 5 May 2023 13:40:33 +0800
Subject: [PATCH 42/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/GVL_SmallStation.cs                 |  7 ++
 .../Model/ProcessControl.cs                   | 87 +++++++++++++------
 .../Model/RawMaterial/DeviceAddress.cs        | 10 +++
 .../Model/RawMaterial/DeviceInquire.cs        | 15 ++++
 .../Model/WindSend/WindSendDeviceStatus.cs    | 65 +++++++++++---
 .../Model/WindSend/WindSend_Read.cs           |  8 ++
 .../View/DeviceListView.xaml                  | 27 ++++++
 .../ViewModel/DeviceListViewModel.cs          | 19 ++++
 .../ViewModel/NewLocalRecipeViewModel.cs      |  9 +-
 9 files changed, 205 insertions(+), 42 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
index d2d872c0..dba1e0b7 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
@@ -286,6 +286,13 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public bool WindSendDosingComple { get; set; } = false;
 
+
+        [VarComm("Global", "粉料仓配料状态")]
+        /// <summary>
+        /// 粉料仓配料状态(0:无意义,1:粉料仓下配方，2：plc接收配方完成，3：粉料仓配料完成，4：粉料仓配料完成信号复位，5：排料完成)
+        /// </summary>
+        public int WindSendDosingStatus { get; set; } = 0;
+
         [VarComm("Global", "PLC的系统模式 DB44.DBX0.1")]
         /// <summary>
         /// PLC的系统模式 DB44.DBX0.1
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index 0c571639..2df8c253 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -528,6 +528,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         RecipeQueueTray[i].Clear();
                         GVL_SmallStation.GetInstance.RecipeProcessStatus[i] = 0;
                     }
+                    GVL_SmallStation.GetInstance.WindSendDosingStatus = 0;
                 }
             }
             else
@@ -568,6 +569,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         RecipeQueueTray[i].Clear();
                         GVL_SmallStation.GetInstance.RecipeProcessStatus[i] = 0;
                     }
+                    GVL_SmallStation.GetInstance.WindSendDosingStatus = 0;
                 }
             }
         }
@@ -691,41 +693,74 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             else
                             {
                                 //粉料仓下发配方
-                                if (GVL_SmallStation.GetInstance.IsUseWindSend && GVL_SmallStation.GetInstance.Tray_AGVLogic[recipeNum] == 2 && GVL_SmallStation.GetInstance.WindSendDosing == false)
+                                if (GVL_SmallStation.GetInstance.IsUseWindSend  && GVL_SmallStation.GetInstance.WindSendDosing == false /*&& GVL_SmallStation.GetInstance.Tray_AGVLogic[recipeNum] == 2*/)
                                 {
                                     if (WindSendDevice.IsConnected)
                                     {
-                                        WindSendData.TargetRecipeCode = code;
-                                        WindSendData.IsAllowDosing = true;
-                                        foreach (var item in RemoteRecipes.ElementAt(index).WindSend)
+                                        if (GVL_SmallStation.GetInstance.WindSendDosingStatus == 1)
                                         {
-                                            if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(0).RawMaterialName)
+                                            WindSendData.TargetRecipeCode = code;
+                                            WindSendData.IsAllowDosing = true;
+                                            foreach (var item in RemoteRecipes.ElementAt(index).WindSend)
                                             {
-                                                WindSendData.RawMaterial1_SetWeight = item.RawMaterialWeight;
-                                            }
-                                            if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(1).RawMaterialName)
-                                            {
-                                                WindSendData.RawMaterial2_SetWeight = item.RawMaterialWeight;
-                                            }
-                                            if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(2).RawMaterialName)
-                                            {
-                                                WindSendData.RawMaterial3_SetWeight = item.RawMaterialWeight;
-                                            }
-                                            if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(3).RawMaterialName)
-                                            {
-                                                WindSendData.RawMaterial4_SetWeight = item.RawMaterialWeight;
-                                            }
-                                            if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(4).RawMaterialName)
-                                            {
-                                                WindSendData.RawMaterial5_SetWeight = item.RawMaterialWeight;
+                                                if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(0).RawMaterialName || item.Location == 1)
+                                                {
+                                                    WindSendData.RawMaterial1_SetWeight = item.RawMaterialWeight;
+                                                    MessageNotify.GetInstance.ShowRunLog($"风送料仓{item.RawMaterialName}，设定重量{item.RawMaterialWeight}");
+                                                }
+                                                else
+                                                {
+                                                    WindSendData.RawMaterial1_SetWeight = 0;
+                                                }
+                                                if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(1).RawMaterialName || item.Location == 2)
+                                                {
+                                                    WindSendData.RawMaterial2_SetWeight = item.RawMaterialWeight;
+                                                    MessageNotify.GetInstance.ShowRunLog($"风送料仓{item.RawMaterialName}，设定重量{item.RawMaterialWeight}");
+                                                }
+                                                else
+                                                {
+                                                    WindSendData.RawMaterial2_SetWeight = 0;
+                                                }
+                                                if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(2).RawMaterialName || item.Location == 3)
+                                                {
+                                                    WindSendData.RawMaterial3_SetWeight = item.RawMaterialWeight;
+                                                    MessageNotify.GetInstance.ShowRunLog($"风送料仓{item.RawMaterialName}，设定重量{item.RawMaterialWeight}");
+                                                }
+                                                else
+                                                {
+                                                    WindSendData.RawMaterial3_SetWeight = 0;
+                                                }
+                                                if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(3).RawMaterialName || item.Location == 4)
+                                                {
+                                                    WindSendData.RawMaterial4_SetWeight = item.RawMaterialWeight;
+                                                    MessageNotify.GetInstance.ShowRunLog($"风送料仓{item.RawMaterialName}，设定重量{item.RawMaterialWeight}");
+                                                }
+                                                else
+                                                {
+                                                    WindSendData.RawMaterial4_SetWeight = 0;
+                                                }
+                                                if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(4).RawMaterialName || item.Location == 5)
+                                                {
+                                                    WindSendData.RawMaterial5_SetWeight = item.RawMaterialWeight;
+                                                    MessageNotify.GetInstance.ShowRunLog($"风送料仓{item.RawMaterialName}，设定重量{item.RawMaterialWeight}");
+                                                }
+                                                else
+                                                {
+                                                    WindSendData.RawMaterial5_SetWeight = 0;
+                                                }
                                             }
+                                            GVL_SmallStation.GetInstance.WindSendDosing = true;
+                                            GVL_SmallStation.GetInstance.WindSendDosingStatus = 2;
+                                            WindSendDevice.Siemens_PLC_S7.WriteClass<WindSend_Write>(WindSendData, 95);
                                         }
-                                        GVL_SmallStation.GetInstance.WindSendDosing = true;
-                                        WindSendDevice.Siemens_PLC_S7.WriteClass<WindSend_Write>(WindSendData, 95);
                                     }
                                     else
                                     {
-                                        MessageNotify.GetInstance.ShowRunLog($"风送设备PLC未连接");
+                                        if (Delay.GetInstance("delayTime").Start(true,60))
+                                        {
+                                            Delay.GetInstance("delayTime").Start(false, 60);
+                                            MessageNotify.GetInstance.ShowRunLog($"风送设备PLC未连接");
+                                        }
                                     }
                                 }
                                 if (GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] == 0)
@@ -1247,6 +1282,8 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
                 GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
 
+                GVL_SmallStation.GetInstance.WindSendDosingStatus = 0;
+
                 GVL_SmallStation.GetInstance.Order_Cancel = false;
                 GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
                 GVL_SmallStation.GetInstance.OrderCancelStep = 0;
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceAddress.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceAddress.cs
index 81e4e381..de6009a3 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceAddress.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceAddress.cs
@@ -28,6 +28,16 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public static string Start { get; set; } = "LW20";
 
+        /// <summary>
+        /// 开盖地址
+        /// </summary>
+        public static string OpenLid { get; set; } = "";
+
+        /// <summary>
+        /// 关盖地址
+        /// </summary>
+        public static string CloseLid { get; set; } = "";
+
         /// <summary>
         /// 下料重量反馈地址
         /// </summary>
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
index 0163f1c3..c0a5081b 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
@@ -385,6 +385,21 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             this.modbusTcp.SetString(DeviceAddress.DeviceName, name);
         }
 
+        /// <summary>
+        /// 开盖
+        /// </summary>
+        public void OpenLid()
+        {
+            //modbusTcp.Write(DeviceAddress.OpenLid, (ushort)1);
+        }
+        /// <summary>
+        /// 关盖
+        /// </summary>
+        public void CloseLid()
+        {
+            //modbusTcp.Write(DeviceAddress.CloseLid, (ushort)1);
+        }
+
         public bool StatusReset()
         {
             return this.modbusTcp.Write(DeviceAddress.FinfishStatus, (ushort)1);
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
index 2d24260c..b50fe91c 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
@@ -29,19 +29,62 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     {
                         GVL_SmallStation.GetInstance.WindSendAllowAGVPutGet = readData.HoodLiftInPlace;
                         Siemens_PLC_S7.Write<bool>("DB95.DBX38.2", GVL_SmallStation.GetInstance.Station1HaveTray);//工站1有托盘
-                        if (res1.RecipeReceiveFinish)
-                        {
-                            Siemens_PLC_S7.Write<bool>("DB95.DBX38.0", false);
-                        }
-                        if (RTrig.GetInstance("CurrentCompleteSign").Start(readData.CurrentCompleteSign))
+                        switch (GVL_SmallStation.GetInstance.WindSendDosingStatus)
                         {
-                            GVL_SmallStation.GetInstance.WindSendDosingComple = true;
-                            Siemens_PLC_S7.Write("DB95.DBX38.1", true);
-                        }
-                        if (TTrig.GetInstance("CurrentCompleteSign").Start(readData.CurrentCompleteSign))
-                        {
-                            Siemens_PLC_S7.Write("DB95.DBX38.1", false);
+                            case 0:
+                                if (res1.IsAllowIssue)
+                                {
+                                    GVL_SmallStation.GetInstance.WindSendDosingStatus = 1;
+                                }
+                                break;
+                            case 2:
+                                if (res1.RecipeReceiveFinish)
+                                {
+                                    Siemens_PLC_S7.Write<bool>("DB95.DBX38.0", false);
+                                    GVL_SmallStation.GetInstance.WindSendDosingStatus = 3;
+                                }
+                                break;
+                            case 3:
+                                if (RTrig.GetInstance("CurrentCompleteSign").Start(readData.CurrentCompleteSign))
+                                {
+                                    Siemens_PLC_S7.Write("DB95.DBX38.1", true);
+                                    GVL_SmallStation.GetInstance.WindSendDosingStatus = 4;
+                                }
+                                break;
+                            case 4:
+                                if (TTrig.GetInstance("CurrentCompleteSign").Start(readData.CurrentCompleteSign))
+                                {
+                                    Siemens_PLC_S7.Write("DB95.DBX38.1", false);
+                                    GVL_SmallStation.GetInstance.WindSendDosingStatus = 5;
+                                }
+                                break;
+                            case 5:
+                                if (readData.HoodLiftInPlace && readData.DisChargeComple)
+                                {
+                                    GVL_SmallStation.GetInstance.WindSendDosingComple = true;
+                                    GVL_SmallStation.GetInstance.WindSendDosingStatus = 0;
+                                }
+                                break;
+                            //case 5:
+                            //    if (TTrig.GetInstance("HoodLiftInPlaceSign").Start(readData.HoodLiftInPlace))
+                            //    {
+                            //        GVL_SmallStation.GetInstance.WindSendDosingStatus = 6;
+                            //    }
+                            //    break;
+                            //case 6:
+                            //    if (RTrig.GetInstance("HoodLiftInPlaceSign").Start(readData.HoodLiftInPlace))
+                            //    {
+                            //        GVL_SmallStation.GetInstance.WindSendDosingStatus = 7;
+                            //    }
+                            //    break;
+                            //case 7:
+                            //    GVL_SmallStation.GetInstance.WindSendDosingComple = true;
+                            //    GVL_SmallStation.GetInstance.WindSendDosingStatus = 0;
+                            //    break;
+                            default:
+                                break;
                         }
+                        
                     }
                     //测试
                     /*var res = this.Siemens_PLC_S7.ReadClass<WindSend_Write>(95);
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Read.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Read.cs
index dc1b9b68..222a2f6c 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Read.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Read.cs
@@ -22,6 +22,14 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.WindSend
         /// </summary>
         public bool CurrentCompleteSign { get; set; }
         /// <summary>
+        /// 允许下发信号
+        /// </summary>
+        public bool IsAllowIssue { get; set; }
+        /// <summary>
+        /// 排料完成信号
+        /// </summary>
+        public bool DisChargeComple { get; set; }
+        /// <summary>
         /// 当前配方编码
         /// </summary>
         [Siemens(16)]
diff --git a/BPASmartClient.JXJFoodSmallStation/View/DeviceListView.xaml b/BPASmartClient.JXJFoodSmallStation/View/DeviceListView.xaml
index 4513cf9c..b637d2f5 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/DeviceListView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/DeviceListView.xaml
@@ -97,6 +97,7 @@
                                     <RowDefinition />
                                     <RowDefinition />
                                     <RowDefinition />
+                                    <RowDefinition />
                                 </Grid.RowDefinitions>
 
                                 <TextBlock
@@ -136,6 +137,32 @@
                                     FontSize="16"
                                     IsEnabled="{Binding IsEnable}"
                                     Style="{StaticResource ImageButtonStyle}" />
+                                
+                                <WrapPanel Grid.Row="3">
+                                    <Button
+                                        Width="65"
+                                        Height="30"
+                                        Margin="0,0,0,0"
+                                        VerticalAlignment="Top"
+                                        Command="{Binding DataContext.Open, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding IpAddress}"
+                                        Content="开盖"
+                                        FontSize="16"
+                                        IsEnabled="{Binding IsEnable}"
+                                        Style="{StaticResource ImageButtonStyle}" />
+                                    <Button
+                                        Width="65"
+                                        Height="30"
+                                        Margin="10,0,0,0"
+                                        VerticalAlignment="Top"
+                                        Command="{Binding DataContext.Close, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding IpAddress}"
+                                        Content="关盖"
+                                        FontSize="16"
+                                        IsEnabled="{Binding IsEnable}"
+                                        Style="{StaticResource ImageButtonStyle}" />
+                                </WrapPanel>
+                                
 
                                 <!--<Button
                                     Grid.Row="1"
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceListViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceListViewModel.cs
index a9793e67..b65b5a79 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceListViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceListViewModel.cs
@@ -27,6 +27,23 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     cdn.ShowDialog();
                 }
             });
+
+            Open = new RelayCommand<object>((o) =>
+            {
+                if (o != null && o is string str)
+                {
+                    DeviceInquire.GetInstance.GetDevice(str).OpenLid();//设置PLC名称
+                }
+            });
+            
+            Close = new RelayCommand<object>((o) =>
+            {
+                if (o != null && o is string str)
+                {
+                    DeviceInquire.GetInstance.GetDevice(str).CloseLid();//设置PLC名称
+                }
+            });
+
             devices = DeviceInquire.GetInstance.devices;
             /*foreach (var device in devices) 
             {
@@ -36,6 +53,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         }
 
         public RelayCommand<object> ChangeNameCommand { get; set; }
+        public RelayCommand<object> Open { get; set; }
+        public RelayCommand<object> Close { get; set; }
 
         //public static ObservableCollection<Devices> devices { get; set; } = new ObservableCollection<Devices>();
         public ObservableCollection<Devices> devices { get; set; }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
index e056143b..bdd401c9 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
@@ -38,6 +38,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                             RawMaterialType = "粉料",
                             RawMaterialName = item1.RawMaterialName,
                             RawMaterialWeight = item1.RawMaterialWeight,
+                            RawMaterialLocation = item1.Location,
                             RawMaterialBarrelNum = 3,
                         });
                     }
@@ -148,15 +149,13 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                                 RawMaterialWeight = item.RawMaterialWeight,
                             });
                         }
-                    }
-                    foreach (var item in AllRawMaterial)
-                    {
                         if (item.RawMaterialType == "粉料")
                         {
                             WindSendRawMaterials.Add(new WindSendRawMaterial()
                             {
                                 RawMaterialName = item.RawMaterialName,
                                 RawMaterialWeight = item.RawMaterialWeight,
+                                Location = item.RawMaterialLocation,
                             });
                         }
                     }
@@ -182,15 +181,13 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                                 RawMaterialWeight = item.RawMaterialWeight,
                             });
                         }
-                    }
-                    foreach (var item in AllRawMaterial)
-                    {
                         if (item.RawMaterialType == "粉料")
                         {
                             WindSendRawMaterials.Add(new WindSendRawMaterial()
                             {
                                 RawMaterialName = item.RawMaterialName,
                                 RawMaterialWeight = item.RawMaterialWeight,
+                                Location = item.RawMaterialLocation,
                             });
                         }
                     }

From 36d4157eb177c56c7261cfac3d6a82cf0b716b91 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Fri, 5 May 2023 18:36:17 +0800
Subject: [PATCH 43/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/HK_PLC/HKDeviceStatus.cs               |  2 +-
 .../Model/ProcessControl.cs                      |  8 ++++++++
 .../Model/ProcessControl.cs                      | 16 +++++++++++++++-
 .../Model/WindSend/WindSendDeviceStatus.cs       |  4 ++--
 .../Model/WindSend/WindSend_Write.cs             |  2 +-
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
index 87fb00f2..591fbd89 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
@@ -189,7 +189,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
                                     }
                                     if (Math.Round(weight0, 1) != Math.Round(ReadWeight, 1))
                                     {
-                                        MessageNotify.GetInstance.ShowRunLog($"地址：{Address}，配方重量0，读取plc值{ReadWeight}");
+                                        MessageNotify.GetInstance.ShowRunLog($"地址：{Address}，配方重量为0，读取plc值{ReadWeight}");
                                         return false;
                                     }
                                 }
diff --git a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
index a45b6463..6083fc69 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
@@ -228,6 +228,14 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
 
                                 HKDevice.WritePlcRecipeData(LocalRecipes.ElementAt(index));
+                                Thread.Sleep(200);
+                                if (!HKDevice.ReadPlcRecipeData(LocalRecipes.ElementAt(index))) 
+                                {
+                                    App.Current.Dispatcher.Invoke(() =>
+                                    {
+                                        MessageNotify.GetInstance.ShowDialog($"plc配方数据和西门子配方数据不一致!", DialogType.Error);
+                                    });
+                                };
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
                                 GVL_BigStation.Recipe1DosingStatus = 1;
                                 MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index 2df8c253..b3bfa792 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -243,7 +243,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 if (GVL_SmallStation.GetInstance.WindSendDosingComple)
                 {
                     //HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX1.7", true);
-                    HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX2.0", true);
+                    HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX4.0", true);
                     GVL_SmallStation.GetInstance.WindSendDosingComple = false;
                     MessageNotify.GetInstance.ShowRunLog("风送配料完成信号，发给产线plc信号");
                 }
@@ -529,6 +529,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         GVL_SmallStation.GetInstance.RecipeProcessStatus[i] = 0;
                     }
                     GVL_SmallStation.GetInstance.WindSendDosingStatus = 0;
+                    GVL_SmallStation.GetInstance.WindSendDosing = false;
                 }
             }
             else
@@ -570,6 +571,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                         GVL_SmallStation.GetInstance.RecipeProcessStatus[i] = 0;
                     }
                     GVL_SmallStation.GetInstance.WindSendDosingStatus = 0;
+                    GVL_SmallStation.GetInstance.WindSendDosing = false;
                 }
             }
         }
@@ -699,6 +701,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     {
                                         if (GVL_SmallStation.GetInstance.WindSendDosingStatus == 1)
                                         {
+                                            WindSendReset();
                                             WindSendData.TargetRecipeCode = code;
                                             WindSendData.IsAllowDosing = true;
                                             foreach (var item in RemoteRecipes.ElementAt(index).WindSend)
@@ -1283,6 +1286,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
 
                 GVL_SmallStation.GetInstance.WindSendDosingStatus = 0;
+                GVL_SmallStation.GetInstance.WindSendDosing = false;
 
                 GVL_SmallStation.GetInstance.Order_Cancel = false;
                 GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
@@ -1295,6 +1299,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     GVL_SmallStation.GetInstance.Tray_AGVLogic[i] = 0;
                 }
                 StockBinInit();
+                WindSendReset();
                 //for (int i = 0; i < GVL_SmallStation.GetInstance.StockInDosingComple.Length; i++)
                 //{
                 //    GVL_SmallStation.GetInstance.StockInDosingComple[i] = false;
@@ -1506,6 +1511,15 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }
         }
+        private void WindSendReset() 
+        {
+            float weight = (float)0.0;
+            WindSendDevice.Siemens_PLC_S7.Write("DB95.DBD0", weight);
+            WindSendDevice.Siemens_PLC_S7.Write("DB95.DBD4", weight);
+            WindSendDevice.Siemens_PLC_S7.Write("DB95.DBD8", weight);
+            WindSendDevice.Siemens_PLC_S7.Write("DB95.DBD12", weight);
+            WindSendDevice.Siemens_PLC_S7.Write("DB95.DBX38.1", false);
+        }
         public void RawMaterialNameWithCode()
         {
             GVL_SmallStation.GetInstance.RawMaterialsNameCode.Clear();
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
index b50fe91c..7ea4b6ac 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
@@ -45,14 +45,14 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 }
                                 break;
                             case 3:
-                                if (RTrig.GetInstance("CurrentCompleteSign").Start(readData.CurrentCompleteSign))
+                                if (readData.CurrentCompleteSign)
                                 {
                                     Siemens_PLC_S7.Write("DB95.DBX38.1", true);
                                     GVL_SmallStation.GetInstance.WindSendDosingStatus = 4;
                                 }
                                 break;
                             case 4:
-                                if (TTrig.GetInstance("CurrentCompleteSign").Start(readData.CurrentCompleteSign))
+                                if (!readData.CurrentCompleteSign)
                                 {
                                     Siemens_PLC_S7.Write("DB95.DBX38.1", false);
                                     GVL_SmallStation.GetInstance.WindSendDosingStatus = 5;
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Write.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Write.cs
index f3bbc7f9..fd619b57 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Write.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Write.cs
@@ -33,7 +33,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.WindSend
         /// 目标配方编码
         /// </summary>
         [Siemens(16)]
-        public string TargetRecipeCode { get; set; }
+        public string TargetRecipeCode { get; set; } = "";
         /// <summary>
         /// 允许配料
         /// </summary>

From 0ac46dd9d7a284919b1b96132fe3c4ad9cd6ccb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Fri, 5 May 2023 18:48:42 +0800
Subject: [PATCH 44/96] 1

---
 .../Model/HK_PLC/HKDeviceStatus.cs            | 178 ++++++++++--------
 1 file changed, 100 insertions(+), 78 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
index 70effaaa..c32b6ba0 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
@@ -19,12 +19,12 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
         public PlcReadAddressDB45 DeviceStatus = new PlcReadAddressDB45();
         public void Init()
         {
-            ThreadManage.GetInstance().StartLong(new Action(() => 
+            ThreadManage.GetInstance().StartLong(new Action(() =>
             {
                 if (IsConnected)
                 {
                     var res = this.HK_PLC_S7.ReadClass<PlcReadAddressDB45>(45);
-                    if ( res != null && res is PlcReadAddressDB45 data) 
+                    if (res != null && res is PlcReadAddressDB45 data)
                     {
                         DeviceStatus = data;
                     }
@@ -35,7 +35,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
                     }
                 }
                 Thread.Sleep(10);
-            }),"海科PLC设备状态",true);
+            }), "海科PLC设备状态", true);
         }
         ///// <summary>
         ///// 单个配料机配料完成
@@ -70,6 +70,20 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
         //{
         //    HK_PLC_S7.Write(HKPlcCommAddress.RecipeDosingFinish, (ushort)0);
         //}
+
+        private void TempStockBinPar(int num, ushort StockBinLocation, string info)
+        {
+            if (StockBinLocation >= 1 && StockBinLocation <= 8)
+            {
+                HK_PLC_S7.Write<bool>($"DB4.DBX{num}." + (StockBinLocation - 1), true);
+            }
+            else if (StockBinLocation >= 9 && StockBinLocation <= 15)
+            {
+                HK_PLC_S7.Write<bool>($"DB4.DBX{num + 1}." + (StockBinLocation - 9), true);
+            }
+            MessageNotify.GetInstance.ShowRunLog($"托盘{info}号桶在料仓{StockBinLocation}配料");
+        }
+
         /// <summary>
         /// 下发配方数据
         /// </summary>
@@ -85,51 +99,55 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
                     {
                         if (BarrelNum == 6)
                         {
-                            if (StockBinLocation >= 1 && StockBinLocation <= 8)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX10." + (StockBinLocation - 1), true);
-                            }
-                            else if (StockBinLocation >= 9 && StockBinLocation <= 15)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX11." + (StockBinLocation - 9), true);
-                            }
-                            MessageNotify.GetInstance.ShowRunLog($"托盘1—1号桶在料仓{StockBinLocation}配料");
+                            TempStockBinPar(10, StockBinLocation, "1—1");
+                            //if (StockBinLocation >= 1 && StockBinLocation <= 8)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX10." + (StockBinLocation - 1), true);
+                            //}
+                            //else if (StockBinLocation >= 9 && StockBinLocation <= 15)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX11." + (StockBinLocation - 9), true);
+                            //}
+                            //MessageNotify.GetInstance.ShowRunLog($"托盘1—1号桶在料仓{StockBinLocation}配料");
                         }
                         else if (BarrelNum == 7)
                         {
-                            if (StockBinLocation >= 1 && StockBinLocation <= 8)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX12." + (StockBinLocation - 1), true);
-                            }
-                            else if (StockBinLocation >= 9 && StockBinLocation <= 15)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX13." + (StockBinLocation - 9), true);
-                            }
-                            MessageNotify.GetInstance.ShowRunLog($"托盘1—2号桶在料仓{StockBinLocation}配料");
+                            TempStockBinPar(12, StockBinLocation, "1—2");
+                            //if (StockBinLocation >= 1 && StockBinLocation <= 8)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX12." + (StockBinLocation - 1), true);
+                            //}
+                            //else if (StockBinLocation >= 9 && StockBinLocation <= 15)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX13." + (StockBinLocation - 9), true);
+                            //}
+                            //MessageNotify.GetInstance.ShowRunLog($"托盘1—2号桶在料仓{StockBinLocation}配料");
                         }
                         else if (BarrelNum == 8)
                         {
-                            if (StockBinLocation >= 1 && StockBinLocation <= 8)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX14." + (StockBinLocation - 1), true);
-                            }
-                            else if (StockBinLocation >= 9 && StockBinLocation <= 15)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX15." + (StockBinLocation - 9), true);
-                            }
-                            MessageNotify.GetInstance.ShowRunLog($"托盘1—3号桶在料仓{StockBinLocation}配料");
+                            TempStockBinPar(14, StockBinLocation, "1—3");
+                            //if (StockBinLocation >= 1 && StockBinLocation <= 8)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX14." + (StockBinLocation - 1), true);
+                            //}
+                            //else if (StockBinLocation >= 9 && StockBinLocation <= 15)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX15." + (StockBinLocation - 9), true);
+                            //}
+                            //MessageNotify.GetInstance.ShowRunLog($"托盘1—3号桶在料仓{StockBinLocation}配料");
                         }
                         else if (BarrelNum == 4)
                         {
-                            if (StockBinLocation >= 1 && StockBinLocation <= 8)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX16." + (StockBinLocation - 1), true);
-                            }
-                            else if (StockBinLocation >= 9 && StockBinLocation <= 15)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX17." + (StockBinLocation - 9), true);
-                            }
-                            MessageNotify.GetInstance.ShowRunLog($"托盘1—4号桶在料仓{StockBinLocation}配料");
+                            TempStockBinPar(16, StockBinLocation, "1—4");
+                            //if (StockBinLocation >= 1 && StockBinLocation <= 8)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX16." + (StockBinLocation - 1), true);
+                            //}
+                            //else if (StockBinLocation >= 9 && StockBinLocation <= 15)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX17." + (StockBinLocation - 9), true);
+                            //}
+                            //MessageNotify.GetInstance.ShowRunLog($"托盘1—4号桶在料仓{StockBinLocation}配料");
                         }
                     }
                 }
@@ -139,58 +157,62 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
                     {
                         if (BarrelNum == 6)
                         {
-                            if (StockBinLocation >= 1 && StockBinLocation <= 8)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX18." + (StockBinLocation - 1), true);
-                            }
-                            else if (StockBinLocation >= 9 && StockBinLocation <= 15)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX19." + (StockBinLocation - 9), true);
-                            }
-                            MessageNotify.GetInstance.ShowRunLog($"托盘2—1号桶在料仓{StockBinLocation}配料");
+                            TempStockBinPar(18, StockBinLocation, "2—1");
+                            //if (StockBinLocation >= 1 && StockBinLocation <= 8)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX18." + (StockBinLocation - 1), true);
+                            //}
+                            //else if (StockBinLocation >= 9 && StockBinLocation <= 15)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX19." + (StockBinLocation - 9), true);
+                            //}
+                            //MessageNotify.GetInstance.ShowRunLog($"托盘2—1号桶在料仓{StockBinLocation}配料");
                         }
                         else if (BarrelNum == 7)
                         {
-                            if (StockBinLocation >= 1 && StockBinLocation <= 8)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX20." + (StockBinLocation - 1), true);
-                            }
-                            else if (StockBinLocation >= 9 && StockBinLocation <= 15)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX21." + (StockBinLocation - 9), true);
-                            }
-                            MessageNotify.GetInstance.ShowRunLog($"托盘2—2号桶在料仓{StockBinLocation}配料");
+                            TempStockBinPar(20, StockBinLocation, "2—2");
+                            //if (StockBinLocation >= 1 && StockBinLocation <= 8)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX20." + (StockBinLocation - 1), true);
+                            //}
+                            //else if (StockBinLocation >= 9 && StockBinLocation <= 15)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX21." + (StockBinLocation - 9), true);
+                            //}
+                            //MessageNotify.GetInstance.ShowRunLog($"托盘2—2号桶在料仓{StockBinLocation}配料");
                         }
                         else if (BarrelNum == 8)
                         {
-                            if (StockBinLocation >= 1 && StockBinLocation <= 8)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX22." + (StockBinLocation - 1), true);
-                            }
-                            else if (StockBinLocation >= 9 && StockBinLocation <= 15)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX23." + (StockBinLocation - 9), true);
-                            }
-                            MessageNotify.GetInstance.ShowRunLog($"托盘2—3号桶在料仓{StockBinLocation}配料");
+                            TempStockBinPar(22, StockBinLocation, "2—3");
+                            //if (StockBinLocation >= 1 && StockBinLocation <= 8)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX22." + (StockBinLocation - 1), true);
+                            //}
+                            //else if (StockBinLocation >= 9 && StockBinLocation <= 15)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX23." + (StockBinLocation - 9), true);
+                            //}
+                            //MessageNotify.GetInstance.ShowRunLog($"托盘2—3号桶在料仓{StockBinLocation}配料");
                         }
                         else if (BarrelNum == 4)
                         {
-                            if (StockBinLocation >= 1 && StockBinLocation <= 8)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX24." + (StockBinLocation - 1), true);
-                            }
-                            else if (StockBinLocation >= 9 && StockBinLocation <= 15)
-                            {
-                                HK_PLC_S7.Write<bool>("DB4.DBX25." + (StockBinLocation - 9), true);
-                            }
-                            MessageNotify.GetInstance.ShowRunLog($"托盘2—4号桶在料仓{StockBinLocation}配料");
+                            TempStockBinPar(24, StockBinLocation, "2—4");
+                            //if (StockBinLocation >= 1 && StockBinLocation <= 8)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX24." + (StockBinLocation - 1), true);
+                            //}
+                            //else if (StockBinLocation >= 9 && StockBinLocation <= 15)
+                            //{
+                            //    HK_PLC_S7.Write<bool>("DB4.DBX25." + (StockBinLocation - 9), true);
+                            //}
+                            //MessageNotify.GetInstance.ShowRunLog($"托盘2—4号桶在料仓{StockBinLocation}配料");
                         }
                     }
                 }
             }
         }
 
-        public void IssueRecipeToPlc(ObservableCollection<RemoteRecipeRawMaterial> rawMaterials,int recipeLoction)
+        public void IssueRecipeToPlc(ObservableCollection<RemoteRecipeRawMaterial> rawMaterials, int recipeLoction)
         {
             bool[] barrel = new bool[16];
             bool[] barrel1 = new bool[16];
@@ -205,7 +227,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
                 switch (item.RawMaterialBarrelNum)
                 {
                     case 6:
-                        barrel[item.RawMaterialLocation-1] = true;
+                        barrel[item.RawMaterialLocation - 1] = true;
                         barrel1[item.RawMaterialLocation - 1] = true;
                         break;
                     case 7:
@@ -271,4 +293,4 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
 
         }
     }
-}   
\ No newline at end of file
+}
\ No newline at end of file

From 32037eada588419215661a6df573b9eac2be696b Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Sat, 6 May 2023 17:13:50 +0800
Subject: [PATCH 45/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/GVL_SmallStation.cs                 |  14 +-
 .../Model/Par/ConnectParMode.cs               |   3 +
 .../Model/ProcessControl.cs                   | 130 ++++++++++++++----
 .../Model/WindSend/WindSendDeviceStatus.cs    |   6 +
 .../Model/WindSend/WindSendRawMaterial.cs     |  13 ++
 .../Model/WindSend/WindSend_Read.cs           |  37 ++++-
 .../Model/WindSend/WindSend_Write.cs          |  20 ++-
 .../View/ManualFlowView.xaml                  |  20 ++-
 .../View/RecipeInfosView.xaml                 |  16 +++
 .../View/SystemParView.xaml                   |  10 ++
 .../ViewModel/ManualFlowViewModel.cs          |  14 +-
 .../ViewModel/NewLocalRecipeViewModel.cs      |   8 +-
 .../ViewModel/RecipeInfosViewModel.cs         |   4 +
 .../ViewModel/SystemParViewModel.cs           |   8 +-
 14 files changed, 260 insertions(+), 43 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
index dba1e0b7..47d8ffe4 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
@@ -1,6 +1,7 @@
 using BPASmartClient.JXJFoodSmallStation.Model.GVL;
 using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
 using BPASmartClient.JXJFoodSmallStation.Model.Siemens;
+using BPASmartClient.JXJFoodSmallStation.Model.WindSend;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -18,6 +19,11 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         private GVL_SmallStation() { }
 
         public PlcReadAddressDB3 plcReadDataDB3 { get; set; } = new PlcReadAddressDB3();
+
+
+        public WindSend_Write WindSendDB95 { get; set; } = new WindSend_Write();
+
+        public WindSend_Read WindSendDB94 { get; set; } = new WindSend_Read();
         /// <summary>
         /// 配料站料仓数目
         /// </summary>
@@ -161,11 +167,17 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public bool HeartBeatToPlc { get; set; } = false;
 
-        [VarComm("Global", "来自plc的心跳")]
+        [VarComm("Global", "屏蔽小料站料仓不足15个报警")]
 
 
         public bool DisEnableStockAlarm { get; set; } = false;
 
+        [VarComm("Global", "配方制作完成数量")]
+        /// <summary>
+        /// 配方制作完成数量
+        /// </summary>
+        public int RecipeDosingCompleNum { get; set; } = 0;
+
         [VarComm("Global", "来自plc的心跳")]
 
 
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Par/ConnectParMode.cs b/BPASmartClient.JXJFoodSmallStation/Model/Par/ConnectParMode.cs
index a9d552d9..4c57d660 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/Par/ConnectParMode.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Par/ConnectParMode.cs
@@ -15,6 +15,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.Par
         private bool _mWindSendConnect;
         public bool HKPlcConnect { get { return _mHKPlcConnect; } set { _mHKPlcConnect = value; OnPropertyChanged(); } }
         private bool _mHKPlcConnect;
+        public bool ShieldStockbinAlarm { get { return _mShieldStockbinAlarm; } set { _mShieldStockbinAlarm = value; OnPropertyChanged(); } }
+        private bool _mShieldStockbinAlarm;
+        
 
         public short AxisLoadSpeed { get { return _mAxisLoadSpeed; } set { _mAxisLoadSpeed = value; OnPropertyChanged(); } }
         private short _mAxisLoadSpeed;
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index b3bfa792..0d6f4442 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -85,6 +85,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             //Json<RemoteRecipeDataColl>.Data.Recipes = TestData.GetInstance.Recipes;//添加测试数据
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
+                GVL_SmallStation.GetInstance.DisEnableStockAlarm = Json<DevicePar>.Data.deviceConnectPar.ShieldStockbinAlarm;
                 if (HKDevice.IsConnected)
                 {
                     GVL_SmallStation.GetInstance.HeartBeatToPlc = !GVL_SmallStation.GetInstance.HeartBeatToPlc;
@@ -195,6 +196,59 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     }
                 }
             }
+            if (WindSendDevice.IsConnected)
+            {
+                foreach (PropertyInfo item in typeof(WindSend_Write).GetProperties())
+                {
+                    int index = Array.FindIndex(CommData.ToArray(), p => p.Name == item.Name);
+                    if (index >= 0)
+                    {
+                        if (item.PropertyType.IsArray)
+                        {
+                            CommData.ElementAt(index).Value = "";
+                            Array array = (Array)item.GetValue(GVL_SmallStation.GetInstance.plcReadDataDB3, null);
+                            foreach (var values in array)
+                            {
+                                string data = values.ToString();
+                                if (data.ToLower() == "false")
+                                    data = "0";
+                                if (data.ToLower() == "true")
+                                    data = "1";
+                                CommData.ElementAt(index).Value = CommData.ElementAt(index).Value + data + ",";
+                            }
+                        }
+                        else
+                        {
+                            CommData.ElementAt(index).Value = GVL_SmallStation.GetInstance.WindSendDB95.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.GetInstance.WindSendDB95, null).ToString();
+                        }
+                    }
+                }
+                foreach (PropertyInfo item in typeof(WindSend_Read).GetProperties())
+                {
+                    int index = Array.FindIndex(CommData.ToArray(), p => p.Name == item.Name);
+                    if (index >= 0)
+                    {
+                        if (item.PropertyType.IsArray)
+                        {
+                            CommData.ElementAt(index).Value = "";
+                            Array array = (Array)item.GetValue(GVL_SmallStation.GetInstance.plcReadDataDB3, null);
+                            foreach (var values in array)
+                            {
+                                string data = values.ToString();
+                                if (data.ToLower() == "false")
+                                    data = "0";
+                                if (data.ToLower() == "true")
+                                    data = "1";
+                                CommData.ElementAt(index).Value = CommData.ElementAt(index).Value + data + ",";
+                            }
+                        }
+                        else
+                        {
+                            CommData.ElementAt(index).Value = GVL_SmallStation.GetInstance.WindSendDB94.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.GetInstance.WindSendDB94, null).ToString();
+                        }
+                    }
+                }
+            }
             foreach (PropertyInfo item in typeof(GVL_SmallStation).GetProperties())
             {
                 int index = Array.FindIndex(ProcessVar.ToArray(), p => p.Name == item.Name);
@@ -701,60 +755,42 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     {
                                         if (GVL_SmallStation.GetInstance.WindSendDosingStatus == 1)
                                         {
-                                            WindSendReset();
-                                            WindSendData.TargetRecipeCode = code;
-                                            WindSendData.IsAllowDosing = true;
+                                            WindSend_Write WindSendData111 = new WindSend_Write();
+                                            WindSendDevice.Siemens_PLC_S7.WriteClass<WindSend_Write>(WindSendData111, 95);
+                                            Thread.Sleep(200);
+                                            WindSendData111.TargetRecipeCode = code;
+                                            WindSendData111.IsAllowDosing = true;
                                             foreach (var item in RemoteRecipes.ElementAt(index).WindSend)
                                             {
                                                 if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(0).RawMaterialName || item.Location == 1)
                                                 {
-                                                    WindSendData.RawMaterial1_SetWeight = item.RawMaterialWeight;
+                                                    WindSendData111.RawMaterial1_SetWeight = item.RawMaterialWeight;
                                                     MessageNotify.GetInstance.ShowRunLog($"风送料仓{item.RawMaterialName}，设定重量{item.RawMaterialWeight}");
                                                 }
-                                                else
-                                                {
-                                                    WindSendData.RawMaterial1_SetWeight = 0;
-                                                }
                                                 if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(1).RawMaterialName || item.Location == 2)
                                                 {
-                                                    WindSendData.RawMaterial2_SetWeight = item.RawMaterialWeight;
+                                                    WindSendData111.RawMaterial2_SetWeight = item.RawMaterialWeight;
                                                     MessageNotify.GetInstance.ShowRunLog($"风送料仓{item.RawMaterialName}，设定重量{item.RawMaterialWeight}");
                                                 }
-                                                else
-                                                {
-                                                    WindSendData.RawMaterial2_SetWeight = 0;
-                                                }
                                                 if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(2).RawMaterialName || item.Location == 3)
                                                 {
-                                                    WindSendData.RawMaterial3_SetWeight = item.RawMaterialWeight;
+                                                    WindSendData111.RawMaterial3_SetWeight = item.RawMaterialWeight;
                                                     MessageNotify.GetInstance.ShowRunLog($"风送料仓{item.RawMaterialName}，设定重量{item.RawMaterialWeight}");
                                                 }
-                                                else
-                                                {
-                                                    WindSendData.RawMaterial3_SetWeight = 0;
-                                                }
                                                 if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(3).RawMaterialName || item.Location == 4)
                                                 {
-                                                    WindSendData.RawMaterial4_SetWeight = item.RawMaterialWeight;
+                                                    WindSendData111.RawMaterial4_SetWeight = item.RawMaterialWeight;
                                                     MessageNotify.GetInstance.ShowRunLog($"风送料仓{item.RawMaterialName}，设定重量{item.RawMaterialWeight}");
                                                 }
-                                                else
-                                                {
-                                                    WindSendData.RawMaterial4_SetWeight = 0;
-                                                }
                                                 if (item.RawMaterialName == Json<DevicePar>.Data.windSendRawMaterial.ElementAt(4).RawMaterialName || item.Location == 5)
                                                 {
-                                                    WindSendData.RawMaterial5_SetWeight = item.RawMaterialWeight;
+                                                    WindSendData111.RawMaterial5_SetWeight = item.RawMaterialWeight;
                                                     MessageNotify.GetInstance.ShowRunLog($"风送料仓{item.RawMaterialName}，设定重量{item.RawMaterialWeight}");
                                                 }
-                                                else
-                                                {
-                                                    WindSendData.RawMaterial5_SetWeight = 0;
-                                                }
                                             }
                                             GVL_SmallStation.GetInstance.WindSendDosing = true;
                                             GVL_SmallStation.GetInstance.WindSendDosingStatus = 2;
-                                            WindSendDevice.Siemens_PLC_S7.WriteClass<WindSend_Write>(WindSendData, 95);
+                                            WindSendDevice.Siemens_PLC_S7.WriteClass<WindSend_Write>(WindSendData111, 95);
                                         }
                                     }
                                     else
@@ -891,6 +927,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     bool DosingComple = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX6." + recipeNum);
                                     if ((RTrig.GetInstance("配方配料完成").Start(DosingComple)) || (GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] > 0 && DosingComple))
                                     {
+                                        GVL_SmallStation.GetInstance.RecipeDosingCompleNum = GVL_SmallStation.GetInstance.RecipeDosingCompleNum + 1;
                                         GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] = 0;
                                         if (GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] > 0)
                                         {
@@ -1008,6 +1045,40 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }
 
+            foreach (PropertyInfo item in typeof(WindSend_Read).GetProperties())
+            {
+                if (Attribute.IsDefined(item, typeof(VarCommAttribute)))
+                {
+                    string type = item.PropertyType.ToString();
+                    CommData.Add(new PlcInfos()
+                    {
+                        Count = CommData.Count + 1,
+                        Name = item.Name,
+                        Address = item.GetCustomAttribute<VarCommAttribute>().Address,
+                        Type = type.Substring(type.IndexOf(".") + 1),
+                        Describe = item.GetCustomAttribute<VarCommAttribute>().Describe,
+                        Value = item.GetValue(GVL_SmallStation.GetInstance.WindSendDB94).ToString(),
+                    });
+                }
+            }
+
+            foreach (PropertyInfo item in typeof(WindSend_Write).GetProperties())
+            {
+                if (Attribute.IsDefined(item, typeof(VarCommAttribute)))
+                {
+                    string type = item.PropertyType.ToString();
+                    CommData.Add(new PlcInfos()
+                    {
+                        Count = CommData.Count + 1,
+                        Name = item.Name,
+                        Address = item.GetCustomAttribute<VarCommAttribute>().Address,
+                        Type = type.Substring(type.IndexOf(".") + 1),
+                        Describe = item.GetCustomAttribute<VarCommAttribute>().Describe,
+                        Value = item.GetValue(GVL_SmallStation.GetInstance.WindSendDB95).ToString(),
+                    });
+                }
+            }
+
             foreach (PropertyInfo item in typeof(GVL_SmallStation).GetProperties())
             {
                 if (Attribute.IsDefined(item, typeof(VarCommAttribute)))
@@ -1518,6 +1589,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             WindSendDevice.Siemens_PLC_S7.Write("DB95.DBD4", weight);
             WindSendDevice.Siemens_PLC_S7.Write("DB95.DBD8", weight);
             WindSendDevice.Siemens_PLC_S7.Write("DB95.DBD12", weight);
+            WindSendDevice.Siemens_PLC_S7.Write("DB95.DBD16", weight);
             WindSendDevice.Siemens_PLC_S7.Write("DB95.DBX38.1", false);
         }
         public void RawMaterialNameWithCode()
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
index 7ea4b6ac..c209bf98 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceStatus.cs
@@ -24,9 +24,15 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             {
                 if (IsConnected)
                 {
+                    var res0 = this.Siemens_PLC_S7.ReadClass<WindSend_Write>(95);
+                    if (res0 != null && res0 is WindSend_Write WriteData)
+                    {
+                        GVL_SmallStation.GetInstance.WindSendDB95 = WriteData;
+                    }
                     var res1 = this.Siemens_PLC_S7.ReadClass<WindSend_Read>(94);
                     if (res1 != null && res1 is WindSend_Read readData)
                     {
+                        GVL_SmallStation.GetInstance.WindSendDB94 = readData;
                         GVL_SmallStation.GetInstance.WindSendAllowAGVPutGet = readData.HoodLiftInPlace;
                         Siemens_PLC_S7.Write<bool>("DB95.DBX38.2", GVL_SmallStation.GetInstance.Station1HaveTray);//工站1有托盘
                         switch (GVL_SmallStation.GetInstance.WindSendDosingStatus)
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs
index 7d48cee8..2b9f1a54 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs
@@ -30,5 +30,18 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public float DosingCompleWeight { get { return _mDosingCompleWeight; } set { _mDosingCompleWeight = value; OnPropertyChanged(); } }
         private float _mDosingCompleWeight;
+
+
+        /// <summary>
+        /// 原料对应的桶号
+        /// </summary>
+        public short RawMaterialBarrelNum { get { return _mRawMaterialBarrelNum; } set { _mRawMaterialBarrelNum = value; OnPropertyChanged(); } }
+        private short _mRawMaterialBarrelNum;
+        /// <summary>
+        /// 原料类型
+        /// </summary>
+
+        public string RawMaterialType { get { return _mRawMaterialType; } set { _mRawMaterialType = value; OnPropertyChanged(); } }
+        private string _mRawMaterialType;
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Read.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Read.cs
index 222a2f6c..64d134d7 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Read.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Read.cs
@@ -1,4 +1,5 @@
-using BPASmartClient.S7Net;
+using BPASmartClient.JXJFoodSmallStation.Model.GVL;
+using BPASmartClient.S7Net;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,74 +8,106 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model.WindSend
 {
-    internal class WindSend_Read
+    public class WindSend_Read
     {
+        [VarComm("DB94.DBX0.0", "吸风罩提升到位")]
         /// <summary>
         /// 吸风罩提升到位
         /// </summary>
         public bool HoodLiftInPlace { get; set; }
+
+        [VarComm("DB94.DBX0.1", "配方接收完成")]
         /// <summary>
         /// 配方接收完成
         /// </summary>
         public bool RecipeReceiveFinish { get; set; }
+
+        [VarComm("DB94.DBX0.2", "制作完成信号")]
         /// <summary>
         /// 制作完成信号
         /// </summary>
         public bool CurrentCompleteSign { get; set; }
+
+        [VarComm("DB94.DBX0.3", "允许下发信号")]
         /// <summary>
         /// 允许下发信号
         /// </summary>
         public bool IsAllowIssue { get; set; }
+
+        [VarComm("DB94.DBX0.4", "排料完成信号")]
         /// <summary>
         /// 排料完成信号
         /// </summary>
         public bool DisChargeComple { get; set; }
+
+        [VarComm("DB94.DBW2", "当前配方编码")]
         /// <summary>
         /// 当前配方编码
         /// </summary>
         [Siemens(16)]
         public string CurrentRecipeCode { get; set; } = "";
+
+        [VarComm("DB94.DBW20", "系统状态")]
         /// <summary>
         /// 系统状态
         /// </summary>
         public short SystemRunStatus { get; set; }
+
+        [VarComm("DB94.DBD22", "原料1下料完成重量")]
         /// <summary>
         /// 原料1下料完成重量
         /// </summary>
         public float RawMaterial1_FinishWeight { get; set; }
+
+        [VarComm("DB94.DBD26", "原料2下料完成重量")]
         /// <summary>
         /// 原料2下料完成重量
         /// </summary>
         public float RawMaterial2_FinishWeight { get; set; }
+
+        [VarComm("DB94.DBD30", "原料3下料完成重量")]
         /// <summary>
         /// 原料3下料完成重量
         /// </summary>
         public float RawMaterial3_FinishWeight { get; set; }
+
+        [VarComm("DB94.DBD34", "原料4下料完成重量")]
         /// <summary>
         /// 原料4下料完成重量
         /// </summary>
         public float RawMaterial4_FinishWeight { get; set; }
+
+        [VarComm("DB94.DBD38", "原料5下料完成重量")]
         /// <summary>
         /// 原料5下料完成重量
         /// </summary>
         public float RawMaterial5_FinishWeight { get; set; }
 
+        [VarComm("DB94.DBD42", "原料1料仓重量")]
         /// <summary>
         /// 原料1料仓重量
         /// </summary>
         public float RawMaterial1_StockBinWeight { get; set; }
+
+        [VarComm("DB94.DBD46", "原料2料仓重量")]
         /// <summary>
         /// 原料2料仓重量
         /// </summary>
         public float RawMaterial2_StockBinWeight { get; set; }
+
+        [VarComm("DB94.DBD50", "原料3料仓重量")]
         /// <summary>
         /// 原料3料仓重量
         /// </summary>
         public float RawMaterial3_StockBinWeight { get; set; }
+
+        [VarComm("DB94.DBD54", "原料4料仓重量")]
         /// <summary>
         /// 原料4料仓重量
         /// </summary>
         public float RawMaterial4_StockBinWeight { get; set; }
+
+        [VarComm("DB94.DBD58", "原料5料仓重量")]
         /// <summary>
         /// 原料5料仓重量
         /// </summary>
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Write.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Write.cs
index fd619b57..bf7edf6d 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Write.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSend_Write.cs
@@ -1,4 +1,5 @@
-using BPASmartClient.S7Net;
+using BPASmartClient.JXJFoodSmallStation.Model.GVL;
+using BPASmartClient.S7Net;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,39 +10,56 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.WindSend
 {
     public class WindSend_Write
     {
+        [VarComm("DB95.DBD0", "原料1设定重量")]
         /// <summary>
         /// 原料1设定重量
         /// </summary>
         public float RawMaterial1_SetWeight { get; set; }
+
+        [VarComm("DB95.DBD4", "原料2设定重量")]
         /// <summary>
         /// 原料2设定重量
         /// </summary>
         public float RawMaterial2_SetWeight { get; set; }
+
+        [VarComm("DB95.DBD8", "原料3设定重量")]
         /// <summary>
         /// 原料3设定重量
         /// </summary>
         public float RawMaterial3_SetWeight { get; set; }
+
+        [VarComm("DB95.DBD12", "原料4设定重量")]
         /// <summary>
         /// 原料4设定重量
         /// </summary>
         public float RawMaterial4_SetWeight { get; set; }
+
+        [VarComm("DB95.DBD16", "原料5设定重量")]
         /// <summary>
         /// 原料5设定重量
         /// </summary>
         public float RawMaterial5_SetWeight { get; set; }
+
+        [VarComm("DB95.DBW20", "目标配方编码")]
         /// <summary>
         /// 目标配方编码
         /// </summary>
         [Siemens(16)]
         public string TargetRecipeCode { get; set; } = "";
+
+        [VarComm("DB95.DBX38.0", "允许配料")]
         /// <summary>
         /// 允许配料
         /// </summary>
         public bool IsAllowDosing { get; set; }
+
+        [VarComm("DB95.DBX38.1", "配方制作完成接收")]
         /// <summary>
         /// 配方制作完成接收
         /// </summary>
         public bool RecipeCompleRec { get; set; }
+
+        [VarComm("DB95.DBX38.2", "工位1有信号")]
         /// <summary>
         /// 工位1有信号
         /// </summary>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
index 4b6e9284..9fcc8066 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontSize="25"
                     Foreground="#FF2AB2E7" />
-                <Button
+                <!--<Button
                     Width="200"
                     Height="40"
                     Margin="5"
@@ -74,7 +74,7 @@
                     Command="{Binding Test5Command}"
                     Content="粉料仓提升到位"
                     FontSize="20"
-                    Style="{StaticResource ImageButtonStyle}" />
+                    Style="{StaticResource ImageButtonStyle}" />-->
                 <Button
                     Width="200"
                     Height="40"
@@ -454,6 +454,22 @@
                         FontSize="20"
                         Style="{StaticResource ImageButtonStyle}" />
                 </WrapPanel>
+                <WrapPanel Grid.Row="2" Grid.Column="2">
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="配方制作完成数目:" />
+                    <TextBlock
+                        Width="150"
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding RecipeDosingCompleNum}" />
+                </WrapPanel>
             </Grid>
         </Grid>
     </Grid>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml
index f7602989..5dfcccfe 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml
@@ -145,6 +145,7 @@
                                 <ColumnDefinition Width="2*" />
                                 <ColumnDefinition Width="2*" />
                                 <ColumnDefinition Width="2*" />
+                                <ColumnDefinition Width="2*" />
                             </Grid.ColumnDefinitions>
                             <TextBlock
                                 Grid.Column="0"
@@ -174,6 +175,13 @@
                                 FontSize="16">
                                 原料重量
                             </TextBlock>
+                            <TextBlock
+                                Grid.Column="4"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontSize="16">
+                                原料类型
+                            </TextBlock>
                         </Grid>
                         <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Hidden">
                             <ItemsControl Width="548" ItemsSource="{Binding RawMaterialsInfo}">
@@ -185,6 +193,7 @@
                                                 <ColumnDefinition Width="2*" />
                                                 <ColumnDefinition Width="2*" />
                                                 <ColumnDefinition Width="2*" />
+                                                <ColumnDefinition Width="2*" />
                                             </Grid.ColumnDefinitions>
                                             <TextBlock
                                                 Grid.Column="0"
@@ -214,6 +223,13 @@
                                                 FontSize="20"
                                                 Foreground="#FF2AB2E7"
                                                 Text="{Binding RawMaterialWeight}" />
+                                            <TextBlock
+                                                Grid.Column="4"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Top"
+                                                FontSize="20"
+                                                Foreground="#FF2AB2E7"
+                                                Text="{Binding RawMaterialType}" />
                                         </Grid>
                                         <DataTemplate.Triggers>
                                             <Trigger Property="IsMouseOver" Value="true">
diff --git a/BPASmartClient.JXJFoodSmallStation/View/SystemParView.xaml b/BPASmartClient.JXJFoodSmallStation/View/SystemParView.xaml
index 79c43cc1..69d081ed 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/SystemParView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/SystemParView.xaml
@@ -184,6 +184,16 @@
                 Foreground="Aqua"
                 IsChecked="{Binding HKPlcConnect}" />
 
+
+            <CheckBox
+                Margin="0,10,10,0"
+                VerticalAlignment="Center"
+                Content="屏蔽小料仓数量读取报警"
+                FontFamily="楷体"
+                FontSize="20"
+                Foreground="Aqua"
+                IsChecked="{Binding ShieldStockbinAlarm}" />
+
         </StackPanel>
         <Grid
             Grid.Row="1"
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
index aed63cb4..b429ef1a 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
@@ -72,11 +72,11 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，气缸收紧错位复位");
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，气缸收紧错位复位");
             });
-            Test5Command = new RelayCommand(() =>
-            {
-                GVL_SmallStation.GetInstance.WindSendAllowAGVPutGet = true;
-                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，粉料仓提升到位");
-            });
+            //Test5Command = new RelayCommand(() =>
+            //{
+            //    GVL_SmallStation.GetInstance.WindSendAllowAGVPutGet = true;
+            //    MessageNotify.GetInstance.ShowUserLog("手动点击按钮，粉料仓提升到位");
+            //});
             Test6Command = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("AGVPutTrayFinish");
@@ -149,6 +149,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             });
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
+                RecipeDosingCompleNum = GVL_SmallStation.GetInstance.RecipeDosingCompleNum;
                 Recipe1DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[0].ToBinString();
                 Recipe2DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[1].ToBinString();
                 Recipe3DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[2].ToBinString();
@@ -326,6 +327,9 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public static int StockbinDosingCompleNum { get { return _StockbinDosingCompleNum; } set { _StockbinDosingCompleNum = value; OnStaticPropertyChanged(); } }
 
 
+        private static int _RecipeDosingCompleNum { get; set; }
+        public static int RecipeDosingCompleNum { get { return _RecipeDosingCompleNum; } set { _RecipeDosingCompleNum = value; OnStaticPropertyChanged(); } }
+
         public static Visibility VisibilityBtn1 { get { return _VisibilityBtn1; } set { _VisibilityBtn1 = value; OnStaticPropertyChanged(); } }
         private static Visibility _VisibilityBtn1 = Visibility.Visible;
         public static Visibility VisibilityBtn2 { get { return _VisibilityBtn2; } set { _VisibilityBtn2 = value; OnStaticPropertyChanged(); } }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
index bdd401c9..a1a8e8e6 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
@@ -35,11 +35,11 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     {
                         AllRawMaterial.Add(new RemoteRecipeRawMaterial()
                         {
-                            RawMaterialType = "粉料",
+                            RawMaterialType = item1.RawMaterialType,
                             RawMaterialName = item1.RawMaterialName,
                             RawMaterialWeight = item1.RawMaterialWeight,
                             RawMaterialLocation = item1.Location,
-                            RawMaterialBarrelNum = 3,
+                            RawMaterialBarrelNum = item1.RawMaterialBarrelNum,
                         });
                     }
                 }
@@ -156,6 +156,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                                 RawMaterialName = item.RawMaterialName,
                                 RawMaterialWeight = item.RawMaterialWeight,
                                 Location = item.RawMaterialLocation,
+                                RawMaterialType =item.RawMaterialType,
+                                RawMaterialBarrelNum=item.RawMaterialBarrelNum,
                             });
                         }
                     }
@@ -188,6 +190,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                                 RawMaterialName = item.RawMaterialName,
                                 RawMaterialWeight = item.RawMaterialWeight,
                                 Location = item.RawMaterialLocation,
+                                RawMaterialType = item.RawMaterialType,
+                                RawMaterialBarrelNum = item.RawMaterialBarrelNum,
                             });
                         }
                     }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeInfosViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeInfosViewModel.cs
index a8e798a9..94751f12 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeInfosViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeInfosViewModel.cs
@@ -29,6 +29,10 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     {
                         RawMaterialsInfo.Add(item);
                     }
+                    foreach (var item1 in rm.WindSend)
+                    {
+                        RawMaterialsInfo.Add(new RemoteRecipeRawMaterial() { RawMaterialName= item1.RawMaterialName, RawMaterialLocation= item1.Location,RawMaterialBarrelNum= item1.RawMaterialBarrelNum,RawMaterialWeight= item1.RawMaterialWeight,RawMaterialType=item1.RawMaterialType});
+                    }
                 }
             }), "RecipeInfo");
 
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs
index 530031de..5cc76574 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs
@@ -24,6 +24,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             SiemensConnect = Json<DevicePar>.Data.deviceConnectPar.SiemensConnect;
             WindSendConnect = Json<DevicePar>.Data.deviceConnectPar.WindSendConnect;
             HKPlcConnect = Json<DevicePar>.Data.deviceConnectPar.HKPlcConnect;
+            ShieldStockbinAlarm = Json<DevicePar>.Data.deviceConnectPar.ShieldStockbinAlarm;
+
             AxisLoadSpeed = Json<DevicePar>.Data.deviceConnectPar.AxisLoadSpeed;
             AxisMidSpeed = Json<DevicePar>.Data.deviceConnectPar.AxisMidSpeed;
             AxisUnLoadSpeed = Json<DevicePar>.Data.deviceConnectPar.AxisUnLoadSpeed;
@@ -35,6 +37,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 Json<DevicePar>.Data.deviceConnectPar.SiemensConnect = SiemensConnect;
                 Json<DevicePar>.Data.deviceConnectPar.WindSendConnect = WindSendConnect;
                 Json<DevicePar>.Data.deviceConnectPar.HKPlcConnect = HKPlcConnect;
+                Json<DevicePar>.Data.deviceConnectPar.ShieldStockbinAlarm = ShieldStockbinAlarm;
+
                 Json<DevicePar>.Data.deviceConnectPar.AxisLoadSpeed = AxisLoadSpeed;
                 Json<DevicePar>.Data.deviceConnectPar.AxisMidSpeed = AxisMidSpeed;
                 Json<DevicePar>.Data.deviceConnectPar.AxisUnLoadSpeed = AxisUnLoadSpeed;
@@ -69,7 +73,9 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         private bool _mWindSendConnect;
         public bool HKPlcConnect { get { return _mHKPlcConnect; } set { _mHKPlcConnect = value; OnPropertyChanged(); } }
         private bool _mHKPlcConnect;
-
+        public bool ShieldStockbinAlarm { get { return _mShieldStockbinAlarm; } set { _mShieldStockbinAlarm = value; OnPropertyChanged(); } }
+        private bool _mShieldStockbinAlarm;
+        
         public short AxisLoadSpeed { get { return _mAxisLoadSpeed; } set { _mAxisLoadSpeed = value; OnPropertyChanged(); } }
         private short _mAxisLoadSpeed;
         public short AxisMidSpeed { get { return _mAxisMidSpeed; } set { _mAxisMidSpeed = value; OnPropertyChanged(); } }

From ab0b79bf630d7487edfa6dfcda24682983d76f44 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Mon, 8 May 2023 14:14:28 +0800
Subject: [PATCH 46/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/HK_PLC/HKDeviceStatus.cs            | 12 ++++-
 .../Model/ProcessControl.cs                   | 46 ++++++++-----------
 .../View/RecipeInfosView.xaml                 | 36 +++++++++------
 .../ViewModel/RecipeInfosViewModel.cs         | 15 +++---
 4 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
index 591fbd89..a9e99d61 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
@@ -133,6 +133,16 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
                         }
                     }
                 }
+                //验证配方数据是否下发
+                Thread.Sleep(200);
+                if (!ReadPlcRecipeData(recipe))
+                {
+                    App.Current.Dispatcher.Invoke(() =>
+                    {
+                        MessageNotify.GetInstance.ShowDialog($"配方{recipe.RecipeCode}，plc配方数据和西门子配方数据不一致!", DialogType.Error);
+                    });
+                }
+                MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，配方数据验证成功");
             }
         }
         /// <summary>
@@ -197,7 +207,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
                                 {
                                     string Address = "";
                                     float ReadWeight = (float)0.0;
-                                    MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
                                     switch (barrel)
                                     {
                                         case 1:
@@ -219,6 +228,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
                                         default:
                                             break;
                                     }
+                                    MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，地址：{Address}，重量：{ReadWeight}");
                                     if (Math.Floor(recipe.RawMaterial.ElementAt(index).RawMaterialWeight) != Math.Floor(ReadWeight))
                                     {
                                         return false;
diff --git a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
index 6083fc69..b39de61f 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
@@ -225,20 +225,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             {
                                 GVL_BigStation.BarrelWasherSign = true;
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", true);//洗桶
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
+                                MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，订单类型为洗桶");
 
                                 HKDevice.WritePlcRecipeData(LocalRecipes.ElementAt(index));
-                                Thread.Sleep(200);
-                                if (!HKDevice.ReadPlcRecipeData(LocalRecipes.ElementAt(index))) 
-                                {
-                                    App.Current.Dispatcher.Invoke(() =>
-                                    {
-                                        MessageNotify.GetInstance.ShowDialog($"plc配方数据和西门子配方数据不一致!", DialogType.Error);
-                                    });
-                                };
                                 HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
                                 GVL_BigStation.Recipe1DosingStatus = 1;
-                                MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                                MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                             }
                         }
                         else
@@ -246,7 +238,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             HKDevice.WritePlcRecipeData(LocalRecipes.ElementAt(index));
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", true);
                             GVL_BigStation.Recipe1DosingStatus = 1;
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，下发完成");
+                            MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，下发完成");
                         }
                     }
                     if (HKDevice.PlcRead.ReceiveFinishRecipe1 && GVL_BigStation.Recipe1DosingStatus == 1)
@@ -254,12 +246,12 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         if (LocalRecipes.ElementAt(index).IsWashingBarrel)
                         {
                             HKDevice.HK_PLC_S7.Write("DB99.DBX0.1", false);//洗桶复位
-                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，洗桶信号复位");
+                            MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，洗桶信号复位");
                         }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", false);
                         StockBinParReset();
                         GVL_BigStation.Recipe1DosingStatus = 2;
-                        MessageNotify.GetInstance.ShowRunLog($"配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
+                        MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，PLC接收配方完成");
                     }
                     if (GVL_BigStation.Recipe1DosingStatus == 2 && HKDevice.PlcRead.Recipe1DosingFinish)
                     {
@@ -288,7 +280,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             default:
                                 break;
                         }
-                        MessageNotify.GetInstance.ShowRunLog($"配方状态：{code}配料完成");
+                        MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，配料完成");
                         foreach (var item in LocalRecipes.ElementAt(index).RawMaterial)
                         {
                             if (item.RawMaterialLocation == 1)
@@ -1001,7 +993,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     else 
                     {
-                        if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1) 
+                        if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1)
                         {
                             SiemensRecipeQueue1.Enqueue(data.RecipeCode);
                             MessageNotify.GetInstance.ShowRunLog($"本地配方，配方：{data.RecipeCode}，加入队列1");
@@ -1346,7 +1338,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         GVL_BigStation.Recipe1DosingFinish = true;
                         GVL_BigStation.Recipe1DosingStatus = 3;
-                        MessageNotify.GetInstance.ShowRunLog($"配方1，配方状态：{code}配料完成");
+                        MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，配料完成");
                         ReadStockBinDosingWeight(SiemensRecipes.ElementAt(index));
                         if (SiemensDevice.IsConnected && !GVL_BigStation.IsUseLocalRecipe)
                         {
@@ -1368,7 +1360,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe1Time).TotalSeconds;
                             FinishData.ProcessTime = Convert.ToInt16(a);
                             SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
-                            MessageNotify.GetInstance.ShowRunLog($"配方1，{code}配方配料完成，将信号反馈给西门子");
+                            MessageNotify.GetInstance.ShowRunLog($"配方1，，配方编号：{code}，托盘编号：{trayCode}，配料完成，将信号反馈给西门子");
                         }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX1.4", true);
                         GVL_BigStation.Recipe1DosingStatus = 3;
@@ -1382,7 +1374,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
                         });
                         GVL_BigStation.Recipe1DosingStatus = 0;
-                        MessageNotify.GetInstance.ShowRunLog($"配方1，{code}配方配料完成，复位plc配料完成信号");
+                        MessageNotify.GetInstance.ShowRunLog($"配方1，，配方编号：{code}，托盘编号：{trayCode}，复位plc配料完成信号");
                     }
                 }
             }
@@ -1459,7 +1451,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             GVL_BigStation.BarrelWasherSign = false;
                         }
                         GVL_BigStation.Recipe2DosingFinish = true;
-                        MessageNotify.GetInstance.ShowRunLog($"配方2，配方状态：{code}配料完成");
+                        MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，配料完成");
                         ReadStockBinDosingWeight(SiemensRecipes.ElementAt(index));
                         if (SiemensDevice.IsConnected && !GVL_BigStation.IsUseLocalRecipe)
                         {
@@ -1481,7 +1473,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe2Time).TotalSeconds;
                             FinishData.ProcessTime = Convert.ToInt16(a);
                             SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
-                            MessageNotify.GetInstance.ShowRunLog($"配方2，{code}配方配料完成，将信号反馈给西门子");
+                            MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，配料完成，将信号反馈给西门子");
                         }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX1.5", true);
                         GVL_BigStation.Recipe2DosingStatus = 3;
@@ -1496,7 +1488,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
                         });
                         GVL_BigStation.Recipe2DosingStatus = 0;
-                        MessageNotify.GetInstance.ShowRunLog($"配方2，{code}配方配料完成，复位plc配料完成信号");
+                        MessageNotify.GetInstance.ShowRunLog($"配方2，，配方编号：{code}，托盘编号：{trayCode}，，复位plc配料完成信号");
                     }
                 }
             }
@@ -1573,7 +1565,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         GVL_BigStation.Recipe3DosingFinish = true;
                         GVL_BigStation.Recipe3DosingStatus = 3;
-                        MessageNotify.GetInstance.ShowRunLog($"配方3，配方状态：{code}配料完成");
+                        MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，配料完成");
                         ReadStockBinDosingWeight(SiemensRecipes.ElementAt(index));
                         if (SiemensDevice.IsConnected && !GVL_BigStation.IsUseLocalRecipe)
                         {
@@ -1595,7 +1587,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe3Time).TotalSeconds;
                             FinishData.ProcessTime = Convert.ToInt16(a);
                             SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
-                            MessageNotify.GetInstance.ShowRunLog($"配方3，{code}配方配料完成，将信号反馈给西门子");
+                            MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，配料完成，将信号反馈给西门子");
                         }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX1.6", true);
                         GVL_BigStation.Recipe3DosingStatus = 3;
@@ -1609,7 +1601,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
                         });
                         GVL_BigStation.Recipe3DosingStatus = 0;
-                        MessageNotify.GetInstance.ShowRunLog($"配方3，{code}配方配料完成，复位plc配料完成信号");
+                        MessageNotify.GetInstance.ShowRunLog($"配方3，，配方编号：{code}，托盘编号：{trayCode}，复位plc配料完成信号");
                     }
                 }
             }
@@ -1686,7 +1678,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         }
                         GVL_BigStation.Recipe4DosingFinish = true;
                         GVL_BigStation.Recipe4DosingStatus = 3;
-                        MessageNotify.GetInstance.ShowRunLog($"配方4，配方状态：{code}配料完成");
+                        MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，配料完成");
                         ReadStockBinDosingWeight(SiemensRecipes.ElementAt(index));
                         if (SiemensDevice.IsConnected && !GVL_BigStation.IsUseLocalRecipe)
                         {
@@ -1708,7 +1700,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe4Time).TotalSeconds;
                             FinishData.ProcessTime = Convert.ToInt16(a);
                             SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
-                            MessageNotify.GetInstance.ShowRunLog($"配方4，{code}配方配料完成，将信号反馈给西门子");
+                            MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，配料完成，将信号反馈给西门子");
                         }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX1.7", true);
                         GVL_BigStation.Recipe4DosingStatus = 3;
@@ -1722,7 +1714,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
                         });
                         GVL_BigStation.Recipe4DosingStatus = 0;
-                        MessageNotify.GetInstance.ShowRunLog($"配方4，{code}配方配料完成，复位plc配料完成信号");
+                        MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号：{code}，托盘编号：{trayCode}，复位plc配料完成信号");
                     }
                 }
             }
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml
index 0d22968d..4d21eab2 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml
@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
     Title="RecipeInfosView"
-    Width="800"
+    Width="1000"
     Height="620"
     AllowsTransparency="True"
     Background="{x:Null}"
@@ -305,17 +305,20 @@
                     <ColumnDefinition/>
                     <ColumnDefinition/>
                     <ColumnDefinition/>
+                    <ColumnDefinition/>
                     <ColumnDefinition Width="120"/>
                 </Grid.ColumnDefinitions>
-                <TextBlock Grid.Column="0" Text="原料名称" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                <TextBlock Grid.Column="0" Text="原料位置" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                 <GridSplitter></GridSplitter>
-                <TextBlock Grid.Column="1" Text="原料位置" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                <TextBlock Grid.Column="1" Text="原料名称" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                <GridSplitter Grid.Column="1"></GridSplitter>
+                <TextBlock Grid.Column="2" Text="原料中文名" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                 <GridSplitter Grid.Column="1"></GridSplitter>
-                <TextBlock Grid.Column="2" Text="托盘桶号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                <TextBlock Grid.Column="3" Text="托盘桶号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                 <GridSplitter Grid.Column="2"></GridSplitter>
-                <TextBlock Grid.Column="3" Text="原料重量" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"></TextBlock>
+                <TextBlock Grid.Column="4" Text="原料重量" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"></TextBlock>
                 <GridSplitter Grid.Column="3"></GridSplitter>
-                <TextBlock Grid.Column="4" Text="操作"     HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                <TextBlock Grid.Column="5" Text="操作"     HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
             </Grid>
             <ScrollViewer Grid.Row="3" VerticalScrollBarVisibility="Hidden">
                 <ItemsControl ItemsSource="{Binding RawMaterialsInfo}">
@@ -335,6 +338,7 @@
                                                 <ColumnDefinition></ColumnDefinition>
                                                 <ColumnDefinition></ColumnDefinition>
                                                 <ColumnDefinition></ColumnDefinition>
+                                                <ColumnDefinition></ColumnDefinition>
                                                 <ColumnDefinition Width="120"></ColumnDefinition>
                                             </Grid.ColumnDefinitions>
                                             <!--<ComboBox ItemsSource="{Binding DataContext.materialNames,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ItemsControl}}" Text="{Binding RawMaterialLocation}"  Margin="10,0,0,10" Width="190" FontSize="14" KeyUp="ComboBox_KeyUp" LostFocus="ComboBox_LostFocus">
@@ -356,36 +360,40 @@
                                                 FontSize="14"
                                                 Foreground="LightGray"
                                                 IsEditable="False"
-                                                ItemsSource="{Binding DataContext.RawMaterialNames, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                                SelectedIndex="{Binding RawMaterialCount}"
+                                                ItemsSource="{Binding DataContext.RawMaterialLocation, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                                SelectedValue="{Binding RawMaterialLocation}"
                                                 MouseLeave="ComboBox_MouseLeave"
                                                 Style="{StaticResource ComboBoxStyle}"
-                                                Text="{Binding RawMaterialName}"/>
+                                                Text="{Binding RawMaterialLocation}"/>
                                             <StackPanel 
                                                VerticalAlignment="Center" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center" >
-                                                <TextBlock Grid.Column="1" Text="{Binding RawMaterialLocation}" Background="Transparent" FontSize="14"  Foreground="LightGray"  ></TextBlock>
+                                                <TextBlock Grid.Column="1" Text="{Binding RawMaterialName}" Background="Transparent" FontSize="14"  Foreground="LightGray"  ></TextBlock>
+                                            </StackPanel>
+                                            <StackPanel 
+                                               VerticalAlignment="Center" Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Center" >
+                                                <TextBlock Grid.Column="1" Text="{Binding RawMaterialChineseName}" Background="Transparent" FontSize="14"  Foreground="LightGray"  ></TextBlock>
                                             </StackPanel>
                                             <!--<TextBox Text="{Binding RawMaterialName}" Background="Transparent" FontSize="14"
                                                        BorderBrush="#e69519" Foreground="LightGray" Width="190" Margin="10,0,0,10" ></TextBox>-->
                                             <StackPanel 
-                                                Margin="3" Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Center">
+                                                Margin="3" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Center">
                                                 <TextBox Text="{Binding RawMaterialBarrelNum}" Background="Transparent" FontSize="14"
                                                        BorderBrush="#e69519" Foreground="LightGray" Width="120" ></TextBox>
                                             </StackPanel>
                                             <StackPanel 
-                                                Margin="3" Orientation="Horizontal"  Grid.Column="3" HorizontalAlignment="Center">
+                                                Margin="3" Orientation="Horizontal"  Grid.Column="4" HorizontalAlignment="Center">
                                                 <TextBox Text="{Binding RawMaterialWeight}" Background="Transparent" FontSize="14"
                                                        BorderBrush="#e69519" Foreground="LightGray" Width="120" ></TextBox>
                                                 <TextBlock FontSize="14" VerticalAlignment="Center" Margin="4,0,0,0" Text="Kg" Foreground="#e69519" ></TextBlock>
                                             </StackPanel>
-                                            <Button Grid.Column="4"
+                                            <Button Grid.Column="5"
                                                     Content="删除"
                                                     Width="94"
                                                     FontSize="14"
                                                     Background="Transparent"
                                                        BorderBrush="#e69519" Foreground="LightGray" HorizontalAlignment="Center"
                                                     Command="{Binding DataContext.RemoveRecipe,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ItemsControl}}"
-                                                    CommandParameter="{Binding RawMaterialCount}"></Button>
+                                                    CommandParameter="{Binding RawMaterialLocation}"></Button>
                                         </Grid>
                                     </ControlTemplate>
                                 </RadioButton.Template>
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
index 6e9ac351..7fdefbbd 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
@@ -22,7 +22,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
         {
             foreach (var item in ProcessControl.GetInstance.RawMaterialsInfo)
             {
-                RawMaterialNames.Add(item.RawMaterialName);
+                RawMaterialLocation.Add(item.RawMaterialLocation);
             }
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
@@ -34,7 +34,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                     IsWashingBarrel = rm.IsWashingBarrel;
                     foreach (var item in rm.RawMaterial)
                     {
-                        item.RawMaterialCount = Array.FindIndex(ProcessControl.GetInstance.RawMaterialsInfo.ToArray(), p => p.RawMaterialName == item.RawMaterialName);
+                        //item.RawMaterialCount = Array.FindIndex(ProcessControl.GetInstance.RawMaterialsInfo.ToArray(), p => p.RawMaterialName == item.RawMaterialName);
                         RawMaterialsInfo.Add(item);
                     }
                 }
@@ -43,10 +43,11 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
             {
                 foreach (var item in RawMaterialsInfo)
                 {
-                    if (RawMaterialNames.Contains(item.RawMaterialName))
+                    if (RawMaterialLocation.Contains(item.RawMaterialLocation))
                     {
-                        int index = Array.FindIndex(ProcessControl.GetInstance.RawMaterialsInfo.ToArray(), p => p.RawMaterialName == item.RawMaterialName);
-                        item.RawMaterialLocation = ProcessControl.GetInstance.RawMaterialsInfo.ElementAt(index).RawMaterialLocation;
+                        int index = Array.FindIndex(ProcessControl.GetInstance.RawMaterialsInfo.ToArray(), p => p.RawMaterialLocation == item.RawMaterialLocation);
+                        item.RawMaterialName = ProcessControl.GetInstance.RawMaterialsInfo.ElementAt(index).RawMaterialName;
+                        item.RawMaterialChineseName = ProcessControl.GetInstance.RawMaterialsInfo.ElementAt(index).RawMaterialChineseName;
                     }
                 }
             }), "RawMaterialNames",true);
@@ -111,7 +112,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
             });
 
             RemoveRecipe = new RelayCommand<int>((index) => {
-                var res = RawMaterialsInfo.FirstOrDefault(p => p.RawMaterialCount == index);
+                var res = RawMaterialsInfo.FirstOrDefault(p => p.RawMaterialLocation == index);
                 if (res != null)
                     RawMaterialsInfo.Remove(res);
             });
@@ -141,6 +142,6 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
 
         public ObservableCollection<RawMaterial> RawMaterialsInfo { get; set; } = new ObservableCollection<RawMaterial>() ;
 
-        public ObservableCollection<string> RawMaterialNames { get; set; } = new ObservableCollection<string>();
+        public ObservableCollection<int> RawMaterialLocation { get; set; } = new ObservableCollection<int>();
     }
 }

From 6edaae7b944b859e88bc19ac475659a5f99ba388 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Mon, 8 May 2023 15:15:55 +0800
Subject: [PATCH 47/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModel/HKPlcCommMonitorViewModel.cs    | 109 +++++++++---------
 1 file changed, 56 insertions(+), 53 deletions(-)

diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/HKPlcCommMonitorViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/HKPlcCommMonitorViewModel.cs
index c17c5f0b..1c4ce38a 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/HKPlcCommMonitorViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/HKPlcCommMonitorViewModel.cs
@@ -37,69 +37,72 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                 }
                 Thread.Sleep(100);
             }), "plc变量读取",true);
-            foreach (PropertyInfo mi in properties)
+            if (PlcInfo.Count == 0)
             {
-                PropertyInfo a = GVL_BigStation.HKPlc_Read.GetType().GetProperty(mi.Name);
-                object ab = a.GetValue(GVL_BigStation.HKPlc_Read, null);
-                if (mi.PropertyType.Name == "Int16")
+                foreach (PropertyInfo mi in properties)
                 {
-                    addressPos = "DBW";
-                    Offset = Math.Ceiling(Offset);
-                    if (Offset / 2.0 - Math.Floor(Offset / 2.0) > 0.0)
+                    PropertyInfo a = GVL_BigStation.HKPlc_Read.GetType().GetProperty(mi.Name);
+                    object ab = a.GetValue(GVL_BigStation.HKPlc_Read, null);
+                    if (mi.PropertyType.Name == "Int16")
+                    {
+                        addressPos = "DBW";
+                        Offset = Math.Ceiling(Offset);
+                        if (Offset / 2.0 - Math.Floor(Offset / 2.0) > 0.0)
+                        {
+                            Offset += 1.0;
+                        }
+                    }
+                    else if (mi.PropertyType.Name == "Boolean")
                     {
-                        Offset += 1.0;
+                        addressPos = "DBX";
+                        Offset = Math.Round(Offset, 1);
+                        if ((Offset - Math.Floor(Offset)) >= 0.8)
+                        {
+                            Offset = Math.Ceiling(Offset);
+                        }
                     }
-                }
-                else if (mi.PropertyType.Name == "Boolean")
-                {
-                    addressPos = "DBX";
-                    Offset = Math.Round(Offset, 1);
-                    if ((Offset - Math.Floor(Offset)) >= 0.8)
+                    else if (mi.PropertyType.Name == "Single")
                     {
+                        addressPos = "DBD";
                         Offset = Math.Ceiling(Offset);
+                        if (Offset / 2.0 - Math.Floor(Offset / 2.0) > 0.0)
+                        {
+                            Offset += 1.0;
+                        }
                     }
-                }
-                else if (mi.PropertyType.Name == "Single")
-                {
-                    addressPos = "DBD";
-                    Offset = Math.Ceiling(Offset);
-                    if (Offset / 2.0 - Math.Floor(Offset / 2.0) > 0.0)
+                    var num = GVL_BigStation.HKPlc_Read;
+                    var res = a.GetCustomAttribute<PlcCommAttribute>();
+                    string describe = "";
+                    if (res != null)
                     {
-                        Offset += 1.0;
+                        describe = res.Describe;
                     }
-                }
-                var num = GVL_BigStation.HKPlc_Read;
-                var res = a.GetCustomAttribute<PlcCommAttribute>();
-                string describe = "";
-                if (res != null)
-                {
-                    describe = res.Describe;
-                }
-                else 
-                {
-                    describe = "";
-                }
-                PlcInfo.Add(new PlcVarMonitor()
-                {
-                    SerialNum = PlcInfo.Count + 1,
-                    Variable = mi.Name,
-                    Address = "DB98." + addressPos + string.Format("{0:N1}", Offset),
-                    Type = mi.PropertyType.Name,
-                    Describe = describe,
-                    NowValue = ab.ToString(),
-                });
+                    else
+                    {
+                        describe = "";
+                    }
+                    PlcInfo.Add(new PlcVarMonitor()
+                    {
+                        SerialNum = PlcInfo.Count + 1,
+                        Variable = mi.Name,
+                        Address = "DB98." + addressPos + string.Format("{0:N1}", Offset),
+                        Type = mi.PropertyType.Name,
+                        Describe = describe,
+                        NowValue = ab.ToString(),
+                    });
 
-                if (mi.PropertyType.Name == "Int16")
-                {
-                    Offset += 2;
-                }
-                else if (mi.PropertyType.Name == "Boolean")
-                {
-                    Offset += 0.1;
-                }
-                else if (mi.PropertyType.Name == "Single")
-                {
-                    Offset += 4;
+                    if (mi.PropertyType.Name == "Int16")
+                    {
+                        Offset += 2;
+                    }
+                    else if (mi.PropertyType.Name == "Boolean")
+                    {
+                        Offset += 0.1;
+                    }
+                    else if (mi.PropertyType.Name == "Single")
+                    {
+                        Offset += 4;
+                    }
                 }
             }
 

From 19ca5235449b9d2e4f571610e2ff3b0f409dc917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Tue, 9 May 2023 15:08:53 +0800
Subject: [PATCH 48/96] =?UTF-8?q?=E6=B7=BB=E5=8A=A0MorkM=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs    |  22 +-
 BPASmartClient.Model/OrderLocInfo.cs          |  24 +
 BPASmartClient.MorkMV1/Alarm.cs               |  74 ++
 .../BPASmartClient.MorkMV1.csproj             |  30 +
 BPASmartClient.MorkMV1/Control_MorkMV1.cs     | 864 ++++++++++++++++++
 BPASmartClient.MorkMV1/DataServer.cs          |  51 ++
 BPASmartClient.MorkMV1/DeviceData.cs          | 193 ++++
 BPASmartClient.MorkMV1/GVL_MorkMV1.cs         | 353 +++++++
 BPASmartClient.MorkMV1/GlobalUsing.cs         |  26 +
 BPASmartClient.MorkMV1/Model/Global.cs        |  13 +
 BPASmartClient.MorkMV1/Model/MorksPar.cs      |  16 +
 BPASmartClient.MorkMV1/Model/ParSet.cs        |  29 +
 BPASmartClient.MorkMV1/Model/WritePar.cs      |  14 +
 BPASmartClient.MorkMV1/NoodleShidModel.cs     |  21 +
 BPASmartClient.MorkMV1/OrderLocInfo.cs        |  24 +
 BPASmartClient.MorkMV1/View/Debug.xaml        | 117 +++
 BPASmartClient.MorkMV1/View/Debug.xaml.cs     |  30 +
 BPASmartClient.MorkMV1/View/Monitor.xaml      | 242 +++++
 BPASmartClient.MorkMV1/View/Monitor.xaml.cs   |  28 +
 BPASmartClient.MorkMV1/View/ParSet.xaml       | 130 +++
 BPASmartClient.MorkMV1/View/ParSet.xaml.cs    |  28 +
 .../ViewModel/DebugViewModel.cs               |  79 ++
 .../ViewModel/MonitorViewModel.cs             |  25 +
 .../ViewModel/ParSetViewModel.cs              |  49 +
 BPASmartClient.MorkS/Control_Morks.cs         |  82 +-
 BPASmartClient.MorkS/OrderLocInfo.cs          |  40 +-
 .../Control_MorkSUpgradedVer.cs               |  84 +-
 .../OrderLocInfo.cs                           |  40 +-
 BPASmartClient.Peripheral/BasePeripheral.cs   |   2 +-
 BPASmartClient.Peripheral/IPeripheral.cs      |   2 +-
 BPASmartClient/BPASmartClient.csproj          |   1 +
 SmartClient.sln                               |  25 +-
 32 files changed, 2620 insertions(+), 138 deletions(-)
 create mode 100644 BPASmartClient.Model/OrderLocInfo.cs
 create mode 100644 BPASmartClient.MorkMV1/Alarm.cs
 create mode 100644 BPASmartClient.MorkMV1/BPASmartClient.MorkMV1.csproj
 create mode 100644 BPASmartClient.MorkMV1/Control_MorkMV1.cs
 create mode 100644 BPASmartClient.MorkMV1/DataServer.cs
 create mode 100644 BPASmartClient.MorkMV1/DeviceData.cs
 create mode 100644 BPASmartClient.MorkMV1/GVL_MorkMV1.cs
 create mode 100644 BPASmartClient.MorkMV1/GlobalUsing.cs
 create mode 100644 BPASmartClient.MorkMV1/Model/Global.cs
 create mode 100644 BPASmartClient.MorkMV1/Model/MorksPar.cs
 create mode 100644 BPASmartClient.MorkMV1/Model/ParSet.cs
 create mode 100644 BPASmartClient.MorkMV1/Model/WritePar.cs
 create mode 100644 BPASmartClient.MorkMV1/NoodleShidModel.cs
 create mode 100644 BPASmartClient.MorkMV1/OrderLocInfo.cs
 create mode 100644 BPASmartClient.MorkMV1/View/Debug.xaml
 create mode 100644 BPASmartClient.MorkMV1/View/Debug.xaml.cs
 create mode 100644 BPASmartClient.MorkMV1/View/Monitor.xaml
 create mode 100644 BPASmartClient.MorkMV1/View/Monitor.xaml.cs
 create mode 100644 BPASmartClient.MorkMV1/View/ParSet.xaml
 create mode 100644 BPASmartClient.MorkMV1/View/ParSet.xaml.cs
 create mode 100644 BPASmartClient.MorkMV1/ViewModel/DebugViewModel.cs
 create mode 100644 BPASmartClient.MorkMV1/ViewModel/MonitorViewModel.cs
 create mode 100644 BPASmartClient.MorkMV1/ViewModel/ParSetViewModel.cs

diff --git a/BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs b/BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs
index 6181cc29..91c238c1 100644
--- a/BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs
+++ b/BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs
@@ -95,17 +95,17 @@ namespace BPASmartClient.PLC
                 modbusTcp.Write(address, value);
         }
 
-        public override void AddVarInfo(string add, int len)
-        {
-            if (!tempVar.ContainsKey(add) && !string.IsNullOrEmpty(add) && len > 0)
-            {
-                tempVar.TryAdd(add, new Variable()
-                {
-                    Address = add,
-                    ReadLeng = len
-                });
-            }
-        }
+        //public override void AddVarInfo(string add, int len)
+        //{
+        //    if (!tempVar.ContainsKey(add) && !string.IsNullOrEmpty(add) && len > 0)
+        //    {
+        //        tempVar.TryAdd(add, new Variable()
+        //        {
+        //            Address = add,
+        //            ReadLeng = len
+        //        });
+        //    }
+        //}
 
         protected override void InitStatus()
         {
diff --git a/BPASmartClient.Model/OrderLocInfo.cs b/BPASmartClient.Model/OrderLocInfo.cs
new file mode 100644
index 00000000..1b199cb1
--- /dev/null
+++ b/BPASmartClient.Model/OrderLocInfo.cs
@@ -0,0 +1,24 @@
+using BPA.Message;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.Model
+{
+    public class OrderLocInfo
+    {
+        public string SuborderId { get; set; }
+        public ushort Loc { get; set; }
+        public ushort RecipeNumber { get; set; }
+        public int BatchingId { get; set; }
+        public string GoodName { get; set; }
+        public int SortNum { get; set; }
+
+        public int RecipeId { get; set; }
+
+        public List<int> Recipes { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.MorkMV1/Alarm.cs b/BPASmartClient.MorkMV1/Alarm.cs
new file mode 100644
index 00000000..1a8c5952
--- /dev/null
+++ b/BPASmartClient.MorkMV1/Alarm.cs
@@ -0,0 +1,74 @@
+using BPASmartClient.Device;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkMV1
+{
+    public class Alarm : IAlarm
+    {
+        /// <summary>
+        /// 煮面机温度过低
+        /// </summary>
+        [Alarm("煮面机温度过低")]
+        public bool MachineLowTemperature { get; set; }
+
+        /// <summary>
+        /// 大碗数量不足
+        /// </summary>
+        [Alarm("大碗数量不足")]
+        public bool Supply1_LossBowl { get; set; }
+
+        /// <summary>
+        /// 一次性碗数量不足
+        /// </summary>
+        [Alarm("一次性碗数量不足")]
+        public bool Supply2_LossBowl { get; set; }
+
+        /// <summary>
+        /// 设备未初始化
+        /// </summary>
+        [Alarm("设备未初始化")]
+        public bool DeviceNoInit { get; set; }
+
+        /// <summary>
+        /// 移碗丝杆未初始化
+        /// </summary>
+        [Alarm("移碗丝杆未初始化")]
+        public bool MoveScrewRodNoInit { get; set; }
+
+        /// <summary>
+        /// 供碗1未初始化
+        /// </summary>
+        [Alarm("供碗1未初始化")]
+        public bool SacrificialVesselNoInit { get; set; }
+
+        /// <summary>
+        /// 气缸推杆未初始化
+        /// </summary>
+        [Alarm("气缸推杆未初始化")]
+        public bool CylinderNoInit { get; set; }
+
+        /// <summary>
+        /// 煮面机初未初始化
+        /// </summary>
+        [Alarm("煮面机初未初始化")]
+        public bool NoodleCookerNoInit { get; set; }
+
+        /// <summary>
+        /// 机器人未初始化
+        /// </summary>
+        [Alarm("机器人未初始化")]
+        public bool RobotNoInit { get; set; }
+
+        /// <summary>
+        /// 料仓未初始化
+        /// </summary>
+        [Alarm("料仓未初始化")]
+        public bool SiloNoInit { get; set; }
+
+
+    }
+}
diff --git a/BPASmartClient.MorkMV1/BPASmartClient.MorkMV1.csproj b/BPASmartClient.MorkMV1/BPASmartClient.MorkMV1.csproj
new file mode 100644
index 00000000..ed88b17f
--- /dev/null
+++ b/BPASmartClient.MorkMV1/BPASmartClient.MorkMV1.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BPASmartClient.Business\BPASmartClient.Business.csproj" />
+    <ProjectReference Include="..\BPASmartClient.CustomResource\BPASmartClient.CustomResource.csproj" />
+    <ProjectReference Include="..\BPASmartClient.Device\BPASmartClient.Device.csproj" />
+    <ProjectReference Include="..\BPASmartClient.EventBus\BPASmartClient.EventBus.csproj" />
+    <ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" />
+    <ProjectReference Include="..\BPASmartClient.MORKSM.BK.PLC\BPASmartClient.PLC.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="View\Debug.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="View\Monitor.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="View\ParSet.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/BPASmartClient.MorkMV1/Control_MorkMV1.cs b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
new file mode 100644
index 00000000..d420d963
--- /dev/null
+++ b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
@@ -0,0 +1,864 @@
+using System;
+using System.Collections.Generic;
+using BPA.Message.Enum;
+using BPASmartClient.Device;
+using BPASmartClient.EventBus;
+using BPASmartClient.Model;
+using BPASmartClient.Peripheral;
+using static BPASmartClient.EventBus.EventBus;
+using BPASmartClient.Helper;
+using System.Threading;
+using BPASmartClient.Message;
+using BPA.Message;
+using System.Linq;
+using BPASmartClient.Model.PLC;
+using System.Threading.Tasks;
+using System.Reflection;
+using BPASmartClient.MorkMV1.Model;
+using System.Collections.ObjectModel;
+using BPASmartClient.MorkMV1.ViewModel;
+using BPASmartClient.Business;
+using BPASmartClient.Model.小炒机;
+using BPA.Models;
+using System.Windows.Forms;
+using System.Media;
+using BPASmartClient.CustomResource;
+//using BPA.Helper;
+
+namespace BPASmartClient.MorkMV1
+{
+    public class Control_MorkMV1 : BaseDevice
+    {
+        public override DeviceClientType DeviceType => DeviceClientType.MORKM;
+        GVL_MorkMV1 mORKM = new GVL_MorkMV1();
+        Alarm alarm = new Alarm();
+
+        public override void DoMain()
+        {
+            MonitorViewModel.DeviceId = DeviceId;
+            ServerInit();
+            DataParse();
+            Json<MorksPar>.Read();
+            Json<OrderStatistics>.Read();
+            if (Json<MorksPar>.Data.parSets == null) Json<MorksPar>.Data.parSets = new ObservableCollection<ParSet>();
+            if (Json<MorksPar>.Data.parSets.Count < 6)
+            {
+                Json<MorksPar>.Data.parSets.Clear();
+                for (int i = 0; i < 6; i++)
+                {
+                    Json<MorksPar>.Data.parSets.Add(new ParSet()
+                    {
+                        CheckBoxContext = $"煮面口{i + 1}屏蔽",
+                        Minute = 1,
+                        Second = 0,
+                        IsShield = false,
+                        TextBlockContext = $"煮面口{i + 1}时间设定"
+                    });
+                }
+            }
+
+            ActionManage.GetInstance.Register(new Action<object[]>((o) =>
+            {
+                if (o.Length > 0)
+                {
+                    Random rd = new Random();
+                    ThreadManage.GetInstance().StartLong(new Action(() =>
+                    {
+                        int NoodleLoc = (int)o[0] == 0 ? rd.Next(1, 6) : (int)o[0];
+                        int BowlLoc = (int)o[1] == 0 ? rd.Next(10, 12) : (int)o[1];
+
+                        string guid = new Guid().ToString();
+
+                        mORKM.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { Loc = (ushort)NoodleLoc, SuborderId = guid });
+                        MessageLog.GetInstance.Show($"添加订单：面条位置【{NoodleLoc}】");
+
+                        mORKM.TakeBowlTask.Enqueue(new OrderLocInfo() { Loc = (ushort)BowlLoc, SuborderId = guid });
+                        MessageLog.GetInstance.Show($"添加订单：碗位置【{BowlLoc}】");
+                        Thread.Sleep(60000);
+                    }), "ForOrder");
+                }
+            }), "EnableForOrder");
+
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is WritePar writePar) WriteData(writePar.Address, writePar.Value);
+            }), "WriteVW");
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is WritePar writePar) WriteData(writePar.Address, writePar.Value);
+            }), "WriteBools");
+            ActionManage.GetInstance.Register(new Action(() => { DeviceInit(); }), "InitDevice");
+        }
+
+        public override void ResetProgram()
+        {
+            mORKM = null;
+            mORKM = new GVL_MorkMV1();
+        }
+
+        public override void Stop()
+        {
+
+        }
+
+        private void ServerInit()
+        {
+            //物料信息
+            EventBus.EventBus.GetInstance().Subscribe<MaterialDeliveryEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
+             {
+                 if (@event == null) return;
+                 if (@event is MaterialDeliveryEvent material)
+                 {
+                     orderMaterialDelivery = material.orderMaterialDelivery;
+                 }
+             });
+
+            //配方数据信息
+            EventBus.EventBus.GetInstance().Subscribe<RecipeBomEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
+            {
+                if (@event == null) return;
+                if (@event is RecipeBomEvent recipe)
+                {
+                    recipeBoms = recipe.recipeBoms;
+                }
+            });
+
+
+        }
+
+        private void OrderChange(string subid, ORDER_STATUS oRDER_STATUS)
+        {
+            var res = mORKM.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
+            string goodName = string.Empty;
+            string SortNum = string.Empty;
+            if (res != null)
+            {
+                goodName = res.MorkOrder.GoodsName;
+                SortNum = res.MorkOrder.SortNum.ToString();
+            }
+
+            //if (mORKS.doe.ContainsKey(subid))
+            //{
+            //    goodName = mORKS.doe[subid].MorkOrder.GoodsName;
+            //    SortNum = mORKS.doe[subid].MorkOrder.SortNum.ToString();
+            if (!string.IsNullOrEmpty(goodName) && !string.IsNullOrEmpty(SortNum))
+            {
+                EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+                var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
+                if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
+                {
+                    if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
+                    {
+                        DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
+                        DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
+                        {
+                            Status = oRDER_STATUS,
+                            GoodName = goodName,
+                            SortNum = SortNum,
+                            StopTime = DateTime.Now.ToString("HH:mm:ss")
+                        });
+                    }
+                    else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
+                    {
+                        var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
+                        if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
+                    }
+                    else
+                    {
+                        DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
+                    }
+                }
+                else
+                {
+                    DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
+                    {
+                        Status = oRDER_STATUS,
+                        GoodName = goodName,
+                        SortNum = SortNum,
+                        StartTime = DateTime.Now.ToString("HH:mm:ss")
+                    });
+                }
+                //mORKS.doe.Remove(subid, out _);
+            }
+            //}
+
+
+
+            //var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
+            //string goodName = string.Empty;
+            //string SortNum = string.Empty;
+            //if (res != null)
+            //{
+            //    goodName = res.MorkOrder.GoodsName;
+            //    SortNum = res.MorkOrder.SortNum.ToString();
+            //}
+
+            //EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+
+            //var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
+            //if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
+            //{
+            //    if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
+            //    {
+            //        DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
+            //        DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
+            //        {
+            //            Status = oRDER_STATUS,
+            //            GoodName = goodName,
+            //            SortNum = SortNum,
+            //            StopTime = DateTime.Now.ToString("HH:mm:ss")
+            //        });
+            //    }
+            //    else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
+            //    {
+            //        var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
+            //        if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
+            //    }
+            //    else
+            //    {
+            //        DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
+            //    }
+            //}
+            //else
+            //{
+            //    DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
+            //    {
+            //        Status = oRDER_STATUS,
+            //        GoodName = goodName,
+            //        SortNum = SortNum,
+            //        StartTime = DateTime.Now.ToString("HH:mm:ss")
+            //    });
+            //}
+        }
+
+        private void GetStatus(string key, Action<object> action)
+        {
+            if (peripheralStatus.ContainsKey(key))
+            {
+                if (peripheralStatus[key] != null)
+                {
+                    action?.Invoke(peripheralStatus[key]);
+                }
+            }
+        }
+
+        public override void ReadData()
+        {
+            DataServer.GetInstance.morkS.Alarm.Clear();
+            alarms.ForEach(item =>
+            {
+                DataServer.GetInstance.morkS.Alarm.Add(new AlarmModel()
+                {
+                    AlarmTime = $"{item.Date} {item.Time}",
+                    AlarmMs = item.Info
+                });
+            });
+
+            GetStatus("M0.1", new Action<object>((obj) =>
+             {
+                 if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 7)
+                 {
+                     Initing = !bools[0];
+                     mORKM.InitComplete = bools[0];
+                     mORKM.MoveScrewRodInitCom = bools[1];
+                     mORKM.SacrificialVesselInitCom = bools[2];
+                     mORKM.CylinderInitCom = bools[3];
+                     mORKM.NoodleCookerInitCom = bools[4];
+                     mORKM.RobotInitCom = bools[5];
+                     mORKM.SiloInitCom = bools[6];
+
+                     alarm.DeviceNoInit = !mORKM.InitComplete;
+                     alarm.MoveScrewRodNoInit = !mORKM.MoveScrewRodInitCom;
+                     alarm.SacrificialVesselNoInit = !mORKM.SacrificialVesselInitCom;
+                     alarm.CylinderNoInit = !mORKM.CylinderInitCom;
+                     alarm.NoodleCookerNoInit = !mORKM.NoodleCookerInitCom;
+                     alarm.RobotNoInit = !mORKM.RobotInitCom;
+                     alarm.SiloNoInit = !mORKM.SiloInitCom;
+                 }
+             }));
+
+            GetStatus("M10.0", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 2)
+                {
+                    mORKM.AllowInvertedFace = bools[0];
+                    mORKM.DiningComplete = bools[1];
+                }
+            }));
+
+            GetStatus("M10.4", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+                {
+                    mORKM.DropBowlMechanismStatus = bools[0];
+                }
+            }));
+
+            GetStatus("M12.2", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+                {
+                    mORKM.FixedFlag = bools[0];
+                }
+            }));
+
+            GetStatus("M13.5", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+                {
+                    mORKM.SiloInPlace = bools[0];
+                }
+            }));
+
+            GetStatus("M16.7", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+                {
+                    mORKM.RobotTakeNoodleCom = bools[0];
+                }
+            }));
+
+            GetStatus("M17.4", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+                {
+                    mORKM.RobotStatus = bools[0];
+                }
+            }));
+
+            GetStatus("M18.0", new Action<object>((obj) =>
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 5)
+                {
+                    mORKM.SmallBowlYesOrNoCheck = bools[0];
+                    mORKM.LargeBowYesOrNoCheck = bools[1];
+                    mORKM.TurntableLowPosition = bools[2];
+                    mORKM.TurntableHighPosition = bools[3];
+                    alarm.Supply2_LossBowl = !mORKM.SmallBowlYesOrNoCheck;
+                    alarm.Supply1_LossBowl = !mORKM.LargeBowYesOrNoCheck;
+                }
+            }));
+
+            GetStatus("VW17", new Action<object>((obj) =>
+            {
+                if (obj is ushort[] ushorts && ushorts.Length > 0 && ushorts.Length <= 1)
+                {
+                    var tt = ushorts.UshortsToBytes(true).BytesToUshorts();
+
+                    for (byte i = 0; i < 6; i++)
+                    {
+                        if (RTrig.GetInstance($"CookNoodleCom{i + 1}").Start(tt[0].GetBitValue((byte)(i + 1))))
+                        {
+                            if (!string.IsNullOrEmpty(mORKM.CookNodelId[i]))
+                                mORKM.CookNoodleCom[i] = true;
+                        }
+                    }
+
+                    //mORKS.CookNoodleCom[0] = tt[0].GetBitValue(1);
+                    //mORKS.CookNoodleCom[1] = tt[0].GetBitValue(2);
+                    //mORKS.CookNoodleCom[2] = tt[0].GetBitValue(3);
+                    //mORKS.CookNoodleCom[3] = tt[0].GetBitValue(4);
+                    //mORKS.CookNoodleCom[4] = tt[0].GetBitValue(5);
+                    //mORKS.CookNoodleCom[5] = tt[0].GetBitValue(6);
+                    mORKM.Heating = ushorts[0].GetBitValue(15);
+                    mORKM.TemperatureReaches = ushorts[0].GetBitValue(16);
+
+                    alarm.MachineLowTemperature = !mORKM.TemperatureReaches;
+                }
+
+            }));
+
+            GetStatus("VW770", new Action<object>((obj) =>
+            {
+                if (obj is ushort[] ushorts && ushorts.Length > 0 && ushorts.Length <= 1)
+                {
+                    mORKM.CurrentFeedbackLoc = ushorts[0];
+                }
+
+            }));
+
+            mORKM.TakeBowlTaskCount = mORKM.TakeBowlTask.Count;
+            mORKM.RBTakeNoodleTaskCount = mORKM.RBTakeNoodleTask.Count;
+
+            for (int i = 0; i < Json<MorksPar>.Data.parSets.Count; i++)
+            {
+                mORKM.nsm.ElementAt(i).IsShield = Json<MorksPar>.Data.parSets.ElementAt(i).IsShield;
+                mORKM.nsm.ElementAt(i).NoodleCookerStatus = mORKM.NoodleCookerStatus[i];
+            }
+
+        }
+
+        /// <summary>
+        /// 数据解析
+        /// </summary>
+        private void DataParse()
+        {
+            EventBus.EventBus.GetInstance().Subscribe<DoOrderEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBackHandle)
+             {
+                 if (@event == null) return;
+                 if (@event is DoOrderEvent order)
+                 {
+                     mORKM.doOrderEvents.Add(order);
+                     //mORKS.doe.TryAdd(order.MorkOrder.SuborderId, order);
+                     if (order.MorkOrder.GoodBatchings == null) return;
+                     if (mORKM.HistorySuborderId.Contains(order.MorkOrder.SuborderId)) return;
+                     OrderCount++;
+                     if (DateTime.Now.Subtract(Json<OrderStatistics>.Data.StatisticsTime).Days != 0)
+                         Json<OrderStatistics>.Data.Count = 0;
+                     Json<OrderStatistics>.Data.StatisticsTime = DateTime.Now;
+                     Json<OrderStatistics>.Data.Count++;
+                     Json<OrderStatistics>.Save();
+                     OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT);
+                     DeviceProcessLogShow($"接收到{OrderCount}次订单，订单ID：{order.MorkOrder.SuborderId}");
+                     mORKM.HistorySuborderId.Add(order.MorkOrder.SuborderId);
+                     foreach (var item in order.MorkOrder.GoodBatchings)
+                     {
+                         var res = orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId);
+                         if (res != null)
+                         {
+                             if (ushort.TryParse(res.BatchingLoc, out ushort loc))
+                             {
+                                 if (loc >= 1 && loc <= 5)
+                                 {
+                                     if (mORKM.RBTakeNoodleTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                                         mORKM.RBTakeNoodleTask.Enqueue(new OrderLocInfo()
+                                         {
+                                             GoodName = order.MorkOrder.GoodsName,
+                                             Loc = ushort.Parse(res.BatchingLoc),
+                                             SuborderId = order.MorkOrder.SuborderId,
+                                             SortNum = order.MorkOrder.SortNum,
+                                             BatchingId = res.BatchingId
+                                         });
+                                 }
+                                 else if (loc >= 10 && loc <= 11)
+                                 {
+                                     int index = 0;
+                                     if (recipeBoms != null)
+                                     {
+                                         index = Array.FindIndex(recipeBoms.RecipeIds?.ToArray(), p => p.RecipeId == order.MorkOrder.RecipeId);
+                                         index++;
+                                     }
+                                     if (mORKM.TakeBowlTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                                         mORKM.TakeBowlTask.Enqueue(new OrderLocInfo()
+                                         {
+                                             BatchingId = res.BatchingId,
+                                             GoodName = order.MorkOrder.GoodsName,
+                                             Loc = ushort.Parse(res.BatchingLoc),
+                                             SuborderId = order.MorkOrder.SuborderId,
+                                             SortNum = order.MorkOrder.SortNum,
+                                             RecipeNumber = (index >= 1 && index <= 10) ? (ushort)index : (ushort)0
+                                         });
+                                 }
+                             }
+                         }
+                     }
+                 }
+             });
+        }
+
+        public override void MainTask()
+        {
+            mORKM.AllowRun = mORKM.InitComplete;
+            if (Json<KeepDataBase>.Data.IsVerify)
+                IsHealth = mORKM.InitComplete;
+            else
+                IsHealth = true;
+
+            TakeBowlTask();
+
+            TakeNoodleTask();
+
+            OutNoodleTask();
+
+            SingleDetect();
+
+            TurntableControl();
+        }
+
+        private void BowlControl(OrderLocInfo orderLocInfo)
+        {
+            if (orderLocInfo.Loc >= 10 && orderLocInfo.Loc <= 11)
+            {
+                mORKM.TakeBowlId = orderLocInfo.SuborderId;
+                mORKM.TakeBowName = orderLocInfo.GoodName;
+                mORKM.TakeBowSortNum = orderLocInfo.SortNum;
+                TakeBowlControl(orderLocInfo.Loc);
+                OrderChange(mORKM.TakeBowlId, ORDER_STATUS.COOKING);
+                DeviceProcessLogShow($"订单【{mORKM.TakeBowlId}】执行取碗控制,位置:[{orderLocInfo.Loc}]");
+                mORKM.TakeBowlInterlock = true;
+            }
+        }
+
+        /// <summary>
+        /// 取碗控制
+        /// </summary>
+        private void TakeBowlTask()
+        {
+            if (mORKM.AllowRun && mORKM.TakeBowlTask.Count > 0 && !mORKM.DropBowlMechanismStatus && !mORKM.TakeBowlInterlock)
+            {
+                ushort BowLoc = 0;
+                var res = orderMaterialDelivery?.BatchingInfo?.Where(p => p.BatchingId == mORKM.TakeBowlTask.ElementAt(0).BatchingId).ToList();
+                if (res == null || res?.Count == 0)
+                {
+                    if (mORKM.TakeBowlTask.TryDequeue(out OrderLocInfo orderLocInfo)) BowlControl(orderLocInfo);
+                }
+                else
+                {
+                    foreach (var item in res)
+                    {
+                        if (ushort.TryParse(item.BatchingLoc, out ushort loc))
+                        {
+                            if (loc == 10 && mORKM.SmallBowlYesOrNoCheck)
+                            {
+                                BowLoc = loc;
+                                break;
+                            }
+                            else if (loc == 11 && mORKM.LargeBowYesOrNoCheck)
+                            {
+                                BowLoc = loc;
+                                break;
+                            }
+                        }
+                    }
+
+                    if (BowLoc >= 10 && BowLoc <= 11)
+                    {
+                        if (mORKM.TakeBowlTask.TryDequeue(out OrderLocInfo orderLocInfo))
+                        {
+                            orderLocInfo.Loc = BowLoc;
+                            BowlControl(orderLocInfo);
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 转台控制
+        /// </summary>
+        private void TurntableControl()
+        {
+            if (Global.EnableLocalSimOrder)
+            {
+                //不做轮询，直接取面，模拟订单使用
+                if (mORKM.SiloInPlace && !mORKM.Feeding && mORKM.InitComplete && !mORKM.AllowTakeNoodle && mORKM.RBTakeNoodleTask.Count > 0)
+                {
+                    if (mORKM.TurntableLowPosition)
+                    {
+                        TurntableStart(mORKM.RBTakeNoodleTask.ElementAt(0).Loc);
+                        mORKM.TurntableLocLists.Clear();
+                        mORKM.AllowTakeNoodle = true;
+                        DeviceProcessLogShow($"控制机器人去转台【{mORKM.RBTakeNoodleTask.ElementAt(0).Loc}】号位置取面");
+                    }
+                }
+            }
+            else
+            {
+                //正常轮询
+                if (Delay.GetInstance("到位检测延时").Start(mORKM.SiloInPlace, 2))
+                {
+                    if (mORKM.SiloInPlace && !mORKM.Feeding && mORKM.InitComplete && !mORKM.AllowTakeNoodle && mORKM.RBTakeNoodleTask.Count > 0)
+                    {
+
+                        var result = orderMaterialDelivery.BatchingInfo.Where(p => p.BatchingId == mORKM.RBTakeNoodleTask.ElementAt(0).BatchingId).ToList();
+                        if (result != null)
+                        {
+                            var res = result.FirstOrDefault(P => P.BatchingLoc == mORKM.CurrentFeedbackLoc.ToString());
+                            if (mORKM.TurntableLowPosition && res != null)
+                            {
+                                TurntableStart(mORKM.CurrentFeedbackLoc);
+                                mORKM.TurntableLocLists.Clear();
+                                mORKM.AllowTakeNoodle = true;
+                                DeviceProcessLogShow($"控制机器人去转台【{mORKM.CurrentFeedbackLoc}】号位置取面");
+                            }
+                            else
+                            {
+                                if (!mORKM.TurntableInterlock)
+                                {
+                                    foreach (var item in result)
+                                    {
+                                        if (ushort.TryParse(item.BatchingLoc, out ushort loc))
+                                        {
+                                            if (mORKM.CurrentFeedbackLoc != loc && !mORKM.TurntableLocLists.Contains(loc))
+                                            {
+                                                if (!mORKM.TurntableLowPosition)
+                                                {
+                                                    DeviceProcessLogShow($"执行了转台启动互锁信号复位");
+                                                }
+                                                TurntableStart(loc);
+                                                DeviceProcessLogShow($"没有物料检测的启动转台控制,转台位置：[{loc}]");
+                                                break;
+                                            }
+                                            else if (mORKM.CurrentFeedbackLoc == loc && !mORKM.TurntableLocLists.Contains(loc)) mORKM.TurntableLocLists.Add(loc);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        else DeviceProcessLogShow("未找到可用的物料信息");
+                    }
+                }
+            }
+
+            //补料中检测
+            if (RTrig.GetInstance("mORKS.Feeding").Start(mORKM.Feeding))
+            {
+                mORKM.AllowTakeNoodle = false;
+                mORKM.TakeNoodleInterlock = false;
+            }
+
+            //转台到位检测
+            if (RTrig.GetInstance("TurntableInPlace").Start(mORKM.SiloInPlace && mORKM.CurrentLoc == mORKM.CurrentFeedbackLoc))
+            {
+
+                mORKM.TurntableInterlock = false;
+                DeviceProcessLogShow("转台到位检测");
+            }
+
+            //补料完成检测
+            if (RTrig.GetInstance("FeedComplete").Start(mORKM.FeedComplete))
+            {
+                if (!mORKM.AllowTakeNoodle && mORKM.TurntableLocLists.Count > 0)
+                {
+                    mORKM.TurntableLocLists.Clear();
+                    mORKM.TurntableInterlock = false;
+                    DeviceProcessLogShow("补料完成检测");
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// 取面任务
+        /// </summary>
+        private void TakeNoodleTask()
+        {
+            //取面控制
+            if (mORKM.AllowRun && mORKM.RobotStatus && !mORKM.Feeding && !mORKM.RobotTaskInterlock && mORKM.AllowTakeNoodle && mORKM.SiloInPlace && !mORKM.TakeNoodleInterlock && mORKM.RBTakeNoodleTask.Count > 0)
+            {
+                if (mORKM.CurrentLoc == mORKM.CurrentFeedbackLoc)
+                {
+                    //int loc = Array.FindIndex(mORKS.NoodleCookerStatus, p => p == false);//查找煮面炉空闲位置
+                    int loc = mORKM.nsm.ToList().FindIndex(p => p.NoodleCookerStatus == false && p.IsShield == false);//查找煮面炉空闲位置
+                    if (loc >= 0 && loc <= 5)
+                    {
+                        //if (!Json<MorksPar>.Data.parSets.ElementAt(loc).IsShield)//检查该煮面篮是否被屏蔽
+                        //{
+                        if (mORKM.RBTakeNoodleTask.TryDequeue(out OrderLocInfo orderLocInfo))
+                        {
+                            //写入煮面时间
+                            List<ushort> values = new List<ushort>();
+                            values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
+                            values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
+                            WriteData($"VW{324 + (loc * 4)}", values.ToArray());
+
+                            mORKM.CurrentLoc = 0;
+                            mORKM.CookNodelId[loc] = orderLocInfo.SuborderId;
+                            mORKM.NoodleCookerStatus[loc] = true;
+                            SetFallNoodleLoc((ushort)(loc + 1));
+                            //机器人开始取面
+                            OrderChange(orderLocInfo.SuborderId, ORDER_STATUS.COOKING);
+                            DeviceProcessLogShow($"订单【{orderLocInfo.SuborderId}】,机器人倒面至【{loc + 1}】号煮面栏");
+
+                            mORKM.TakeNoodleInterlock = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 出餐控制
+        /// </summary>
+        private void OutNoodleTask()
+        {
+            if (mORKM.AllowInvertedFace && mORKM.RobotTaskInterlock && !mORKM.TakeNoodleInterlock && mORKM.RobotStatus)
+            {
+                int loc = Array.FindIndex(mORKM.CookNodelId, p => p == mORKM.IngredientsCompleteId && p.Length > 0);
+                if (loc >= 0 && loc <= 5)
+                {
+                    if (mORKM.CookNoodleCom[loc])
+                    {
+                        SetTakeNoodleLoc((ushort)(loc + 1));
+                        mORKM.NoodleCookerStatus[loc] = false;
+                        WriteData($"VW260", (ushort)0);//设置出汤时间
+                        OrderChange(mORKM.IngredientsCompleteId, ORDER_STATUS.COMPLETED_COOK);
+                        DeviceProcessLogShow($"订单【{mORKM.IngredientsCompleteId}】制作完成");
+                        mORKM.CookCompleteFlatBit = true;
+                        mORKM.OutMealId = mORKM.IngredientsCompleteId;
+                        mORKM.OutMealName = mORKM.IngredientsCompleteName;
+                        mORKM.OutMealSortNum = mORKM.IngredientsCompleteSortNum;
+                        mORKM.IngredientsCompleteId = string.Empty;
+                        mORKM.CookNodelId[loc] = string.Empty;
+                        DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{mORKM.OutMealId}");
+                        mORKM.CookNoodleCom[loc] = false;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 信号检测
+        /// </summary>
+        private void SingleDetect()
+        {
+            //允许倒面信号检测
+            if (RTrig.GetInstance("AllowFallNoodle").Start(mORKM.AllowInvertedFace))
+            {
+                mORKM.IngredientsCompleteId = mORKM.TakeBowlId;
+                mORKM.IngredientsCompleteName = mORKM.TakeBowName;
+                mORKM.IngredientsCompleteSortNum = mORKM.TakeBowSortNum;
+                mORKM.TakeBowSortNum = 0;
+                mORKM.TakeBowlId = string.Empty;
+                mORKM.TakeBowName = string.Empty;
+                DeviceProcessLogShow($"碗到位，允许到面,{mORKM.IngredientsCompleteId}");
+                mORKM.TakeBowlInterlock = false;
+            }
+
+            //取餐完成逻辑处理
+            if (RTrig.GetInstance("CompleteChange1").Start(mORKM.DiningComplete) && mORKM.CookCompleteFlatBit == true)
+            {
+                OrderChange(mORKM.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
+                DeviceProcessLogShow($"订单【{mORKM.OutMealId}】取餐完成");
+                WriteData("M10.1", false);
+                DeviceProcessLogShow($"出餐订单序号【{mORKM.OutMealSortNum}】");
+                VoiceAPI.Speak(mORKM.OutMealSortNum.ToString());
+                //DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");
+                //Plugin.GetInstance().GetPlugin<MQTTMgr>().Publish($"MORKS/VoiceCall/{DeviceId}", mORKS.OutMealSortNum.ToString());
+                mORKM.CookCompleteFlatBit = false;
+                mORKM.OutMealId = string.Empty;
+                mORKM.OutMealName = string.Empty;
+                mORKM.OutMealSortNum = 0;
+            }
+
+            //机器人取面完成信号检测
+            if (RTrig.GetInstance("TakeNoodleComplete").Start(mORKM.RobotTakeNoodleCom))
+            {
+                mORKM.TakeNoodleInterlock = false;
+                mORKM.AllowTakeNoodle = false;
+                mORKM.TurntableInterlock = false;
+                DeviceProcessLogShow("机器人取面完成信号检测");
+            }
+
+            int OutMealRequstCount = mORKM.CookNoodleCom.Where(p => p == true).ToList().Count;
+            //int mlCount = mORKS.NoodleCookerStatus.Where(p => p == true).ToList().Count - Json<MorksPar>.Data.parSets.Where(x => x.IsShield == true).ToList().Count;
+            int mlCount = mORKM.nsm.Where(p => p.NoodleCookerStatus == true && p.IsShield == false).ToList().Count;
+            int index = Array.FindIndex(mORKM.CookNodelId, p => p == mORKM.IngredientsCompleteId);
+
+            bool isok = index >= 0 && index < mORKM.CookNoodleCom.Length && mORKM.CookNoodleCom[index];
+
+            mORKM.PriorityJudgment = Delay.GetInstance("取餐优先级判断").Start(mORKM.TurntableLocLists.Count > 0 && !mORKM.TurntableLowPosition, 4);
+            //mORKS.RobotTaskInterlock = OutMealRequstCount > 0 && mORKS.AllowInvertedFace && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
+            mORKM.RobotTaskInterlock = isok && mORKM.AllowInvertedFace && (mlCount >= 2 || mORKM.RBTakeNoodleTask.Count == 0 || mORKM.PriorityJudgment);
+
+
+        }
+        /// <summary>
+        /// 语音提醒取餐
+        /// </summary>
+        /// <param name="meal"></param>
+        private void WaitMeaLSpeak(string meal)
+        {
+            //VoiceAPI.m_SystemPlayWav(@"Vioce\电子提示音.wav");
+            //Thread.Sleep(1000);
+            //if (meal != null) mORKS.speech.Speak(meal);
+            //VoiceAPI.m_SystemPlayWav(@"Vioce\取餐通知.wav");
+        }
+
+        #region PLC 控制函数
+
+        private void WriteData(string address, object value)
+        {
+            EventBus.EventBus.GetInstance().Publish(new WriteModel() { DeviceId = DeviceId, Address = address, Value = value });
+        }
+
+        /// <summary>
+        /// 设备初始化
+        /// </summary>
+        public async void DeviceInit()
+        {
+            WriteData("M0.0", true);
+            await Task.Delay(1000);
+            WriteData("M0.0", false);
+        }
+
+        /// <summary>
+        /// 取碗控制
+        /// </summary>
+        /// <param name="loc"></param>
+        private void TakeBowlControl(ushort loc)
+        {
+            if (loc == 10)//一次性碗
+            {
+                WriteData("M9.1", true);
+            }
+            else if (loc == 11)//大碗
+            {
+                WriteData("M9.0", true);
+            }
+        }
+
+        /// <summary>
+        /// 启动转台
+        /// </summary>
+        /// <param name="loc"></param>
+        private void TurntableStart(ushort loc)
+        {
+            if (loc >= 1 && loc <= 5)
+            {
+                mORKM.CurrentLoc = loc;
+                mORKM.TurntableInterlock = true;
+                mORKM.TurntableLocLists.Add(loc);
+                WriteData($"M13.{loc - 1}", true);
+            }
+        }
+
+        /// <summary>
+        /// 设置倒面位置
+        /// </summary>
+        /// <param name="loc"></param>
+        private void SetFallNoodleLoc(ushort loc)
+        {
+            if (loc >= 1 && loc <= 6)
+                WriteData($"M14.{loc - 1}", true);
+        }
+
+        /// <summary>
+        /// 设置取面位置
+        /// </summary>
+        /// <param name="loc"></param>
+        private void SetTakeNoodleLoc(ushort loc)
+        {
+            if (loc >= 1 && loc <= 6)
+                WriteData($"M15.{loc - 1}", true);
+        }
+
+
+
+        public override void SimOrder()
+        {
+            EventBus.EventBus.GetInstance().Subscribe<MorksSimorderModel>(0, delegate (IEvent @event, EventCallBackHandle callBackHandle)
+            {
+                if (@event != null && @event is MorksSimorderModel msm)
+                {
+                    string guid = Guid.NewGuid().ToString();
+                    if (msm.NoodleLoc >= 1 && msm.NoodleLoc <= 5)
+                    {
+                        mORKM.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { Loc = (ushort)msm.NoodleLoc, SuborderId = guid });
+                        MessageLog.GetInstance.Show($"添加订单：面条位置【{(ushort)msm.NoodleLoc}】");
+                    }
+
+                    if (msm.Bowloc >= 10 && msm.Bowloc <= 11)
+                    {
+                        mORKM.TakeBowlTask.Enqueue(new OrderLocInfo() { Loc = (ushort)msm.Bowloc, SuborderId = guid });
+                        MessageLog.GetInstance.Show($"添加订单：碗位置【{(ushort)msm.Bowloc}】");
+                    }
+
+                }
+            });
+        }
+        #endregion
+
+
+    }
+}
diff --git a/BPASmartClient.MorkMV1/DataServer.cs b/BPASmartClient.MorkMV1/DataServer.cs
new file mode 100644
index 00000000..515a8ec2
--- /dev/null
+++ b/BPASmartClient.MorkMV1/DataServer.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using BPASmartClient.MQTT;
+using BPA.Message;
+using BPASmartClient.Model;
+
+namespace BPASmartClient.MorkMV1
+{
+    public class DataServer
+    {
+
+        private volatile static DataServer _Instance;
+        public static DataServer GetInstance => _Instance ?? (_Instance = new DataServer());
+        private DataServer() { }
+
+        public ScreenModelMorkS morkS { get; set; } = new ScreenModelMorkS();
+
+        MQTTProxy mQTTProxy = new MQTTProxy();
+        public void Init()
+        {
+            mQTTProxy.Connected = new Action(() =>
+            {
+                mQTTProxy.Subscrib(ScreenTOPIC.GetInstance.GetTopic(ScreenDeviceType.煮面机));
+                ThreadManage.GetInstance().StartLong(new Action(() =>
+                {
+                    morkS.MorkS_OrderCount = Json<OrderStatistics>.Data.Count;
+                    SendScreenDataModel sendScreenDataModel = new SendScreenDataModel();
+                    sendScreenDataModel.Name = ScreenDeviceType.煮面机;
+                    sendScreenDataModel.Value = morkS.ToJSON();
+                    mQTTProxy.Publish(ScreenTOPIC.GetInstance.GetTopic(ScreenDeviceType.煮面机), sendScreenDataModel.ToJSON());
+                    Thread.Sleep(100);
+                }), "海科食堂大屏监听");
+            });
+            mQTTProxy.Connect("UserName", "Password", "Host", 1883, $"MORKS 设备监听数据{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+        }
+
+        //订单信息（正在制作，等待制作，制作完成）
+        //煮面炉上下状态（6个煮面炉上或下）
+        //温度状态（煮面炉温度是否到达）
+        //料仓位置（当前料仓在几号位置）
+        //料仓上下物料检测
+        //落碗机构缺碗检测
+        //机器人状态
+        //当日订单总量
+        //报警信息
+    }
+}
diff --git a/BPASmartClient.MorkMV1/DeviceData.cs b/BPASmartClient.MorkMV1/DeviceData.cs
new file mode 100644
index 00000000..78715248
--- /dev/null
+++ b/BPASmartClient.MorkMV1/DeviceData.cs
@@ -0,0 +1,193 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace BPASmartClient.MorkMV1
+{
+    public class DeviceData : IStatus
+    {
+        /// <summary>
+        /// 初始化启动
+        /// </summary>
+        [VariableMonitor("初始化启动", "M0.0", "320")]
+        public bool InitStart { get; set; }
+
+        /// <summary>
+        /// 初始化完成
+        /// </summary>
+        [VariableMonitor("初始化完成", "M0.1", "321")]
+        public bool InitComplete { get; set; }
+
+        /// <summary>
+        /// 移碗丝杆初始化完成
+        /// </summary>
+        [VariableMonitor("移碗丝杆初始化完成", "M0.2", "322")]
+        public bool MoveScrewRodInitCom { get; set; }
+
+        /// <summary>
+        /// 供碗1初始化完成
+        /// </summary>
+        [VariableMonitor("供碗1初始化完成", "M0.3", "323")]
+        public bool SacrificialVesselInitCom { get; set; }
+
+        /// <summary>
+        /// 气缸推杆初始化完成
+        /// </summary>
+        [VariableMonitor("气缸推杆初始化完成", "M0.4", "324")]
+        public bool CylinderInitCom { get; set; }
+
+        /// <summary>
+        /// 煮面机初始化完成
+        /// </summary>
+        [VariableMonitor("煮面机初始化完成", "M0.5", "325")]
+        public bool NoodleCookerInitCom { get; set; }
+
+        /// <summary>
+        /// 机器人初始化完成
+        /// </summary>
+        [VariableMonitor("机器人初始化完成", "M0.6", "326")]
+        public bool RobotInitCom { get; set; }
+
+        /// <summary>
+        /// 料仓初始化完成
+        /// </summary>
+        [VariableMonitor("料仓初始化完成", "M0.7", "327")]
+        public bool SiloInitCom { get; set; }
+
+        /// <summary>
+        /// 故障复位/停止
+        /// </summary>
+        [VariableMonitor("故障复位/停止", "M1.0", "328")]
+        public bool FaultResetOrStop { get; set; }
+
+        /// <summary>
+        /// 落碗1，大碗
+        /// </summary>
+        [VariableMonitor("落碗1，大碗", "M9.0", "392")]
+        public bool DropBowlOne { get; set; }
+
+        /// <summary>
+        /// 落碗2，一次性碗
+        /// </summary>
+        [VariableMonitor("落碗2，一次性碗", "M9.1", "393")]
+        public bool DropBowlTow { get; set; }
+
+        /// <summary>
+        /// 允许倒面
+        /// </summary>
+        [VariableMonitor("允许倒面", "M10.0", "400")]
+        public bool AllowInvertedFace { get; set; }
+
+        /// <summary>
+        /// 出餐完成
+        /// </summary>
+        [VariableMonitor("出餐完成", "M10.1", "401")]
+        public bool DiningComplete { get; set; }
+
+        /// <summary>
+        /// 落碗机构状态，1:忙碌 0:空闲
+        /// </summary>
+        [VariableMonitor("落碗机构状态，1:忙碌 0:空闲", "M10.4", "404")]
+        public bool DropBowlMechanismStatus { get; set; }
+
+        /// <summary>
+        /// 定位标志,1:忙碌 0:空闲
+        /// </summary>
+        [VariableMonitor("定位标志,1:忙碌 0:空闲", "M12.2", "418")]
+        public bool FixedFlag { get; set; }
+
+        /// <summary>
+        /// 定位启动
+        /// </summary>
+        [VariableMonitor("定位启动", "M12.3", "419")]
+        public bool FixedStart { get; set; }
+
+        /// <summary>
+        /// 料仓到位
+        /// </summary>
+        [VariableMonitor("料仓到位", "M13.5", "429")]
+        public bool SiloInPlace { get; set; }
+
+        /// <summary>
+        /// 机器人料仓取面完成
+        /// </summary>
+        [VariableMonitor("机器人去料仓取面完成", "M16.7", "455")]
+        public bool RobotTakeNoodleCom { get; set; }
+
+        /// <summary>
+        /// 机器人状态
+        /// </summary>
+        [VariableMonitor("机器人状态", "M17.4", "460")]
+        public bool RobotStatus { get; set; }
+
+        /// <summary>
+        /// 一次性碗有无检测
+        /// </summary>
+        [VariableMonitor("一次性碗有无检测", "M18.0", "464")]
+        public bool SmallBowlYesOrNoCheck { get; set; }
+
+        /// <summary>
+        /// 大碗有无检测
+        /// </summary>
+        [VariableMonitor("大碗有无检测", "M18.1", "465")]
+        public bool LargeBowYesOrNoCheck { get; set; }
+
+        /// <summary>
+        /// 转台高位
+        /// </summary>
+        [VariableMonitor("转台高位", "M18.2", "466")]
+        public bool TurntableHighPosition { get; set; }
+
+        /// <summary>
+        /// 转台低位
+        /// </summary>
+        [VariableMonitor("转台低位", "M18.3", "467")]
+        public bool TurntableLowPosition { get; set; }
+
+        /// <summary>
+        /// 煮面完成
+        /// </summary>
+        [VariableMonitor("煮面完成", "V17.0")]
+        public bool[] CookNoodleCom { get; set; } = new bool[6];
+
+        /// <summary>
+        /// 本地/远程
+        /// </summary>
+        [VariableMonitor("本地/远程", "V18.0")]
+        public bool LocalOrRemote { get; set; }
+
+        /// <summary>
+        /// 温度到达
+        /// </summary>
+        [VariableMonitor("温度到达", "V18.7")]
+        public bool TemperatureReaches { get; set; }
+
+        /// <summary>
+        /// 加热中
+        /// </summary>
+        [VariableMonitor("加热中", "V18.6")]
+        public bool Heating { get; set; }
+
+        /// <summary>
+        /// 转台当前位置
+        /// </summary>
+        [VariableMonitor("转台当前位置", "VW770")]
+        public ushort CurrentLoc { get; set; }
+
+        /// <summary>
+        /// 补料完成
+        /// </summary>
+        [VariableMonitor("补料完成", "M101.6", "1134")]
+        public bool FeedComplete { get; set; }
+
+        /// <summary>
+        /// 补料中
+        /// </summary>
+        [VariableMonitor("补料中", "M102.6", "1142")]
+        public bool Feeding { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.MorkMV1/GVL_MorkMV1.cs b/BPASmartClient.MorkMV1/GVL_MorkMV1.cs
new file mode 100644
index 00000000..faca957a
--- /dev/null
+++ b/BPASmartClient.MorkMV1/GVL_MorkMV1.cs
@@ -0,0 +1,353 @@
+using BPASmartClient.Device;
+using BPASmartClient.Model;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkMV1
+{
+    public class GVL_MorkMV1 : IStatus
+    {
+        #region 临时变量
+        /// <summary>
+        /// 允许运行
+        /// </summary>
+        [VariableMonitor("允许运行")]
+        public bool AllowRun { get; set; }
+
+        /// <summary>
+        /// 优先级判断
+        /// </summary>
+        [VariableMonitor("优先级判断条件")]
+        public bool PriorityJudgment { get; set; }
+
+        /// <summary>
+        /// 机器人任务互锁信号,false:取面，true:出餐
+        /// </summary>
+        [VariableMonitor("机器人任务互锁信号")]
+        public bool RobotTaskInterlock { get; set; }
+
+        /// <summary>
+        /// 取碗互锁信号
+        /// </summary>
+        [VariableMonitor("取碗互锁信号")]
+        public bool TakeBowlInterlock { get; set; }
+
+        /// <summary>
+        /// 取面互锁信号
+        /// </summary>
+        [VariableMonitor("取面互锁信号")]
+        public bool TakeNoodleInterlock { get; set; }
+
+        /// <summary>
+        /// 出面中
+        /// </summary>
+        [VariableMonitor("出面中")]
+        public bool OutNoodleing { get; set; }
+
+        /// <summary>
+        /// 允许取面
+        /// </summary>
+        [VariableMonitor("允许取面")]
+        public bool AllowTakeNoodle { get; set; }
+
+        /// <summary>
+        /// 转台互锁信号
+        /// </summary>
+        [VariableMonitor("转台互锁信号")]
+        public bool TurntableInterlock { get; set; }
+
+
+        /// <summary>
+        /// 煮面炉状态,True:忙碌，false:空闲
+        /// </summary>
+        [VariableMonitor("煮面炉状态")]
+        public bool[] NoodleCookerStatus { get; set; } = new bool[6];
+
+        /// <summary>
+        /// 转台当前启动位置
+        /// </summary>
+        [VariableMonitor("转台当前启动位置")]
+        public ushort CurrentLoc { get; set; } = 0;
+
+        /// <summary>
+        /// 制作完成标志
+        /// </summary>
+        [VariableMonitor("制作完成标志")]
+        public bool CookCompleteFlatBit { get; set; }
+
+        /// <summary>
+        /// 取碗任务数量
+        /// </summary>
+        [VariableMonitor("取碗任务数量")]
+        public int TakeBowlTaskCount { get; set; }
+
+        /// <summary>
+        /// 取面任务数量
+        /// </summary>
+        [VariableMonitor("取面任务数量")]
+        public int RBTakeNoodleTaskCount { get; set; }
+        #endregion
+
+        #region 列表数据
+        /// <summary>
+        /// 机器人取面位置队列
+        /// </summary>
+        public ConcurrentQueue<OrderLocInfo> RBTakeNoodleTask { get; set; } = new ConcurrentQueue<OrderLocInfo>();
+
+        /// <summary>
+        /// 出碗队列
+        /// </summary>
+        public ConcurrentQueue<OrderLocInfo> TakeBowlTask { get; set; } = new ConcurrentQueue<OrderLocInfo>();
+
+
+        public List<DoOrderEvent> doOrderEvents { get; set; } = new List<DoOrderEvent>();
+
+        public ConcurrentDictionary<string, DoOrderEvent> doe { get; set; } = new ConcurrentDictionary<string, DoOrderEvent>();
+
+        public List<string> HistorySuborderId { get; set; } = new List<string>();
+
+        public NoodleShidModel[] nsm { get; set; } = new NoodleShidModel[6] { new NoodleShidModel(), new NoodleShidModel(), new NoodleShidModel(), new NoodleShidModel(), new NoodleShidModel(), new NoodleShidModel() };
+        #endregion
+
+        #region 订单ID记录
+        /// <summary>
+        /// 取碗订单ID
+        /// </summary>
+        public string TakeBowlId { get; set; } = string.Empty;
+        /// <summary>
+        /// 取碗订单名称
+        /// </summary>
+        public string TakeBowName { get; set; } = string.Empty;
+        /// <summary>
+        /// 配料完成订单名称
+        /// </summary>
+        public int TakeBowSortNum { get; set; } = 0;
+
+
+        /// <summary>
+        /// 允许倒面位置ID
+        /// </summary>
+        public string IngredientsCompleteId { get; set; } = string.Empty;
+        /// <summary>
+        /// 配料完成订单名称
+        /// </summary>
+        public string IngredientsCompleteName { get; set; } = string.Empty;
+        /// <summary>
+        /// 配料完成订单名称
+        /// </summary>
+        public int IngredientsCompleteSortNum { get; set; } = 0;
+
+
+        /// <summary>
+        /// 煮面口对应的订单ID
+        /// </summary>
+        public string[] CookNodelId { get; set; } = new string[6] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, };
+
+        /// <summary>
+        /// 出餐订单ID
+        /// </summary>
+        public string OutMealId { get; set; } = string.Empty;
+        /// <summary>
+        /// 出餐订单名称
+        /// </summary>
+        public string OutMealName { get; set; } = string.Empty;
+        /// <summary>
+        /// 出餐排序号
+        /// </summary>
+        public int OutMealSortNum { get; set; } = 0;
+
+
+        /// <summary>
+        /// 转台位置轮询
+        /// </summary>
+        public List<ushort> TurntableLocLists { get; set; } = new List<ushort>();
+
+        #endregion
+
+        #region device Data
+        /// <summary>
+        /// 初始化启动
+        /// </summary>
+        [VariableMonitor("初始化启动", "M0.0", "320")]
+        public bool InitStart { get; set; }
+
+        /// <summary>
+        /// 初始化完成
+        /// </summary>
+        [VariableMonitor("初始化完成", "M0.1", "321")]
+        public bool InitComplete { get; set; }
+
+        /// <summary>
+        /// 移碗丝杆初始化完成
+        /// </summary>
+        [VariableMonitor("移碗丝杆初始化完成", "M0.2", "322")]
+        public bool MoveScrewRodInitCom { get; set; }
+
+        /// <summary>
+        /// 供碗1初始化完成
+        /// </summary>
+        [VariableMonitor("供碗1初始化完成", "M0.3", "323")]
+        public bool SacrificialVesselInitCom { get; set; }
+
+        /// <summary>
+        /// 气缸推杆初始化完成
+        /// </summary>
+        [VariableMonitor("气缸推杆初始化完成", "M0.4", "324")]
+        public bool CylinderInitCom { get; set; }
+
+        /// <summary>
+        /// 煮面机初始化完成
+        /// </summary>
+        [VariableMonitor("煮面机初始化完成", "M0.5", "325")]
+        public bool NoodleCookerInitCom { get; set; }
+
+        /// <summary>
+        /// 机器人初始化完成
+        /// </summary>
+        [VariableMonitor("机器人初始化完成", "M0.6", "326")]
+        public bool RobotInitCom { get; set; }
+
+        /// <summary>
+        /// 料仓初始化完成
+        /// </summary>
+        [VariableMonitor("料仓初始化完成", "M0.7", "327")]
+        public bool SiloInitCom { get; set; }
+
+        /// <summary>
+        /// 故障复位/停止
+        /// </summary>
+        [VariableMonitor("故障复位/停止", "M1.0", "328")]
+        public bool FaultResetOrStop { get; set; }
+
+        /// <summary>
+        /// 落碗1，大碗
+        /// </summary>
+        [VariableMonitor("落碗1，大碗", "M9.0", "392")]
+        public bool DropBowlOne { get; set; }
+
+        /// <summary>
+        /// 落碗2，一次性碗
+        /// </summary>
+        [VariableMonitor("落碗2，一次性碗", "M9.1", "393")]
+        public bool DropBowlTow { get; set; }
+
+        /// <summary>
+        /// 允许倒面
+        /// </summary>
+        [VariableMonitor("允许倒面", "M10.0", "400")]
+        public bool AllowInvertedFace { get; set; }
+
+        /// <summary>
+        /// 出餐完成
+        /// </summary>
+        [VariableMonitor("出餐完成", "M10.1", "401")]
+        public bool DiningComplete { get; set; }
+
+        /// <summary>
+        /// 落碗机构状态，1:忙碌 0:空闲
+        /// </summary>
+        [VariableMonitor("落碗机构状态，1:忙碌 0:空闲", "M10.4", "404")]
+        public bool DropBowlMechanismStatus { get; set; }
+
+        /// <summary>
+        /// 定位标志,1:忙碌 0:空闲
+        /// </summary>
+        [VariableMonitor("定位标志,1:忙碌 0:空闲", "M12.2", "418")]
+        public bool FixedFlag { get; set; }
+
+        /// <summary>
+        /// 定位启动
+        /// </summary>
+        [VariableMonitor("定位启动", "M12.3", "419")]
+        public bool FixedStart { get; set; }
+
+        /// <summary>
+        /// 料仓到位
+        /// </summary>
+        [VariableMonitor("料仓到位", "M13.5", "429")]
+        public bool SiloInPlace { get; set; }
+
+        /// <summary>
+        /// 机器人料仓取面完成
+        /// </summary>
+        [VariableMonitor("机器人去料仓取面完成", "M16.7", "455")]
+        public bool RobotTakeNoodleCom { get; set; }
+
+        /// <summary>
+        /// 机器人状态
+        /// </summary>
+        [VariableMonitor("机器人状态", "M17.4", "460")]
+        public bool RobotStatus { get; set; }
+
+        /// <summary>
+        /// 一次性碗有无检测
+        /// </summary>
+        [VariableMonitor("一次性碗有无检测", "M18.0", "464")]
+        public bool SmallBowlYesOrNoCheck { get; set; }
+
+        /// <summary>
+        /// 大碗有无检测
+        /// </summary>
+        [VariableMonitor("大碗有无检测", "M18.1", "465")]
+        public bool LargeBowYesOrNoCheck { get; set; }
+
+        /// <summary>
+        /// 转台高位
+        /// </summary>
+        [VariableMonitor("转台高位", "M18.2", "466")]
+        public bool TurntableHighPosition { get; set; }
+
+        /// <summary>
+        /// 转台低位
+        /// </summary>
+        [VariableMonitor("转台低位", "M18.3", "467")]
+        public bool TurntableLowPosition { get; set; }
+
+        /// <summary>
+        /// 煮面完成
+        /// </summary>
+        [VariableMonitor("煮面完成")]
+        public bool[] CookNoodleCom { get; set; } = new bool[6];
+
+        /// <summary>
+        /// 本地/远程
+        /// </summary>
+        [VariableMonitor("本地/远程")]
+        public bool LocalOrRemote { get; set; }
+
+        /// <summary>
+        /// 温度到达
+        /// </summary>
+        [VariableMonitor("温度到达")]
+        public bool TemperatureReaches { get; set; }
+
+        /// <summary>
+        /// 加热中
+        /// </summary>
+        [VariableMonitor("加热中")]
+        public bool Heating { get; set; }
+
+        /// <summary>
+        /// 转台当前位置
+        /// </summary>
+        [VariableMonitor("转台当前位置", "VW770", "870")]
+        public ushort CurrentFeedbackLoc { get; set; }
+
+        /// <summary>
+        /// 补料完成
+        /// </summary>
+        [VariableMonitor("补料完成", "M101.6", "1134")]
+        public bool FeedComplete { get; set; }
+
+        /// <summary>
+        /// 补料中
+        /// </summary>
+        [VariableMonitor("补料中", "M102.6", "1142")]
+        public bool Feeding { get; set; }
+        #endregion
+    }
+}
diff --git a/BPASmartClient.MorkMV1/GlobalUsing.cs b/BPASmartClient.MorkMV1/GlobalUsing.cs
new file mode 100644
index 00000000..f3573942
--- /dev/null
+++ b/BPASmartClient.MorkMV1/GlobalUsing.cs
@@ -0,0 +1,26 @@
+global using System;
+global using System.Collections.Generic;
+global using BPA.Message.Enum;
+global using BPASmartClient.Device;
+global using BPASmartClient.EventBus;
+global using BPASmartClient.Model;
+global using BPASmartClient.Peripheral;
+global using static BPASmartClient.EventBus.EventBus;
+global using BPASmartClient.Helper;
+global using System.Threading;
+global using BPASmartClient.Message;
+global using BPA.Message;
+global using System.Linq;
+global using BPASmartClient.Model.PLC;
+global using System.Threading.Tasks;
+global using System.Reflection;
+global using BPASmartClient.MorkMV1.Model;
+global using System.Collections.ObjectModel;
+global using BPASmartClient.MorkMV1.ViewModel;
+global using BPASmartClient.Business;
+global using BPASmartClient.Model.小炒机;
+global using BPA.Models;
+global using System.Windows.Forms;
+global using System.Media;
+
+
diff --git a/BPASmartClient.MorkMV1/Model/Global.cs b/BPASmartClient.MorkMV1/Model/Global.cs
new file mode 100644
index 00000000..a1bfbeac
--- /dev/null
+++ b/BPASmartClient.MorkMV1/Model/Global.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkMV1.Model
+{
+    public class Global
+    {
+        public static bool EnableLocalSimOrder { get; set; }
+    }
+}
diff --git a/BPASmartClient.MorkMV1/Model/MorksPar.cs b/BPASmartClient.MorkMV1/Model/MorksPar.cs
new file mode 100644
index 00000000..241eddce
--- /dev/null
+++ b/BPASmartClient.MorkMV1/Model/MorksPar.cs
@@ -0,0 +1,16 @@
+using BPASmartClient.Model;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace BPASmartClient.MorkMV1.Model
+{
+    internal class MorksPar
+    {
+        public ObservableCollection<ParSet> parSets { get; set; } = new ObservableCollection<ParSet>();
+    }
+}
diff --git a/BPASmartClient.MorkMV1/Model/ParSet.cs b/BPASmartClient.MorkMV1/Model/ParSet.cs
new file mode 100644
index 00000000..03261db1
--- /dev/null
+++ b/BPASmartClient.MorkMV1/Model/ParSet.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.Model
+{
+    public class ParSet 
+    {
+        public ushort Minute { get { return _mMinute; } set { _mMinute = value; } }
+        private ushort _mMinute;
+
+        public ushort Second { get { return _mSecond; } set { _mSecond = value; } }
+        private ushort _mSecond;
+
+
+        public bool IsShield { get { return _mIsShield; } set { _mIsShield = value; } }
+        private bool _mIsShield;
+
+
+        public string TextBlockContext { get { return _mTextBlockContext; } set { _mTextBlockContext = value; } }
+        private string _mTextBlockContext;
+
+        public string CheckBoxContext { get { return _mCheckBoxContext; } set { _mCheckBoxContext = value; } }
+        private string _mCheckBoxContext;
+
+    }
+}
diff --git a/BPASmartClient.MorkMV1/Model/WritePar.cs b/BPASmartClient.MorkMV1/Model/WritePar.cs
new file mode 100644
index 00000000..363fb652
--- /dev/null
+++ b/BPASmartClient.MorkMV1/Model/WritePar.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkMV1.Model
+{
+    public class WritePar
+    {
+        public string Address { get; set; }
+        public object Value { get; set; }
+    }
+}
diff --git a/BPASmartClient.MorkMV1/NoodleShidModel.cs b/BPASmartClient.MorkMV1/NoodleShidModel.cs
new file mode 100644
index 00000000..e9833f29
--- /dev/null
+++ b/BPASmartClient.MorkMV1/NoodleShidModel.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkMV1
+{
+    public class NoodleShidModel
+    {
+        /// <summary>
+        /// 是否被屏蔽，true:屏蔽,false:未屏蔽
+        /// </summary>
+        public bool IsShield { get; set; }
+
+        /// <summary>
+        /// 是否忙碌，true:忙碌，FALSE：空闲
+        /// </summary>
+        public bool NoodleCookerStatus { get; set; }
+    }
+}
diff --git a/BPASmartClient.MorkMV1/OrderLocInfo.cs b/BPASmartClient.MorkMV1/OrderLocInfo.cs
new file mode 100644
index 00000000..33c1ffaf
--- /dev/null
+++ b/BPASmartClient.MorkMV1/OrderLocInfo.cs
@@ -0,0 +1,24 @@
+//using BPA.Message;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
+
+//namespace BPASmartClient.MorkMV1
+//{
+//    public class OrderLocInfo
+//    {
+//        public string SuborderId { get; set; }
+//        public ushort Loc { get; set; }
+//        public ushort RecipeNumber { get; set; }
+//        public int BatchingId { get; set; }
+//        public string GoodName { get; set; }
+//        public int SortNum { get; set; }
+
+//        public int RecipeId { get; set; }
+
+//        public List<int> Recipes { get; set; }
+
+//    }
+//}
diff --git a/BPASmartClient.MorkMV1/View/Debug.xaml b/BPASmartClient.MorkMV1/View/Debug.xaml
new file mode 100644
index 00000000..471eab46
--- /dev/null
+++ b/BPASmartClient.MorkMV1/View/Debug.xaml
@@ -0,0 +1,117 @@
+<UserControl
+    x:Class="BPASmartClient.MorkMV1.View.Debug"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.MorkMV1.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.MorkMV1.ViewModel"
+    Name="调试界面"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:DebugViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <Style x:Key="TextboxStyle" TargetType="TextBox">
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="{StaticResource TitleBorderColor}" />
+            <Setter Property="Width" Value="150" />
+            <Setter Property="BorderBrush" Value="{StaticResource TitleBorderColor}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="CaretBrush" Value="Aqua" />
+        </Style>
+        <Style x:Key="CheckBox" TargetType="CheckBox">
+            <Setter Property="Foreground" Value="Aqua" />
+            <Setter Property="FontSize" Value="16" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="Margin" Value="10,0" />
+            <Setter Property="IsChecked" Value="False" />
+        </Style>
+    </UserControl.Resources>
+
+    <Grid Margin="20">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+        <StackPanel>
+            <StackPanel Margin="10,0,0,20" Orientation="Horizontal">
+                <TextBlock
+                    FontSize="18"
+                    Foreground="{StaticResource TitleBorderColor}"
+                    Text="面条位置：" />
+                <TextBox Style="{StaticResource TextboxStyle}" Text="{Binding NoodleLoc}" />
+                <CheckBox
+                    Background="White"
+                    Content="随机面条位置"
+                    IsChecked="{Binding IsNoodPositon}"
+                    Style="{StaticResource CheckBox}" />
+
+            </StackPanel>
+
+            <StackPanel Margin="10,0,0,20" Orientation="Horizontal">
+                <TextBlock
+                    FontSize="18"
+                    Foreground="{StaticResource TitleBorderColor}"
+                    Text="面碗位置：" />
+                <TextBox Style="{StaticResource TextboxStyle}" Text="{Binding BowlLoc}" />
+                <CheckBox
+                    Background="White"
+                    Content="随机面碗位置"
+                    IsChecked="{Binding IsBowPositon}"
+                    Style="{StaticResource CheckBox}" />
+                <CheckBox
+                    Background="White"
+                    Command="{Binding EnableLacalSimOrder}"
+                    Content="启用本地模拟功能"
+                    IsChecked="{Binding LocalSimOrder}"
+                    Style="{StaticResource CheckBox}" />
+            </StackPanel>
+
+            <StackPanel Orientation="Horizontal">
+                <Button
+                    Grid.Row="0"
+                    Width="170"
+                    HorizontalAlignment="Left"
+                    Command="{Binding SimOrderRandomCommand}"
+                    Content="启动随机模拟订单"
+                    Style="{StaticResource ButtonStyle}"
+                    Visibility="{Binding VisibilitySimOrder}" />
+                <Button
+                    Grid.Row="0"
+                    Width="170"
+                    HorizontalAlignment="Left"
+                    Command="{Binding SimOrderRandomCloseCommand}"
+                    Content="关闭随机模拟订单"
+                    Style="{StaticResource ButtonStyle}"
+                    Visibility="{Binding VisibilitySimOrder}" />
+                <Button
+                    Grid.Row="0"
+                    Width="130"
+                    HorizontalAlignment="Left"
+                    Command="{Binding SimOrderCommand}"
+                    Content="模拟订单"
+                    Style="{StaticResource ButtonStyle}"
+                    Visibility="{Binding VisibilitySimOrder}" />
+                <Button
+                    Grid.Row="0"
+                    Width="120"
+                    HorizontalAlignment="Left"
+                    Command="{Binding InitCommand}"
+                    Content="初始化设备"
+                    Style="{StaticResource ButtonStyle}" />
+            </StackPanel>
+        </StackPanel>
+
+
+
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.MorkMV1/View/Debug.xaml.cs b/BPASmartClient.MorkMV1/View/Debug.xaml.cs
new file mode 100644
index 00000000..a2e45ee7
--- /dev/null
+++ b/BPASmartClient.MorkMV1/View/Debug.xaml.cs
@@ -0,0 +1,30 @@
+using BPASmartClient.MorkMV1.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.MorkMV1.View
+{
+    /// <summary>
+    /// Debug.xaml 的交互逻辑
+    /// </summary>
+    public partial class Debug : System.Windows.Controls.UserControl
+    {
+        public Debug()
+        {
+            InitializeComponent();
+        }
+
+    }
+}
diff --git a/BPASmartClient.MorkMV1/View/Monitor.xaml b/BPASmartClient.MorkMV1/View/Monitor.xaml
new file mode 100644
index 00000000..5d841ef6
--- /dev/null
+++ b/BPASmartClient.MorkMV1/View/Monitor.xaml
@@ -0,0 +1,242 @@
+<UserControl
+    x:Class="BPASmartClient.MorkMV1.View.Monitor"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.MorkMV1.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.MorkMV1.ViewModel"
+    Name="监控画面"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:MonitorViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <!--<convert:TextDisplayConvert x:Key="textDisplayConvert" />
+                    <convert:IsEnableConvert x:Key="isEnableConvert" />
+                    <convert:AnalogAlarmConvert x:Key="analogAlarmConvert" />
+                    <convert:DiscreteAlarmConvert x:Key="discreteAlarmConvert" />
+                    <convert:AlarmTypeTextConvert x:Key="alarmTypeTextConvert" />-->
+                    <SolidColorBrush x:Key="BorderSolid" Color="#5523CACA" />
+                    <SolidColorBrush x:Key="FontColor" Color="#FF2AB2E7" />
+                    <SolidColorBrush x:Key="TitleFontColor" Color="#ddd" />
+                    <SolidColorBrush x:Key="CursorColor" Color="Aqua" />
+                    <SolidColorBrush x:Key="TitleBorderColor" Color="#FF2AB2E7" />
+
+                    <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="18" />
+                        <Setter Property="Foreground" Value="{StaticResource TextBlockForeground}" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                        <Setter Property="HorizontalAlignment" Value="Center" />
+                    </Style>
+
+                    <Style x:Key="TextBoxStyle" TargetType="TextBox">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="22" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Foreground" Value="{StaticResource TextBlockForeground}" />
+                        <Setter Property="BorderBrush" Value="#FF23CACA" />
+                        <Setter Property="CaretBrush" Value="Aqua" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="30" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+        <!--#region 表格标题栏设置-->
+        <Grid Background="#dd2AB2E7">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="0.3*" />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition Width="0.7*" />
+                <ColumnDefinition Width="0.7*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                Grid.Column="0"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="{StaticResource TitleFontColor}"
+                Text="ID" />
+
+            <Grid Grid.Column="1">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Foreground="{StaticResource TitleFontColor}"
+                    Text="变量名" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>
+
+            <TextBlock
+                Grid.Column="2"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="{StaticResource TitleFontColor}"
+                Text="PLC 地址" />
+
+
+            <Grid Grid.Column="3">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Foreground="{StaticResource TitleFontColor}"
+                    Text="注释" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="1,0,0,0"
+                    Cursor="SizeWE" />
+            </Grid>
+
+
+
+            <Grid Grid.Column="4">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Foreground="{StaticResource TitleFontColor}"
+                    Text="Modbus TCP 地址" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>
+
+            <TextBlock
+                Grid.Column="5"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="{StaticResource TitleFontColor}"
+                Text="当前值" />
+
+        </Grid>
+        <!--#endregion-->
+
+        <!--#region 表格数据显示-->
+        <ScrollViewer
+            Grid.Row="1"
+            HorizontalScrollBarVisibility="Hidden"
+            VerticalScrollBarVisibility="Hidden">
+            <ItemsControl ItemsSource="{Binding variableMonitors}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Grid x:Name="gr" Height="30">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="0.3*" />
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="0.7*" />
+                                <ColumnDefinition Width="0.7*" />
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock
+                                Grid.Column="0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                FontSize="14"
+                                Foreground="{StaticResource FontColor}"
+                                Text="{Binding Id}" />
+
+                            <Grid Grid.Column="1">
+                                <TextBlock
+                                    Margin="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    FontSize="14"
+                                    Foreground="{StaticResource FontColor}"
+                                    Text="{Binding VarName}" />
+                                <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
+                            </Grid>
+
+
+                            <TextBlock
+                                Grid.Column="2"
+                                Margin="5,0,0,0"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                FontSize="14"
+                                Foreground="{StaticResource FontColor}"
+                                Text="{Binding PLCAddress}" />
+
+                            <Grid Grid.Column="3">
+                                <TextBlock
+                                    Margin="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    FontSize="14"
+                                    Foreground="{StaticResource FontColor}"
+                                    Text="{Binding Notes}" />
+                                <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,0,0" />
+                            </Grid>
+
+                            <Grid Grid.Column="4">
+                                <TextBlock
+                                    Margin="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    FontSize="14"
+                                    Foreground="{StaticResource FontColor}"
+                                    Text="{Binding ModbusTcpAddress}" />
+                                <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
+                            </Grid>
+
+                            <TextBlock
+                                Grid.Column="5"
+                                Margin="5,0,0,0"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                FontSize="14"
+                                Foreground="{StaticResource FontColor}"
+                                Text="{Binding CurrentValue}" />
+
+                            <Border
+                                Grid.ColumnSpan="8"
+                                BorderBrush="{StaticResource BorderSolid}"
+                                BorderThickness="1" />
+
+                        </Grid>
+
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                            </Trigger>
+                        </DataTemplate.Triggers>
+
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </ScrollViewer>
+        <!--#endregion-->
+
+
+    </Grid>
+
+</UserControl>
diff --git a/BPASmartClient.MorkMV1/View/Monitor.xaml.cs b/BPASmartClient.MorkMV1/View/Monitor.xaml.cs
new file mode 100644
index 00000000..cec009b1
--- /dev/null
+++ b/BPASmartClient.MorkMV1/View/Monitor.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.MorkMV1.View
+{
+    /// <summary>
+    /// Monitor.xaml 的交互逻辑
+    /// </summary>
+    public partial class Monitor : System.Windows.Controls.UserControl
+    {
+        public Monitor()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.MorkMV1/View/ParSet.xaml b/BPASmartClient.MorkMV1/View/ParSet.xaml
new file mode 100644
index 00000000..bd6450b6
--- /dev/null
+++ b/BPASmartClient.MorkMV1/View/ParSet.xaml
@@ -0,0 +1,130 @@
+<UserControl
+    x:Class="BPASmartClient.MorkMV1.View.ParSet"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.MorkMV1.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.MorkMV1.ViewModel"
+    Name="参数设置界面"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:ParSetViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="18" />
+                        <Setter Property="Foreground" Value="{StaticResource TextBlockForeground}" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                        <Setter Property="HorizontalAlignment" Value="Center" />
+                    </Style>
+
+                    <Style x:Key="TextBoxStyle" TargetType="TextBox">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="22" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Foreground" Value="{StaticResource TextBlockForeground}" />
+                        <Setter Property="BorderBrush" Value="#FF23CACA" />
+                        <Setter Property="CaretBrush" Value="Aqua" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+
+    </UserControl.Resources>
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="35" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+
+            <TextBlock Style="{StaticResource TextBlockStyle}" Text="请点击按钮保存参数：" />
+
+            <pry:IcoButton
+                Grid.Column="5"
+                Width="140"
+                HorizontalAlignment="Left"
+                Command="{Binding SaveInfoCommand}"
+                Content="保存配置"
+                FontSize="16"
+                IcoText="&#xe936;"
+                Style="{StaticResource IcoButtonStyle}">
+                <pry:IcoButton.Foreground>
+                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                        <GradientStop Color="#FFBB662A" />
+                        <GradientStop Offset="1" Color="White" />
+                    </LinearGradientBrush>
+                </pry:IcoButton.Foreground>
+            </pry:IcoButton>
+
+
+        </StackPanel>
+
+        <!--  参数放置面板  -->
+        <Grid Grid.Row="2">
+            <ItemsControl ItemsSource="{Binding parSets}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="{Binding TextBlockContext}" />
+                            <TextBox
+                                Width="100"
+                                Margin="10,0,0,0"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                BorderBrush="#FF23CACA"
+                                CaretBrush="Aqua"
+                                FontFamily="楷体"
+                                FontSize="21"
+                                Foreground="#ff34f7f7"
+                                Text="{Binding Minute}" />
+                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="（分）" />
+                            <TextBox
+                                Width="100"
+                                Margin="0,10"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                BorderBrush="#FF23CACA"
+                                CaretBrush="Aqua"
+                                FontFamily="楷体"
+                                FontSize="21"
+                                Foreground="#ff34f7f7"
+                                Text="{Binding Second}" />
+                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="（秒）" />
+
+                            <CheckBox
+                                Height="20"
+                                Margin="10"
+                                VerticalAlignment="Center"
+                                Background="#FF2AB2E7"
+                                Content="{Binding CheckBoxContext}"
+                                FontSize="14"
+                                Foreground="#00c2f4"
+                                IsChecked="{Binding IsShield}"
+                                Template="{StaticResource CbTemplate}" />
+
+                        </StackPanel>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+
+        </Grid>
+
+    </Grid>
+
+
+</UserControl>
diff --git a/BPASmartClient.MorkMV1/View/ParSet.xaml.cs b/BPASmartClient.MorkMV1/View/ParSet.xaml.cs
new file mode 100644
index 00000000..c82bbd5c
--- /dev/null
+++ b/BPASmartClient.MorkMV1/View/ParSet.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.MorkMV1.View
+{
+    /// <summary>
+    /// ParSet.xaml 的交互逻辑
+    /// </summary>
+    public partial class ParSet : System.Windows.Controls.UserControl
+    {
+        public ParSet()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.MorkMV1/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkMV1/ViewModel/DebugViewModel.cs
new file mode 100644
index 00000000..63b2470e
--- /dev/null
+++ b/BPASmartClient.MorkMV1/ViewModel/DebugViewModel.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BPASmartClient.Helper;
+using BPASmartClient.Model;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using BPASmartClient.EventBus;
+using BPASmartClient.MorkMV1.Model;
+using System.Windows;
+using BPASmartClient.Message;
+
+namespace BPASmartClient.MorkMV1.ViewModel
+{
+    public class DebugViewModel : ObservableObject
+    {
+        public DebugViewModel()
+        {
+            InitCommand = new RelayCommand(() => { 
+                ActionManage.GetInstance.Send("InitDevice"); 
+                ActionManage.GetInstance.Send("初始化设定煮面时间"); 
+            });
+            SimOrderCommand = new RelayCommand(() =>
+            {
+                new MorksSimorderModel() { Bowloc = this.BowlLoc, NoodleLoc = this.NoodleLoc }.Publish();
+               
+            });
+            SimOrderRandomCommand = new RelayCommand(() =>
+            {
+                int NoodPosition = 0;
+                int BowPosion = 0;
+                NoodPosition = IsNoodPositon == true ? 0 : NoodleLoc;
+                BowPosion = IsBowPositon == true ? 0 : BowlLoc;
+                ActionManage.GetInstance.Send("EnableForOrder", new object[] { NoodPosition, BowPosion });
+            });
+            SimOrderRandomCloseCommand = new RelayCommand(() =>
+            {
+                ThreadManage.GetInstance().StopTask("ForOrder");
+                MessageLog.GetInstance.Show("停止模拟随机订单");
+            });
+            EnableLacalSimOrder = new RelayCommand(() =>
+            {
+                Global.EnableLocalSimOrder = LocalSimOrder;
+                VisibilitySimOrder = LocalSimOrder == true ? Visibility.Visible : Visibility.Collapsed;
+            });
+            VisibilitySimOrder = LocalSimOrder == true? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public RelayCommand InitCommand { get; set; }
+
+        public RelayCommand SimOrderCommand { get; set; }
+
+        public RelayCommand SimOrderRandomCommand { get; set; }
+
+        public RelayCommand SimOrderRandomCloseCommand { get; set; }
+
+        public RelayCommand EnableLacalSimOrder { get; set; }
+        public int NoodleLoc { get { return _mNoodleLoc; } set { _mNoodleLoc = value; OnPropertyChanged(); } }
+        private int _mNoodleLoc = 1;
+
+
+        public int BowlLoc { get { return _mBowlLoc; } set { _mBowlLoc = value; OnPropertyChanged(); } }
+        private int _mBowlLoc = 10;
+
+        public bool IsNoodPositon { get { return _isNoodPositon; } set { _isNoodPositon = value; OnPropertyChanged(); } }
+        private bool _isNoodPositon = false;
+
+        public bool IsBowPositon { get { return _isBowPositon; } set { _isBowPositon = value; OnPropertyChanged(); } }
+        private bool _isBowPositon = false;
+
+        public bool LocalSimOrder { get { return _localSimOrder; } set { _localSimOrder = value; OnPropertyChanged(); } }
+        private bool _localSimOrder = Global.EnableLocalSimOrder;
+
+        public Visibility VisibilitySimOrder { get { return _visibilitySimOrder; } set { _visibilitySimOrder = value; OnPropertyChanged(); } }
+        private Visibility _visibilitySimOrder;
+    }
+}
diff --git a/BPASmartClient.MorkMV1/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkMV1/ViewModel/MonitorViewModel.cs
new file mode 100644
index 00000000..76e6d1ad
--- /dev/null
+++ b/BPASmartClient.MorkMV1/ViewModel/MonitorViewModel.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BPASmartClient.Business;
+using BPASmartClient.Device;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.MorkMV1.ViewModel
+{
+    public class MonitorViewModel : ObservableObject
+    {
+        public MonitorViewModel()
+        {
+
+        }
+
+        public static int DeviceId { get; set; }
+
+        public ObservableCollection<VariableMonitor> variableMonitors { get; set; } = Plugin.GetInstance()?.GetPlugin<DeviceMgr>()?.GetDevices()?.FirstOrDefault(p => p.DeviceId == DeviceId)?.variableMonitors;
+
+    }
+}
diff --git a/BPASmartClient.MorkMV1/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkMV1/ViewModel/ParSetViewModel.cs
new file mode 100644
index 00000000..5c1cd778
--- /dev/null
+++ b/BPASmartClient.MorkMV1/ViewModel/ParSetViewModel.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BPASmartClient.Helper;
+using BPASmartClient.Model;
+using BPASmartClient.MorkMV1.Model;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+
+namespace BPASmartClient.MorkMV1.ViewModel
+{
+    public class ParSetViewModel : ObservableObject
+    {
+        public ParSetViewModel()
+        {
+            SaveInfoCommand = new RelayCommand(SaveSettingData);
+
+            ActionManage.GetInstance.Register(SaveSettingData, "初始化设定煮面时间");
+            
+        }
+
+        public RelayCommand SaveInfoCommand { get; set; }
+
+        public ObservableCollection<ParSet> parSets { get; set; } = Json<MorksPar>.Data.parSets;
+
+        private void SaveSettingData()
+        {
+            List<ushort> values = new List<ushort>();
+            values.Clear();
+
+            List<bool> bools = new List<bool>();
+            bools.Clear();
+
+            for (int i = 0; i < Json<MorksPar>.Data.parSets.Count; i++)
+            {
+                values.Clear();
+                values.Add(Json<MorksPar>.Data.parSets[i].Minute);
+                values.Add(Json<MorksPar>.Data.parSets[i].Second);
+                bools.Add(Json<MorksPar>.Data.parSets[i].IsShield);
+                ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = $"VW{116 + (i * 6)}", Value = values.ToArray() });
+            }
+            ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M260.0", Value = bools.ToArray() });
+            Json<MorksPar>.Save();
+        }
+    }
+}
diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index 625a964d..a3a0b202 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -129,59 +129,59 @@ namespace BPASmartClient.MorkS
 
         private void OrderChange(string subid, ORDER_STATUS oRDER_STATUS)
         {
-            //var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
+            var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
             string goodName = string.Empty;
             string SortNum = string.Empty;
-            //if (res != null)
-            //{
-            //    goodName = res.MorkOrder.GoodsName;
-            //    SortNum = res.MorkOrder.SortNum.ToString();
-            //}
+            if (res != null)
+            {
+                goodName = res.MorkOrder.GoodsName;
+                SortNum = res.MorkOrder.SortNum.ToString();
+            }
 
-            if (mORKS.doe.ContainsKey(subid))
+            //if (mORKS.doe.ContainsKey(subid))
+            //{
+            //goodName = mORKS.doe[subid].MorkOrder.GoodsName;
+            //SortNum = mORKS.doe[subid].MorkOrder.SortNum.ToString();
+            if (!string.IsNullOrEmpty(goodName) && !string.IsNullOrEmpty(SortNum))
             {
-                goodName = mORKS.doe[subid].MorkOrder.GoodsName;
-                SortNum = mORKS.doe[subid].MorkOrder.SortNum.ToString();
-                if (!string.IsNullOrEmpty(goodName) && !string.IsNullOrEmpty(SortNum))
+                EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+                var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
+                if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
                 {
-                    EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
-                    var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
-                    if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
+                    if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
                     {
-                        if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
-                        {
-                            DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
-                            DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
-                            {
-                                Status = oRDER_STATUS,
-                                GoodName = goodName,
-                                SortNum = SortNum,
-                                StopTime = DateTime.Now.ToString("HH:mm:ss")
-                            });
-                        }
-                        else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
-                        {
-                            var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
-                            if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
-                        }
-                        else
-                        {
-                            DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
-                        }
-                    }
-                    else
-                    {
-                        DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
+                        DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
+                        DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
                         {
                             Status = oRDER_STATUS,
                             GoodName = goodName,
                             SortNum = SortNum,
-                            StartTime = DateTime.Now.ToString("HH:mm:ss")
+                            StopTime = DateTime.Now.ToString("HH:mm:ss")
                         });
                     }
-                    mORKS.doe.Remove(subid, out _);
+                    else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
+                    {
+                        var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
+                        if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
+                    }
+                    else
+                    {
+                        DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
+                    }
                 }
+                else
+                {
+                    DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
+                    {
+                        Status = oRDER_STATUS,
+                        GoodName = goodName,
+                        SortNum = SortNum,
+                        StartTime = DateTime.Now.ToString("HH:mm:ss")
+                    });
+                }
+                //mORKS.doe.Remove(subid, out _);
             }
+            //}
 
         }
 
@@ -330,8 +330,8 @@ namespace BPASmartClient.MorkS
                 if (@event == null) return;
                 if (@event is DoOrderEvent order)
                 {
-                    //mORKS.doOrderEvents.Add(order);
-                    mORKS.doe.TryAdd(order.MorkOrder.SuborderId, order);
+                    mORKS.doOrderEvents.Add(order);
+                    //mORKS.doe.TryAdd(order.MorkOrder.SuborderId, order);
                     DeviceProcessLogShow($"接收到{order.MorkOrder.SortNum}号订单");
                     if (order.MorkOrder.GoodBatchings == null) return;
                     if (mORKS.HistorySuborderId.Contains(order.MorkOrder.SuborderId)) return;
diff --git a/BPASmartClient.MorkS/OrderLocInfo.cs b/BPASmartClient.MorkS/OrderLocInfo.cs
index 942ee255..35243c8a 100644
--- a/BPASmartClient.MorkS/OrderLocInfo.cs
+++ b/BPASmartClient.MorkS/OrderLocInfo.cs
@@ -1,24 +1,24 @@
-using BPA.Message;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+//using BPA.Message;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
 
-namespace BPASmartClient.MorkS
-{
-    public class OrderLocInfo
-    {
-        public string SuborderId { get; set; }
-        public ushort Loc { get; set; }
-        public ushort RecipeNumber { get; set; }
-        public int BatchingId { get; set; }
-        public string GoodName { get; set; }
+//namespace BPASmartClient.MorkS
+//{
+//    public class OrderLocInfo
+//    {
+//        public string SuborderId { get; set; }
+//        public ushort Loc { get; set; }
+//        public ushort RecipeNumber { get; set; }
+//        public int BatchingId { get; set; }
+//        public string GoodName { get; set; }
 
-        public int RecipeId { get; set; }
-        public int SortNum { get; set; }
+//        public int RecipeId { get; set; }
+//        public int SortNum { get; set; }
 
-        public List<int> Recipes { get; set; }
+//        public List<int> Recipes { get; set; }
 
-    }
-}
+//    }
+//}
diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index 715f43dc..ee6177cb 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -128,61 +128,59 @@ namespace BPASmartClient.MorkSUpgradedVer
 
         private void OrderChange(string subid, ORDER_STATUS oRDER_STATUS)
         {
-
-
-            //var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
+            var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
             string goodName = string.Empty;
             string SortNum = string.Empty;
-            //if (res != null)
-            //{
-            //    goodName = res.MorkOrder.GoodsName;
-            //    SortNum = res.MorkOrder.SortNum.ToString();
-            //}
+            if (res != null)
+            {
+                goodName = res.MorkOrder.GoodsName;
+                SortNum = res.MorkOrder.SortNum.ToString();
+            }
 
-            if (mORKS.doe.ContainsKey(subid))
+            //if (mORKS.doe.ContainsKey(subid))
+            //{
+            //    goodName = mORKS.doe[subid].MorkOrder.GoodsName;
+            //    SortNum = mORKS.doe[subid].MorkOrder.SortNum.ToString();
+            if (!string.IsNullOrEmpty(goodName) && !string.IsNullOrEmpty(SortNum))
             {
-                goodName = mORKS.doe[subid].MorkOrder.GoodsName;
-                SortNum = mORKS.doe[subid].MorkOrder.SortNum.ToString();
-                if (!string.IsNullOrEmpty(goodName) && !string.IsNullOrEmpty(SortNum))
+                EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+                var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
+                if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
                 {
-                    EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
-                    var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
-                    if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
-                    {
-                        if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
-                        {
-                            DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
-                            DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
-                            {
-                                Status = oRDER_STATUS,
-                                GoodName = goodName,
-                                SortNum = SortNum,
-                                StopTime = DateTime.Now.ToString("HH:mm:ss")
-                            });
-                        }
-                        else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
-                        {
-                            var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
-                            if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
-                        }
-                        else
-                        {
-                            DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
-                        }
-                    }
-                    else
+                    if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
                     {
-                        DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
+                        DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
+                        DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
                         {
                             Status = oRDER_STATUS,
                             GoodName = goodName,
                             SortNum = SortNum,
-                            StartTime = DateTime.Now.ToString("HH:mm:ss")
+                            StopTime = DateTime.Now.ToString("HH:mm:ss")
                         });
                     }
-                    mORKS.doe.Remove(subid, out _);
+                    else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
+                    {
+                        var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
+                        if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
+                    }
+                    else
+                    {
+                        DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
+                    }
+                }
+                else
+                {
+                    DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
+                    {
+                        Status = oRDER_STATUS,
+                        GoodName = goodName,
+                        SortNum = SortNum,
+                        StartTime = DateTime.Now.ToString("HH:mm:ss")
+                    });
                 }
+                //mORKS.doe.Remove(subid, out _);
             }
+            //}
 
 
 
@@ -400,8 +398,8 @@ namespace BPASmartClient.MorkSUpgradedVer
                  if (@event == null) return;
                  if (@event is DoOrderEvent order)
                  {
-                     //mORKS.doOrderEvents.Add(order);
-                     mORKS.doe.TryAdd(order.MorkOrder.SuborderId, order);
+                     mORKS.doOrderEvents.Add(order);
+                     //mORKS.doe.TryAdd(order.MorkOrder.SuborderId, order);
                      if (order.MorkOrder.GoodBatchings == null) return;
                      if (mORKS.HistorySuborderId.Contains(order.MorkOrder.SuborderId)) return;
                      OrderCount++;
diff --git a/BPASmartClient.MorkSUpgradedVer/OrderLocInfo.cs b/BPASmartClient.MorkSUpgradedVer/OrderLocInfo.cs
index df679c4f..223ff5c7 100644
--- a/BPASmartClient.MorkSUpgradedVer/OrderLocInfo.cs
+++ b/BPASmartClient.MorkSUpgradedVer/OrderLocInfo.cs
@@ -1,24 +1,24 @@
-using BPA.Message;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+//using BPA.Message;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
 
-namespace BPASmartClient.MorkSUpgradedVer
-{
-    public class OrderLocInfo
-    {
-        public string SuborderId { get; set; }
-        public ushort Loc { get; set; }
-        public ushort RecipeNumber { get; set; }
-        public int BatchingId { get; set; }
-        public string GoodName { get; set; }
-        public int SortNum { get; set; }
+//namespace BPASmartClient.MorkSUpgradedVer
+//{
+//    public class OrderLocInfo
+//    {
+//        public string SuborderId { get; set; }
+//        public ushort Loc { get; set; }
+//        public ushort RecipeNumber { get; set; }
+//        public int BatchingId { get; set; }
+//        public string GoodName { get; set; }
+//        public int SortNum { get; set; }
 
-        public int RecipeId { get; set; }
+//        public int RecipeId { get; set; }
 
-        public List<int> Recipes { get; set; }
+//        public List<int> Recipes { get; set; }
 
-    }
-}
+//    }
+//}
diff --git a/BPASmartClient.Peripheral/BasePeripheral.cs b/BPASmartClient.Peripheral/BasePeripheral.cs
index 8ab90939..bbd721ad 100644
--- a/BPASmartClient.Peripheral/BasePeripheral.cs
+++ b/BPASmartClient.Peripheral/BasePeripheral.cs
@@ -66,7 +66,7 @@ namespace BPASmartClient.Peripheral
 
         public abstract void WriteData(string address, object value);
 
-        public abstract void AddVarInfo(string add, int len);
+        //public abstract void AddVarInfo(string add, int len);
 
         public ConcurrentDictionary<string, object> GetAllStatus()
         {
diff --git a/BPASmartClient.Peripheral/IPeripheral.cs b/BPASmartClient.Peripheral/IPeripheral.cs
index 914bc1c7..902f12da 100644
--- a/BPASmartClient.Peripheral/IPeripheral.cs
+++ b/BPASmartClient.Peripheral/IPeripheral.cs
@@ -59,7 +59,7 @@ namespace BPASmartClient.Peripheral
 
         void WriteData(string address, object value);
 
-        void AddVarInfo(string add, int len);
+        //void AddVarInfo(string add, int len);
 
         //void ReadData(string address);
 
diff --git a/BPASmartClient/BPASmartClient.csproj b/BPASmartClient/BPASmartClient.csproj
index 3231f725..b2efb89c 100644
--- a/BPASmartClient/BPASmartClient.csproj
+++ b/BPASmartClient/BPASmartClient.csproj
@@ -33,6 +33,7 @@
     <ProjectReference Include="..\BPASmartClient.MorkBF\BPASmartClient.MorkBF.csproj" />
     <ProjectReference Include="..\BPASmartClient.MorkD\BPASmartClient.MorkD.csproj" />
     <ProjectReference Include="..\BPASmartClient.MorkF\BPASmartClient.MorkF.csproj" />
+    <ProjectReference Include="..\BPASmartClient.MorkMV1\BPASmartClient.MorkMV1.csproj" />
     <ProjectReference Include="..\BPASmartClient.MorkMW\BPASmartClient.MorkMW.csproj" />
     <ProjectReference Include="..\BPASmartClient.MorkM\BPASmartClient.MorkM.csproj" />
     <ProjectReference Include="..\BPASmartClient.MorkSUpgradedVer\BPASmartClient.MorkSUpgradedVer.csproj" />
diff --git a/SmartClient.sln b/SmartClient.sln
index 5122830f..6ba455e0 100644
--- a/SmartClient.sln
+++ b/SmartClient.sln
@@ -212,7 +212,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.RobotGripper
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MilkTeaCube", "BPASmartClient.MilkTeaCube\BPASmartClient.MilkTeaCube.csproj", "{915F0718-B7AC-428D-ACD5-7DAACC28539F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.Update", "BPASmartClient.Update\BPASmartClient.Update.csproj", "{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.Update", "BPASmartClient.Update\BPASmartClient.Update.csproj", "{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.MorkMV1", "BPASmartClient.MorkMV1\BPASmartClient.MorkMV1.csproj", "{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -2008,6 +2010,26 @@ Global
 		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Release|x64.Build.0 = Release|Any CPU
 		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Release|x86.ActiveCfg = Release|Any CPU
 		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}.Release|x86.Build.0 = Release|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Debug|ARM.Build.0 = Debug|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Debug|x64.Build.0 = Debug|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Debug|x86.Build.0 = Debug|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Release|ARM.ActiveCfg = Release|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Release|ARM.Build.0 = Release|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Release|ARM64.Build.0 = Release|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Release|x64.ActiveCfg = Release|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Release|x64.Build.0 = Release|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Release|x86.ActiveCfg = Release|Any CPU
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2107,6 +2129,7 @@ Global
 		{5EBC34EB-4EE8-4C70-BAAA-C7F637D5E10F} = {666CB1A9-562E-453A-A2C7-FD9D77CFDFDD}
 		{915F0718-B7AC-428D-ACD5-7DAACC28539F} = {666CB1A9-562E-453A-A2C7-FD9D77CFDFDD}
 		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
+		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC}

From f84288cd7ad3af96bbce571cf3daca4e0cd9a28c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Tue, 9 May 2023 18:48:02 +0800
Subject: [PATCH 49/96] =?UTF-8?q?=E5=86=92=E8=8F=9C=E6=9C=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkMV1/Control_MorkMV1.cs     |  63 ------
 BPASmartClient.MorkMV1/Model/DishType.cs      |  14 ++
 BPASmartClient.MorkMV1/Model/MorksPar.cs      |   1 +
 BPASmartClient.MorkMV1/Model/ParSet.cs        |   9 +-
 BPASmartClient.MorkMV1/Resource/MyStyle.xaml  | 109 +++++++++++
 BPASmartClient.MorkMV1/View/ParSet.xaml       | 182 ++++++++++++++++++
 .../ViewModel/ParSetViewModel.cs              |  19 +-
 BPASmartClient.MorkMW/Control_MorkMW.cs       |  72 +++----
 8 files changed, 367 insertions(+), 102 deletions(-)
 create mode 100644 BPASmartClient.MorkMV1/Model/DishType.cs
 create mode 100644 BPASmartClient.MorkMV1/Resource/MyStyle.xaml

diff --git a/BPASmartClient.MorkMV1/Control_MorkMV1.cs b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
index d420d963..733dc452 100644
--- a/BPASmartClient.MorkMV1/Control_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
@@ -136,11 +136,6 @@ namespace BPASmartClient.MorkMV1
                 goodName = res.MorkOrder.GoodsName;
                 SortNum = res.MorkOrder.SortNum.ToString();
             }
-
-            //if (mORKS.doe.ContainsKey(subid))
-            //{
-            //    goodName = mORKS.doe[subid].MorkOrder.GoodsName;
-            //    SortNum = mORKS.doe[subid].MorkOrder.SortNum.ToString();
             if (!string.IsNullOrEmpty(goodName) && !string.IsNullOrEmpty(SortNum))
             {
                 EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
@@ -178,57 +173,7 @@ namespace BPASmartClient.MorkMV1
                         StartTime = DateTime.Now.ToString("HH:mm:ss")
                     });
                 }
-                //mORKS.doe.Remove(subid, out _);
             }
-            //}
-
-
-
-            //var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
-            //string goodName = string.Empty;
-            //string SortNum = string.Empty;
-            //if (res != null)
-            //{
-            //    goodName = res.MorkOrder.GoodsName;
-            //    SortNum = res.MorkOrder.SortNum.ToString();
-            //}
-
-            //EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
-
-            //var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
-            //if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
-            //{
-            //    if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
-            //    {
-            //        DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
-            //        DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
-            //        {
-            //            Status = oRDER_STATUS,
-            //            GoodName = goodName,
-            //            SortNum = SortNum,
-            //            StopTime = DateTime.Now.ToString("HH:mm:ss")
-            //        });
-            //    }
-            //    else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
-            //    {
-            //        var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
-            //        if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
-            //    }
-            //    else
-            //    {
-            //        DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
-            //    }
-            //}
-            //else
-            //{
-            //    DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
-            //    {
-            //        Status = oRDER_STATUS,
-            //        GoodName = goodName,
-            //        SortNum = SortNum,
-            //        StartTime = DateTime.Now.ToString("HH:mm:ss")
-            //    });
-            //}
         }
 
         private void GetStatus(string key, Action<object> action)
@@ -353,13 +298,6 @@ namespace BPASmartClient.MorkMV1
                                 mORKM.CookNoodleCom[i] = true;
                         }
                     }
-
-                    //mORKS.CookNoodleCom[0] = tt[0].GetBitValue(1);
-                    //mORKS.CookNoodleCom[1] = tt[0].GetBitValue(2);
-                    //mORKS.CookNoodleCom[2] = tt[0].GetBitValue(3);
-                    //mORKS.CookNoodleCom[3] = tt[0].GetBitValue(4);
-                    //mORKS.CookNoodleCom[4] = tt[0].GetBitValue(5);
-                    //mORKS.CookNoodleCom[5] = tt[0].GetBitValue(6);
                     mORKM.Heating = ushorts[0].GetBitValue(15);
                     mORKM.TemperatureReaches = ushorts[0].GetBitValue(16);
 
@@ -399,7 +337,6 @@ namespace BPASmartClient.MorkMV1
                  if (@event is DoOrderEvent order)
                  {
                      mORKM.doOrderEvents.Add(order);
-                     //mORKS.doe.TryAdd(order.MorkOrder.SuborderId, order);
                      if (order.MorkOrder.GoodBatchings == null) return;
                      if (mORKM.HistorySuborderId.Contains(order.MorkOrder.SuborderId)) return;
                      OrderCount++;
diff --git a/BPASmartClient.MorkMV1/Model/DishType.cs b/BPASmartClient.MorkMV1/Model/DishType.cs
new file mode 100644
index 00000000..cb37511a
--- /dev/null
+++ b/BPASmartClient.MorkMV1/Model/DishType.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkMV1.Model
+{
+    public enum DishType : int
+    {
+        荤菜 = 0,
+        素菜 = 1
+    }
+}
diff --git a/BPASmartClient.MorkMV1/Model/MorksPar.cs b/BPASmartClient.MorkMV1/Model/MorksPar.cs
index 241eddce..661857f4 100644
--- a/BPASmartClient.MorkMV1/Model/MorksPar.cs
+++ b/BPASmartClient.MorkMV1/Model/MorksPar.cs
@@ -12,5 +12,6 @@ namespace BPASmartClient.MorkMV1.Model
     internal class MorksPar
     {
         public ObservableCollection<ParSet> parSets { get; set; } = new ObservableCollection<ParSet>();
+        public ObservableCollection<ParSet> DishLibraryParSets { get; set; } = new ObservableCollection<ParSet>();
     }
 }
diff --git a/BPASmartClient.MorkMV1/Model/ParSet.cs b/BPASmartClient.MorkMV1/Model/ParSet.cs
index 03261db1..7c348a76 100644
--- a/BPASmartClient.MorkMV1/Model/ParSet.cs
+++ b/BPASmartClient.MorkMV1/Model/ParSet.cs
@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.Model
+namespace BPASmartClient.MorkMV1.Model
 {
-    public class ParSet 
+    public class ParSet
     {
         public ushort Minute { get { return _mMinute; } set { _mMinute = value; } }
         private ushort _mMinute;
@@ -18,6 +18,11 @@ namespace BPASmartClient.Model
         public bool IsShield { get { return _mIsShield; } set { _mIsShield = value; } }
         private bool _mIsShield;
 
+        /// <summary>
+        /// 库位菜品类型
+        /// </summary>
+        public int LocDishType { get { return _mLocDishType; } set { _mLocDishType = value; } }
+        private int _mLocDishType;
 
         public string TextBlockContext { get { return _mTextBlockContext; } set { _mTextBlockContext = value; } }
         private string _mTextBlockContext;
diff --git a/BPASmartClient.MorkMV1/Resource/MyStyle.xaml b/BPASmartClient.MorkMV1/Resource/MyStyle.xaml
new file mode 100644
index 00000000..e034d950
--- /dev/null
+++ b/BPASmartClient.MorkMV1/Resource/MyStyle.xaml
@@ -0,0 +1,109 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <SolidColorBrush x:Key="tabColor" Color="#FF2AB2E7" />
+    <!--<SolidColorBrush x:Key="bordColor" Color="#33ffffff" />-->
+    <SolidColorBrush x:Key="bordColor" Color="#552AB2E7" />
+
+
+    <Style x:Key="RowRadioButtonStyle" TargetType="{x:Type RadioButton}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RadioButton}">
+                    <Border
+                        x:Name="NvaBor"
+                        Background="Transparent"
+                        BorderBrush="#FF2AB2E7"
+                        BorderThickness="0">
+                        <ContentControl
+                            Margin="10,4"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            HorizontalContentAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Content="{TemplateBinding Content}"
+                            FontSize="16" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
+                            <Setter TargetName="NvaBor" Property="BorderThickness" Value="0" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsChecked" Value="false" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.Setters>
+                                <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
+                            </MultiTrigger.Setters>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="InputTextboxStyle" TargetType="TextBox">
+        <Setter Property="Margin" Value="5,0,0,0" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Width" Value="150" />
+        <Setter Property="Height" Value="40" />
+        <Setter Property="CaretBrush" Value="{StaticResource TitleBorderColor}" />
+        <Setter Property="Foreground" Value="{StaticResource TitleBorderColor}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+
+    <Style x:Key="ControlButtonStyle" TargetType="Button">
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="#FFF53F62" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+        <Setter Property="FontFamily" Value="楷体" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border
+                        Name="TitleBarBr"
+                        BorderBrush="#00c2f4"
+                        BorderThickness="0"
+                        CornerRadius="0"
+                        Opacity="0.8">
+
+                        <ContentPresenter
+                            Margin="{TemplateBinding Margin}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        <Border.Background>
+                            <ImageBrush
+                                ImageSource="/BPASmartClient.CustomResource;component/Image/组合边框1.1.png"
+                                Opacity="0.8"
+                                Stretch="Fill" />
+                        </Border.Background>
+
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="TitleBarBr" Property="Opacity" Value="1" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TitleTextblockStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Foreground" Value="{StaticResource tabColor}" />
+        <Setter Property="FontFamily" Value="楷体" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+    </Style>
+
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BPASmartClient.MorkMV1/View/ParSet.xaml b/BPASmartClient.MorkMV1/View/ParSet.xaml
index bd6450b6..f0abe279 100644
--- a/BPASmartClient.MorkMV1/View/ParSet.xaml
+++ b/BPASmartClient.MorkMV1/View/ParSet.xaml
@@ -19,6 +19,9 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+
+                <ResourceDictionary Source="/BPASmartClient.MorkMV1;component/Resource/MyStyle.xaml" />
+
                 <ResourceDictionary>
                     <Style x:Key="TextBlockStyle" TargetType="TextBlock">
                         <Setter Property="FontFamily" Value="楷体" />
@@ -76,6 +79,10 @@
 
         <!--  参数放置面板  -->
         <Grid Grid.Row="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
             <ItemsControl ItemsSource="{Binding parSets}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
@@ -122,6 +129,181 @@
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
 
+            <Grid Grid.Column="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="50" />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+
+                <Grid
+                    Grid.Row="0"
+                    Margin="0,10,0,0"
+                    Background="#ff0C255F">
+
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock
+                        Grid.Column="0"
+                        FontSize="24"
+                        Style="{StaticResource TitleTextblockStyle}"
+                        Text="库位序号" />
+
+                    <TextBlock
+                        Grid.Column="1"
+                        FontSize="24"
+                        Style="{StaticResource TitleTextblockStyle}"
+                        Text="商品类型" />
+
+                    <TextBlock
+                        Grid.Column="2"
+                        FontSize="24"
+                        Style="{StaticResource TitleTextblockStyle}"
+                        Text="煮时间(分)" />
+
+                    <TextBlock
+                        Grid.Column="3"
+                        FontSize="24"
+                        Style="{StaticResource TitleTextblockStyle}"
+                        Text="煮时间(秒)" />
+
+                    <Border
+                        Grid.Column="0"
+                        Grid.ColumnSpan="4"
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,1,1" />
+                    <Border
+                        Grid.Column="1"
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,0,1,0" />
+                    <Border
+                        Grid.Column="3"
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,0,1,0" />
+
+
+                </Grid>
+                <Grid Grid.Row="1">
+                    <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                        <ItemsControl Foreground="DeepSkyBlue" ItemsSource="{Binding DishLibraryParSets}">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <Grid Name="gr">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition />
+                                            <ColumnDefinition />
+                                            <ColumnDefinition />
+                                            <ColumnDefinition />
+                                        </Grid.ColumnDefinitions>
+
+                                        <TextBlock
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="18"
+                                            Text="{Binding TextBlockContext}" />
+
+                                        <ComboBox
+                                            Grid.Column="1"
+                                            Height="auto"
+                                            Background="Transparent"
+                                            BorderThickness="0"
+                                            FontSize="18"
+                                            Foreground="DeepSkyBlue"
+                                            IsEditable="False"
+                                            ItemsSource="{Binding DataContext.DishTypeName, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                            SelectedIndex="{Binding LocDishType}" />
+
+                                        <TextBox
+                                            Grid.Column="2"
+                                            FontSize="18"
+                                            Style="{StaticResource InputTextboxStyle}"
+                                            Text="{Binding Minute}" />
+
+                                        <TextBox
+                                            Grid.Column="3"
+                                            FontSize="18"
+                                            Style="{StaticResource InputTextboxStyle}"
+                                            Text="{Binding Second}" />
+
+
+                                        <Border
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="4"
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1,0,1,1" />
+                                        <Border
+                                            Grid.Column="1"
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1,0,1,0" />
+                                        <Border
+                                            Grid.Column="3"
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1,0,1,0" />
+                                    </Grid>
+
+                                    <DataTemplate.Triggers>
+                                        <Trigger Property="IsMouseOver" Value="true">
+                                            <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                        </Trigger>
+                                    </DataTemplate.Triggers>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                    </ScrollViewer>
+                </Grid>
+            </Grid>
+
+            <!--<ItemsControl Grid.Column="1" ItemsSource="{Binding DishLibraryParSets}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="{Binding TextBlockContext}" />
+                            <TextBox
+                                Width="100"
+                                Margin="10,0,0,0"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                BorderBrush="#FF23CACA"
+                                CaretBrush="Aqua"
+                                FontFamily="楷体"
+                                FontSize="21"
+                                Foreground="#ff34f7f7"
+                                Text="{Binding Minute}" />
+                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="（分）" />
+                            <TextBox
+                                Width="100"
+                                Margin="0,10"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                BorderBrush="#FF23CACA"
+                                CaretBrush="Aqua"
+                                FontFamily="楷体"
+                                FontSize="21"
+                                Foreground="#ff34f7f7"
+                                Text="{Binding Second}" />
+                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="（秒）" />
+
+                            <CheckBox
+                                Height="20"
+                                Margin="10"
+                                VerticalAlignment="Center"
+                                Background="#FF2AB2E7"
+                                Content="{Binding CheckBoxContext}"
+                                FontSize="14"
+                                Foreground="#00c2f4"
+                                IsChecked="{Binding IsShield}"
+                                Template="{StaticResource CbTemplate}" />
+
+                        </StackPanel>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>-->
+
         </Grid>
 
     </Grid>
diff --git a/BPASmartClient.MorkMV1/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkMV1/ViewModel/ParSetViewModel.cs
index 5c1cd778..7c67fb49 100644
--- a/BPASmartClient.MorkMV1/ViewModel/ParSetViewModel.cs
+++ b/BPASmartClient.MorkMV1/ViewModel/ParSetViewModel.cs
@@ -19,12 +19,29 @@ namespace BPASmartClient.MorkMV1.ViewModel
             SaveInfoCommand = new RelayCommand(SaveSettingData);
 
             ActionManage.GetInstance.Register(SaveSettingData, "初始化设定煮面时间");
-            
+            typeof(DishType).GetEnumNames()?.ToList()?.ForEach(item => { DishTypeName.Add(item); });
+
+            if (Json<MorksPar>.Data.DishLibraryParSets.Count < 5)
+            {
+                Json<MorksPar>.Data.DishLibraryParSets.Clear();
+                for (int i = 0; i < 5; i++)
+                {
+                    Json<MorksPar>.Data.DishLibraryParSets.Add(new ParSet()
+                    {
+                        LocDishType = 0,
+                        Minute = 2,
+                        Second = 0,
+                        TextBlockContext = $"{i + 1}"
+                    });
+                }
+            }
         }
 
         public RelayCommand SaveInfoCommand { get; set; }
 
         public ObservableCollection<ParSet> parSets { get; set; } = Json<MorksPar>.Data.parSets;
+        public ObservableCollection<ParSet> DishLibraryParSets { get; set; } = Json<MorksPar>.Data.DishLibraryParSets;
+        public ObservableCollection<string> DishTypeName { get; set; } = new ObservableCollection<string>();
 
         private void SaveSettingData()
         {
diff --git a/BPASmartClient.MorkMW/Control_MorkMW.cs b/BPASmartClient.MorkMW/Control_MorkMW.cs
index 8b50acda..5bf7d98b 100644
--- a/BPASmartClient.MorkMW/Control_MorkMW.cs
+++ b/BPASmartClient.MorkMW/Control_MorkMW.cs
@@ -37,18 +37,18 @@ namespace BPASmartClient.MorkMW
             ConnectKlpRobot("192.168.0.100", 8001);
             ServerInit();
             DataParse();
-            ThreadManage.GetInstance().StartLong(new Action(() => { VariableMonitor();Thread.Sleep(5); }),"�����˱���״̬����߳�",true);
+            ThreadManage.GetInstance().StartLong(new Action(() => { VariableMonitor(); Thread.Sleep(5); }), "�����˱���״̬����߳�", true);
         }
 
         private void VaribleMonitorDis()
         {
-           PropertyInfo[] pros= morkMW.GetType().GetProperties();
+            PropertyInfo[] pros = morkMW.GetType().GetProperties();
             foreach (var item in pros)
             {
-              var res=  item.GetCustomAttribute<VariblesAttribute>();
-                if(res!=null)
+                var res = item.GetCustomAttribute<VariblesAttribute>();
+                if (res != null)
                 {
-                    GVL_MorkMW.varibleInfos.Add(new VaribleModel { Id = id + 1, VaribleName = res.VarName,RobotAddress=res.RobotAddress,ModbusAddress=res.ModbusTcpAddress,Notes=res.Notes });
+                    GVL_MorkMW.varibleInfos.Add(new VaribleModel { Id = id + 1, VaribleName = res.VarName, RobotAddress = res.RobotAddress, ModbusAddress = res.ModbusTcpAddress, Notes = res.Notes });
                     id++;
                 }
             }
@@ -62,8 +62,8 @@ namespace BPASmartClient.MorkMW
                 if (@event == null) return;
                 if (@event is MorkMWGoodsEvent recipe)
                 {
-                   listMorkMWGoods= recipe.morkMWPushMessage?.MorkMWGoods;
-                   DeviceProcessLogShow($"���յ����ƻ���{listMorkMWGoods?.Count}������Ʒ�䷽����");
+                    listMorkMWGoods = recipe.morkMWPushMessage?.MorkMWGoods;
+                    DeviceProcessLogShow($"���յ����ƻ���{listMorkMWGoods?.Count}������Ʒ�䷽����");
                 }
             });
         }
@@ -86,14 +86,14 @@ namespace BPASmartClient.MorkMW
         {
             if (!GVL_MorkMW.AllowLocalSimOrder)
             {
-                if (morkMW.RobotIdle && orderLocInfos.Count > 0 && !morkMW.TaskLock && !morkMW.PourWinkComplete && morkMW.CupSignal&&modbus.Connected)
+                if (morkMW.RobotIdle && orderLocInfos.Count > 0 && !morkMW.TaskLock && !morkMW.PourWinkComplete && morkMW.CupSignal && modbus.Connected)
                 {
                     DeviceProcessLogShow("������ʼ����");
                     morkMW.TaskLock = true;
-                    if (orderLocInfos.TryDequeue(out OrderLocInfo res))
+                    if (orderLocInfos.TryDequeue(out BPASmartClient.MorkMW.Model.OrderLocInfo res))
                     {
                         morkMW.CurrentSuborderId = res.SuborderId;
-                        OrderChange(res.SuborderId,ORDER_STATUS.COOKING);
+                        OrderChange(res.SuborderId, ORDER_STATUS.COOKING);
                         foreach (var item in res.mixWink)
                         {
                             switch (item.Loc)
@@ -122,7 +122,7 @@ namespace BPASmartClient.MorkMW
                         }
 
                         morkMW.AllowMixWink = true;//�Ӿ���ɣ���������
-                       // morkMW.AllowPourWink = true;//������ɣ���������
+                                                   // morkMW.AllowPourWink = true;//������ɣ���������
                     }
                 }
             }
@@ -163,7 +163,7 @@ namespace BPASmartClient.MorkMW
                         }
                         DeviceProcessLogShow($"����λ�ýӾ����");
                         morkMW.AllowMixWink = true;//�Ӿ���ɣ���������
-                       // morkMW.AllowPourWink = true;//������ɣ���������
+                                                   // morkMW.AllowPourWink = true;//������ɣ���������
                     }
                 }
 
@@ -193,11 +193,11 @@ namespace BPASmartClient.MorkMW
             //���ͽӾ��ź�
             switch (loc)
             {
-                case 1: modbus.WriteSingleRegister(0000, 1);DeviceProcessLogShow($"��ʼ�ӡ�{loc}����λ��ԭ��"); break;
-                case 2: modbus.WriteSingleRegister(0000, 2);DeviceProcessLogShow($"��ʼ�ӡ�{loc}����λ��ԭ��"); break;
-                case 3: modbus.WriteSingleRegister(0000, 3);DeviceProcessLogShow($"��ʼ�ӡ�{loc}����λ��ԭ��"); break;
-                case 4: modbus.WriteSingleRegister(0000, 4);DeviceProcessLogShow($"��ʼ�ӡ�{loc}����λ��ԭ��"); break;
-                case 5: modbus.WriteSingleRegister(0000, 5);DeviceProcessLogShow($"��ʼ�ӡ�{loc}����λ��ԭ��"); break;
+                case 1: modbus.WriteSingleRegister(0000, 1); DeviceProcessLogShow($"��ʼ�ӡ�{loc}����λ��ԭ��"); break;
+                case 2: modbus.WriteSingleRegister(0000, 2); DeviceProcessLogShow($"��ʼ�ӡ�{loc}����λ��ԭ��"); break;
+                case 3: modbus.WriteSingleRegister(0000, 3); DeviceProcessLogShow($"��ʼ�ӡ�{loc}����λ��ԭ��"); break;
+                case 4: modbus.WriteSingleRegister(0000, 4); DeviceProcessLogShow($"��ʼ�ӡ�{loc}����λ��ԭ��"); break;
+                case 5: modbus.WriteSingleRegister(0000, 5); DeviceProcessLogShow($"��ʼ�ӡ�{loc}����λ��ԭ��"); break;
                 case 6: modbus.WriteSingleRegister(0000, 6); DeviceProcessLogShow($"��ʼ�ӡ�{loc}����λ��ԭ��"); break;
 
             }
@@ -216,11 +216,11 @@ namespace BPASmartClient.MorkMW
             //���ͽӾ�����ź�
             switch (loc)
             {
-                case 1: modbus.WriteSingleCoil(4596, true);DeviceProcessLogShow($"��{loc}����λ�ýӾ����"); break;
-                case 2: modbus.WriteSingleCoil(4597, true);DeviceProcessLogShow($"��{loc}����λ�ýӾ����"); break;
-                case 3: modbus.WriteSingleCoil(4598, true);DeviceProcessLogShow($"��{loc}����λ�ýӾ����"); break;
-                case 4: modbus.WriteSingleCoil(4599, true);DeviceProcessLogShow($"��{loc}����λ�ýӾ����"); break;
-                case 5: modbus.WriteSingleCoil(4600, true);DeviceProcessLogShow($"��{loc}����λ�ýӾ����"); break;
+                case 1: modbus.WriteSingleCoil(4596, true); DeviceProcessLogShow($"��{loc}����λ�ýӾ����"); break;
+                case 2: modbus.WriteSingleCoil(4597, true); DeviceProcessLogShow($"��{loc}����λ�ýӾ����"); break;
+                case 3: modbus.WriteSingleCoil(4598, true); DeviceProcessLogShow($"��{loc}����λ�ýӾ����"); break;
+                case 4: modbus.WriteSingleCoil(4599, true); DeviceProcessLogShow($"��{loc}����λ�ýӾ����"); break;
+                case 5: modbus.WriteSingleCoil(4600, true); DeviceProcessLogShow($"��{loc}����λ�ýӾ����"); break;
                 case 6: modbus.WriteSingleCoil(4601, true); DeviceProcessLogShow($"��{loc}����λ�ýӾ����"); break;
 
             }
@@ -307,7 +307,7 @@ namespace BPASmartClient.MorkMW
                 morkMW.MixWinkComplte = modbus.ReadCoils(4612);
                 morkMW.ProcessComplete = modbus.ReadCoils(4613);
 
-              
+
             }
             else
             {
@@ -355,7 +355,7 @@ namespace BPASmartClient.MorkMW
                 {
                     if (order.mixWink.Count > 0)
                     {
-                        
+
                         string guid = Guid.NewGuid().ToString();
                         simOrderLocInfos.Enqueue(new SimOrderLocInfo { mixWink = order.mixWink, SuborderId = guid });
                         DeviceProcessLogShow("�յ�ģ�ⶩ��");
@@ -402,11 +402,11 @@ namespace BPASmartClient.MorkMW
                     if (listMorkMWGoods.Count == 0) return;
                     if (morkMW.historySuborderId.FirstOrDefault(p => p == order.MorkOrder.SuborderId) != null) return;
                     OrderCount++;
-                    var res= listMorkMWGoods?.FirstOrDefault(p => p.GoodsKey == order.MorkOrder.GoodsKey);
+                    var res = listMorkMWGoods?.FirstOrDefault(p => p.GoodsKey == order.MorkOrder.GoodsKey);
                     if (res != null)
                     {
                         string guid = Guid.NewGuid().ToString();
-                        orderLocInfos.Enqueue(new OrderLocInfo { mixWink = res.MorkMWBoms, SuborderId = order.MorkOrder.SuborderId });
+                        orderLocInfos.Enqueue(new BPASmartClient.MorkMW.Model.OrderLocInfo { mixWink = res.MorkMWBoms, SuborderId = order.MorkOrder.SuborderId });
                         morkMW.historySuborderId.Add(order.MorkOrder.SuborderId);
                         OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT);
                         DeviceProcessLogShow($"�յ���{OrderCount}����С���򶩵�����ǰ������{order.MorkOrder.GoodsName}��,�����š�{order.MorkOrder.SuborderId}��");
@@ -445,12 +445,12 @@ namespace BPASmartClient.MorkMW
                 //throw;
             }
         }
-            /// <summary>
-            /// ���ӿ����ջ�����
-            /// </summary>
-            /// <param name="ip"></param>
-            /// <param name="port"></param>
-            public void ConnectKlpRobot(string ip, int port)
+        /// <summary>
+        /// ���ӿ����ջ�����
+        /// </summary>
+        /// <param name="ip"></param>
+        /// <param name="port"></param>
+        public void ConnectKlpRobot(string ip, int port)
         {
             modbus = new ModbusTcp();
             modbus.Show += new Action<string>((s) =>
@@ -464,11 +464,11 @@ namespace BPASmartClient.MorkMW
             modbus.ModbusTcpConnect(ip, port);
 
         }
-      
+
         /// <summary>
         /// ����С���򶩵�����
         /// </summary>
-        public ConcurrentQueue<OrderLocInfo> orderLocInfos = new ConcurrentQueue<OrderLocInfo>();
+        public ConcurrentQueue<BPASmartClient.MorkMW.Model.OrderLocInfo> orderLocInfos = new ConcurrentQueue<BPASmartClient.MorkMW.Model.OrderLocInfo>();
 
         /// <summary>
         /// ����ģ�ⶩ������
@@ -479,8 +479,8 @@ namespace BPASmartClient.MorkMW
         /// ���ƻ��䷽����
         /// </summary>
         public List<MORKMWGoods> listMorkMWGoods = new List<MORKMWGoods>();
-       
-        
+
+
 
     }
 }

From 7e0f3dd0b74cddeed82235cc4cfb1a8e6c562c44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Wed, 10 May 2023 15:02:22 +0800
Subject: [PATCH 50/96] =?UTF-8?q?=E5=86=92=E8=8F=9C=E6=9C=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VariableMonitorAttribute.cs               |  37 ++-
 BPASmartClient.MorkMV1/Control_MorkMV1.cs     | 264 ++++++++++++++----
 BPASmartClient.MorkMV1/GVL_MorkMV1.cs         |  19 +-
 BPASmartClient.MorkMV1/Model/MOrderLocInfo.cs |  20 ++
 BPASmartClient.MorkMV1/Model/SuborderInfo.cs  |  44 +++
 5 files changed, 330 insertions(+), 54 deletions(-)
 create mode 100644 BPASmartClient.MorkMV1/Model/MOrderLocInfo.cs
 create mode 100644 BPASmartClient.MorkMV1/Model/SuborderInfo.cs

diff --git a/BPASmartClient.Device/VariableMonitorAttribute.cs b/BPASmartClient.Device/VariableMonitorAttribute.cs
index 5fd99243..8d4ba870 100644
--- a/BPASmartClient.Device/VariableMonitorAttribute.cs
+++ b/BPASmartClient.Device/VariableMonitorAttribute.cs
@@ -1,4 +1,5 @@
-using System;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -17,10 +18,42 @@ namespace BPASmartClient.Device
         public VariableMonitorAttribute(string Notes, string PLCAddress = "", string ModbusTcpAddress = "")
         {
             this.PLCAddress = PLCAddress;
-            this.ModbusTcpAddress = ModbusTcpAddress;
+            this.ModbusTcpAddress = GetModbusTcpAdd(PLCAddress);// ModbusTcpAddress;
             this.Notes = Notes;
         }
 
+        private string GetModbusTcpAdd(string address)
+        {
+            if (address == null) return "";
+            if (address.Length > 0)
+            {
+                address = address.Trim();
+                if (address.ToUpper().Contains("M") && address.Length >= 4)
+                {
+                    var res = address.Substring(1).Split('.');
+                    if (res != null && res.Length == 2)
+                    {
+                        if (int.TryParse(res[0], out int firstAddress) && int.TryParse(res[1], out int ExitAddress))
+                        {
+                            if (ExitAddress >= 0 && ExitAddress <= 7)
+                            {
+                                return ((firstAddress * 8) + 320 + ExitAddress).ToString();
+                            }
+                        }
+                    }
+                }
+                else if ((address.ToUpper().Contains("VW") || address.ToUpper().Contains("VD")) && address.Length >= 3)
+                {
+                    var res = address.Substring(2);
+                    if (res != null && int.TryParse(res, out int tempAddress))
+                    {
+                        return ((tempAddress / 2) + 100).ToString();
+                    }
+                }
+            }
+            return "";
+        }
+
         /// <summary>
         /// PLC 地址
         /// </summary>
diff --git a/BPASmartClient.MorkMV1/Control_MorkMV1.cs b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
index 733dc452..ddbf8687 100644
--- a/BPASmartClient.MorkMV1/Control_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
@@ -23,6 +23,7 @@ using BPA.Models;
 using System.Windows.Forms;
 using System.Media;
 using BPASmartClient.CustomResource;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
 //using BPA.Helper;
 
 namespace BPASmartClient.MorkMV1
@@ -69,10 +70,10 @@ namespace BPASmartClient.MorkMV1
 
                         string guid = new Guid().ToString();
 
-                        mORKM.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { Loc = (ushort)NoodleLoc, SuborderId = guid });
+                        mORKM.RBTakeNoodleTask.Enqueue(new MOrderLocInfo() { Loc = (ushort)NoodleLoc, SuborderId = guid });
                         MessageLog.GetInstance.Show($"添加订单：面条位置【{NoodleLoc}】");
 
-                        mORKM.TakeBowlTask.Enqueue(new OrderLocInfo() { Loc = (ushort)BowlLoc, SuborderId = guid });
+                        mORKM.TakeBowlTask.Enqueue(new MOrderLocInfo() { Loc = (ushort)BowlLoc, SuborderId = guid });
                         MessageLog.GetInstance.Show($"添加订单：碗位置【{BowlLoc}】");
                         Thread.Sleep(60000);
                     }), "ForOrder");
@@ -255,11 +256,12 @@ namespace BPASmartClient.MorkMV1
                 }
             }));
 
-            GetStatus("M16.7", new Action<object>((obj) =>
+            GetStatus("M16.6", new Action<object>((obj) =>
             {
-                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 2)
                 {
-                    mORKM.RobotTakeNoodleCom = bools[0];
+                    mORKM.RobotInvertedSurfaceCom = bools[0];
+                    mORKM.RobotTakeNoodleCom = bools[1];
                 }
             }));
 
@@ -348,6 +350,7 @@ namespace BPASmartClient.MorkMV1
                      OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT);
                      DeviceProcessLogShow($"接收到{OrderCount}次订单，订单ID：{order.MorkOrder.SuborderId}");
                      mORKM.HistorySuborderId.Add(order.MorkOrder.SuborderId);
+                     List<MOrderLocInfo> oli = new List<MOrderLocInfo>();
                      foreach (var item in order.MorkOrder.GoodBatchings)
                      {
                          var res = orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId);
@@ -357,38 +360,104 @@ namespace BPASmartClient.MorkMV1
                              {
                                  if (loc >= 1 && loc <= 5)
                                  {
-                                     if (mORKM.RBTakeNoodleTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
-                                         mORKM.RBTakeNoodleTask.Enqueue(new OrderLocInfo()
-                                         {
-                                             GoodName = order.MorkOrder.GoodsName,
-                                             Loc = ushort.Parse(res.BatchingLoc),
-                                             SuborderId = order.MorkOrder.SuborderId,
-                                             SortNum = order.MorkOrder.SortNum,
-                                             BatchingId = res.BatchingId
-                                         });
-                                 }
-                                 else if (loc >= 10 && loc <= 11)
-                                 {
-                                     int index = 0;
-                                     if (recipeBoms != null)
+                                     var x = Json<MorksPar>.Data.DishLibraryParSets.FirstOrDefault(p => p.TextBlockContext == loc.ToString());
+                                     if (x != null)
                                      {
-                                         index = Array.FindIndex(recipeBoms.RecipeIds?.ToArray(), p => p.RecipeId == order.MorkOrder.RecipeId);
-                                         index++;
-                                     }
-                                     if (mORKM.TakeBowlTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
-                                         mORKM.TakeBowlTask.Enqueue(new OrderLocInfo()
+                                         oli.Add(new MOrderLocInfo()
                                          {
-                                             BatchingId = res.BatchingId,
                                              GoodName = order.MorkOrder.GoodsName,
                                              Loc = ushort.Parse(res.BatchingLoc),
                                              SuborderId = order.MorkOrder.SuborderId,
                                              SortNum = order.MorkOrder.SortNum,
-                                             RecipeNumber = (index >= 1 && index <= 10) ? (ushort)index : (ushort)0
+                                             BatchingId = res.BatchingId,
+                                             Minute = x.Minute,
+                                             Second = x.Second,
+                                             LocDishType = x.LocDishType
                                          });
+                                     }
+                                     //if (mORKM.RBTakeNoodleTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                                     //    mORKM.RBTakeNoodleTask.Enqueue(new OrderLocInfo()
+                                     //    {
+                                     //        GoodName = order.MorkOrder.GoodsName,
+                                     //        Loc = ushort.Parse(res.BatchingLoc),
+                                     //        SuborderId = order.MorkOrder.SuborderId,
+                                     //        SortNum = order.MorkOrder.SortNum,
+                                     //        BatchingId = res.BatchingId
+                                     //    });
                                  }
+                                 //else if (loc >= 10 && loc <= 11)
+                                 //{
+                                 //    int index = 0;
+                                 //    if (recipeBoms != null)
+                                 //    {
+                                 //        index = Array.FindIndex(recipeBoms.RecipeIds?.ToArray(), p => p.RecipeId == order.MorkOrder.RecipeId);
+                                 //        index++;
+                                 //    }
+                                 //    if (mORKM.TakeBowlTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                                 //        mORKM.TakeBowlTask.Enqueue(new OrderLocInfo()
+                                 //        {
+                                 //            BatchingId = res.BatchingId,
+                                 //            GoodName = order.MorkOrder.GoodsName,
+                                 //            Loc = ushort.Parse(res.BatchingLoc),
+                                 //            SuborderId = order.MorkOrder.SuborderId,
+                                 //            SortNum = order.MorkOrder.SortNum,
+                                 //            RecipeNumber = (index >= 1 && index <= 10) ? (ushort)index : (ushort)0
+                                 //        });
+                                 //}
                              }
                          }
                      }
+
+                     for (int i = 0; i <= 1; i++)
+                     {
+                         oli.Where(p => p.LocDishType == i).ToList()?.ForEach(y =>
+                         {
+                             mORKM.RBTakeNoodleTask.Enqueue(new MOrderLocInfo()
+                             {
+                                 GoodName = y.GoodName,
+                                 Loc = y.Loc,
+                                 SuborderId = y.SuborderId,
+                                 SortNum = y.SortNum,
+                                 BatchingId = y.BatchingId,
+                                 LocDishType = y.LocDishType,
+                                 Minute = y.Minute,
+                                 RecipeId = y.RecipeId,
+                                 RecipeNumber = y.RecipeNumber,
+                                 Recipes = y.Recipes,
+                                 Second = y.Second
+                             });
+                         });
+                     }
+
+                     if (mORKM.TakeBowlTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                         mORKM.TakeBowlTask.Enqueue(new OrderLocInfo()
+                         {
+                             GoodName = order.MorkOrder.GoodsName,
+                             Loc = 11,
+                             SuborderId = order.MorkOrder.SuborderId,
+                             SortNum = order.MorkOrder.SortNum,
+                         });
+
+                     if (!mORKM.SuborderCount.ContainsKey(order.MorkOrder.SuborderId))
+                     {
+                         mORKM.SuborderCount.TryAdd(order.MorkOrder.SuborderId, new SuborderInfo()
+                         {
+                             ActualCount = oli.Count,
+                             AcMeatDishesCount = oli.Where(p => p.LocDishType == 0).ToList().Count,
+                             AcVegetableCount = oli.Where(p => p.LocDishType == 1).ToList().Count,
+                         });
+                     }
+
+                     //if (mORKM.RBTakeNoodleTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+                     //    mORKM.RBTakeNoodleTask.Enqueue(new OrderLocInfo()
+                     //    {
+                     //        GoodName = order.MorkOrder.GoodsName,
+                     //        Loc = ushort.Parse(res.BatchingLoc),
+                     //        SuborderId = order.MorkOrder.SuborderId,
+                     //        SortNum = order.MorkOrder.SortNum,
+                     //        BatchingId = res.BatchingId
+                     //    });
+
                  }
              });
         }
@@ -575,18 +644,15 @@ namespace BPASmartClient.MorkMV1
             {
                 if (mORKM.CurrentLoc == mORKM.CurrentFeedbackLoc)
                 {
-                    //int loc = Array.FindIndex(mORKS.NoodleCookerStatus, p => p == false);//查找煮面炉空闲位置
                     int loc = mORKM.nsm.ToList().FindIndex(p => p.NoodleCookerStatus == false && p.IsShield == false);//查找煮面炉空闲位置
                     if (loc >= 0 && loc <= 5)
                     {
-                        //if (!Json<MorksPar>.Data.parSets.ElementAt(loc).IsShield)//检查该煮面篮是否被屏蔽
-                        //{
-                        if (mORKM.RBTakeNoodleTask.TryDequeue(out OrderLocInfo orderLocInfo))
+                        if (mORKM.RBTakeNoodleTask.TryDequeue(out MOrderLocInfo orderLocInfo))
                         {
                             //写入煮面时间
                             List<ushort> values = new List<ushort>();
-                            values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
-                            values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
+                            values.Add(orderLocInfo.Minute);
+                            values.Add(orderLocInfo.Second);
                             WriteData($"VW{324 + (loc * 4)}", values.ToArray());
 
                             mORKM.CurrentLoc = 0;
@@ -597,6 +663,14 @@ namespace BPASmartClient.MorkMV1
                             OrderChange(orderLocInfo.SuborderId, ORDER_STATUS.COOKING);
                             DeviceProcessLogShow($"订单【{orderLocInfo.SuborderId}】,机器人倒面至【{loc + 1}】号煮面栏");
 
+                            if (mORKM.SuborderCount.ContainsKey(orderLocInfo.SuborderId))
+                            {
+                                if (orderLocInfo.LocDishType == 0)
+                                    mORKM.SuborderCount[orderLocInfo.SuborderId].MeatDishesLoc.Add(loc + 1);
+                                else if (orderLocInfo.LocDishType == 1)
+                                    mORKM.SuborderCount[orderLocInfo.SuborderId].VegetableLoc.Add(loc + 1);
+                            }
+
                             mORKM.TakeNoodleInterlock = true;
                         }
                     }
@@ -609,28 +683,89 @@ namespace BPASmartClient.MorkMV1
         /// </summary>
         private void OutNoodleTask()
         {
-            if (mORKM.AllowInvertedFace && mORKM.RobotTaskInterlock && !mORKM.TakeNoodleInterlock && mORKM.RobotStatus)
+            if (mORKM.AllowInvertedFace && !mORKM.RobotOutDinnigLock && mORKM.RobotTaskInterlock && !mORKM.TakeNoodleInterlock && mORKM.RobotStatus)
             {
-                int loc = Array.FindIndex(mORKM.CookNodelId, p => p == mORKM.IngredientsCompleteId && p.Length > 0);
-                if (loc >= 0 && loc <= 5)
+                for (int i = 0; i < mORKM.CookNodelId.Length; i++)
                 {
-                    if (mORKM.CookNoodleCom[loc])
+                    if (mORKM.CookNodelId[i] == mORKM.IngredientsCompleteId && !string.IsNullOrEmpty(mORKM.CookNodelId[i]))
                     {
-                        SetTakeNoodleLoc((ushort)(loc + 1));
-                        mORKM.NoodleCookerStatus[loc] = false;
-                        WriteData($"VW260", (ushort)0);//设置出汤时间
-                        OrderChange(mORKM.IngredientsCompleteId, ORDER_STATUS.COMPLETED_COOK);
-                        DeviceProcessLogShow($"订单【{mORKM.IngredientsCompleteId}】制作完成");
-                        mORKM.CookCompleteFlatBit = true;
-                        mORKM.OutMealId = mORKM.IngredientsCompleteId;
-                        mORKM.OutMealName = mORKM.IngredientsCompleteName;
-                        mORKM.OutMealSortNum = mORKM.IngredientsCompleteSortNum;
-                        mORKM.IngredientsCompleteId = string.Empty;
-                        mORKM.CookNodelId[loc] = string.Empty;
-                        DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{mORKM.OutMealId}");
-                        mORKM.CookNoodleCom[loc] = false;
+                        if (mORKM.CookNoodleCom[i] && mORKM.SuborderCount.ContainsKey(mORKM.CookNodelId[i]))
+                        {
+                            var x = mORKM.SuborderCount[mORKM.CookNodelId[i]];
+
+                            //执行取素菜操作
+                            if (x.AcVegetableCount != x.CuVegetableCount)
+                            {
+                                int index = x.VegetableLoc.FindIndex(p => p == i + 1);
+                                if (index >= 0)
+                                {
+                                    //SetTakeNoodleLoc((ushort)(index + 1));
+                                    SetTakeNoodleLoc((ushort)(x.VegetableLoc.ElementAt(index)));
+                                    mORKM.NoodleCookerStatus[i] = false;
+                                    WriteData($"VW260", (ushort)0);//设置出汤时间
+                                    DeviceProcessLogShow($"{x.VegetableLoc.ElementAt(index)} 号位置-[素菜]-出餐控制,订单ID：{mORKM.CookNodelId[i]}");
+                                    mORKM.CookNodelId[i] = string.Empty;
+                                    mORKM.CookNoodleCom[i] = false;
+                                    x.VegetableLoc.RemoveAt(index);
+                                    x.CuVegetableCount++;
+                                    mORKM.RobotOutDinnigLock = true;
+                                }
+                            }
+
+                            //执行取荤菜
+                            if (x.AcVegetableCount == x.CuVegetableCount && x.AcMeatDishesCount != x.CuMeatDishesCount)
+                            {
+                                int index = x.MeatDishesLoc.FindIndex(p => p == i + 1);
+                                if (index >= 0)
+                                {
+                                    //SetTakeNoodleLoc((ushort)(index + 1));
+                                    SetTakeNoodleLoc((ushort)(x.VegetableLoc.ElementAt(index)));
+                                    mORKM.NoodleCookerStatus[i] = false;
+                                    WriteData($"VW260", (ushort)0);//设置出汤时间
+                                    DeviceProcessLogShow($"{x.VegetableLoc.ElementAt(index)} 号位置-[荤菜]-出餐控制,订单ID：{mORKM.CookNodelId[i]}");
+                                    mORKM.CookNodelId[i] = string.Empty;
+                                    mORKM.CookNoodleCom[i] = false;
+                                    x.MeatDishesLoc.RemoveAt(index);
+                                    x.CuMeatDishesCount++;
+                                    mORKM.RobotOutDinnigLock = true;
+                                }
+                            }
+
+                            //if (x.CuMeatDishesCount + x.CuVegetableCount == x.ActualCount)
+                            //{
+                            //    OrderChange(mORKM.IngredientsCompleteId, ORDER_STATUS.COMPLETED_COOK);
+                            //    DeviceProcessLogShow($"订单【{mORKM.IngredientsCompleteId}】制作完成");
+                            //    mORKM.CookCompleteFlatBit = true;
+                            //    mORKM.OutMealId = mORKM.IngredientsCompleteId;
+                            //    mORKM.OutMealName = mORKM.IngredientsCompleteName;
+                            //    mORKM.OutMealSortNum = mORKM.IngredientsCompleteSortNum;
+                            //    mORKM.IngredientsCompleteId = string.Empty;
+                            //}
+                        }
                     }
                 }
+
+
+                //int loc = Array.FindIndex(mORKM.CookNodelId, p => p == mORKM.IngredientsCompleteId && p.Length > 0);
+                //if (loc >= 0 && loc <= 5)
+                //{
+                //    if (mORKM.CookNoodleCom[loc])
+                //    {
+                //        SetTakeNoodleLoc((ushort)(loc + 1));
+                //        mORKM.NoodleCookerStatus[loc] = false;
+                //        WriteData($"VW260", (ushort)0);//设置出汤时间
+                //        OrderChange(mORKM.IngredientsCompleteId, ORDER_STATUS.COMPLETED_COOK);
+                //        DeviceProcessLogShow($"订单【{mORKM.IngredientsCompleteId}】制作完成");
+                //        mORKM.CookCompleteFlatBit = true;
+                //        mORKM.OutMealId = mORKM.IngredientsCompleteId;
+                //        mORKM.OutMealName = mORKM.IngredientsCompleteName;
+                //        mORKM.OutMealSortNum = mORKM.IngredientsCompleteSortNum;
+                //        mORKM.IngredientsCompleteId = string.Empty;
+                //        mORKM.CookNodelId[loc] = string.Empty;
+                //        DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{mORKM.OutMealId}");
+                //        mORKM.CookNoodleCom[loc] = false;
+                //    }
+                //}
             }
         }
 
@@ -677,6 +812,27 @@ namespace BPASmartClient.MorkMV1
                 DeviceProcessLogShow("机器人取面完成信号检测");
             }
 
+            if (RTrig.GetInstance("RobotInvertedSurfaceCom").Start(mORKM.RobotInvertedSurfaceCom))
+            {
+                if (mORKM.SuborderCount.ContainsKey(mORKM.IngredientsCompleteId))
+                {
+                    var x = mORKM.SuborderCount[mORKM.IngredientsCompleteId];
+                    if (x.CuMeatDishesCount + x.CuVegetableCount == x.ActualCount)
+                    {
+                        OrderChange(mORKM.IngredientsCompleteId, ORDER_STATUS.COMPLETED_COOK);
+                        DeviceProcessLogShow($"订单【{mORKM.IngredientsCompleteId}】制作完成");
+                        mORKM.CookCompleteFlatBit = true;
+                        mORKM.OutMealId = mORKM.IngredientsCompleteId;
+                        mORKM.OutMealName = mORKM.IngredientsCompleteName;
+                        mORKM.OutMealSortNum = mORKM.IngredientsCompleteSortNum;
+                        mORKM.IngredientsCompleteId = string.Empty;
+                        CookComplete();
+                        DeviceProcessLogShow($"倒面完成");
+                    }
+                }
+                mORKM.RobotOutDinnigLock = false;
+            }
+
             int OutMealRequstCount = mORKM.CookNoodleCom.Where(p => p == true).ToList().Count;
             //int mlCount = mORKS.NoodleCookerStatus.Where(p => p == true).ToList().Count - Json<MorksPar>.Data.parSets.Where(x => x.IsShield == true).ToList().Count;
             int mlCount = mORKM.nsm.Where(p => p.NoodleCookerStatus == true && p.IsShield == false).ToList().Count;
@@ -770,6 +926,14 @@ namespace BPASmartClient.MorkMV1
                 WriteData($"M15.{loc - 1}", true);
         }
 
+        /// <summary>
+        /// 上位机单订单执行完成
+        /// </summary>
+        private void CookComplete()
+        {
+            WriteData("M11.0", true);
+        }
+
 
 
         public override void SimOrder()
@@ -781,7 +945,7 @@ namespace BPASmartClient.MorkMV1
                     string guid = Guid.NewGuid().ToString();
                     if (msm.NoodleLoc >= 1 && msm.NoodleLoc <= 5)
                     {
-                        mORKM.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { Loc = (ushort)msm.NoodleLoc, SuborderId = guid });
+                        mORKM.RBTakeNoodleTask.Enqueue(new MOrderLocInfo() { Loc = (ushort)msm.NoodleLoc, SuborderId = guid });
                         MessageLog.GetInstance.Show($"添加订单：面条位置【{(ushort)msm.NoodleLoc}】");
                     }
 
diff --git a/BPASmartClient.MorkMV1/GVL_MorkMV1.cs b/BPASmartClient.MorkMV1/GVL_MorkMV1.cs
index faca957a..1d1d96d3 100644
--- a/BPASmartClient.MorkMV1/GVL_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/GVL_MorkMV1.cs
@@ -30,6 +30,12 @@ namespace BPASmartClient.MorkMV1
         [VariableMonitor("机器人任务互锁信号")]
         public bool RobotTaskInterlock { get; set; }
 
+        /// <summary>
+        /// 机器人倒冒菜互锁
+        /// </summary>
+        [VariableMonitor("机器人倒冒菜互锁")]
+        public bool RobotOutDinnigLock { get; set; }
+
         /// <summary>
         /// 取碗互锁信号
         /// </summary>
@@ -96,7 +102,7 @@ namespace BPASmartClient.MorkMV1
         /// <summary>
         /// 机器人取面位置队列
         /// </summary>
-        public ConcurrentQueue<OrderLocInfo> RBTakeNoodleTask { get; set; } = new ConcurrentQueue<OrderLocInfo>();
+        public ConcurrentQueue<MOrderLocInfo> RBTakeNoodleTask { get; set; } = new ConcurrentQueue<MOrderLocInfo>();
 
         /// <summary>
         /// 出碗队列
@@ -106,7 +112,10 @@ namespace BPASmartClient.MorkMV1
 
         public List<DoOrderEvent> doOrderEvents { get; set; } = new List<DoOrderEvent>();
 
-        public ConcurrentDictionary<string, DoOrderEvent> doe { get; set; } = new ConcurrentDictionary<string, DoOrderEvent>();
+        /// <summary>
+        /// 子订单对应的物料数量
+        /// </summary>
+        public ConcurrentDictionary<string, SuborderInfo> SuborderCount { get; set; } = new ConcurrentDictionary<string, SuborderInfo>();
 
         public List<string> HistorySuborderId { get; set; } = new List<string>();
 
@@ -271,6 +280,12 @@ namespace BPASmartClient.MorkMV1
         [VariableMonitor("料仓到位", "M13.5", "429")]
         public bool SiloInPlace { get; set; }
 
+        /// <summary>
+        /// 机器人将面倒入碗中完成
+        /// </summary>
+        [VariableMonitor("机器人取面倒入碗中完成", "M16.6")]
+        public bool RobotInvertedSurfaceCom { get; set; }
+
         /// <summary>
         /// 机器人料仓取面完成
         /// </summary>
diff --git a/BPASmartClient.MorkMV1/Model/MOrderLocInfo.cs b/BPASmartClient.MorkMV1/Model/MOrderLocInfo.cs
new file mode 100644
index 00000000..7c2af170
--- /dev/null
+++ b/BPASmartClient.MorkMV1/Model/MOrderLocInfo.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkMV1.Model
+{
+    public class MOrderLocInfo : OrderLocInfo
+    {
+        public ushort Minute { get; set; }
+
+        public ushort Second { get; set; }
+
+        /// <summary>
+        /// 库位菜品类型,0，荤菜，1素菜
+        /// </summary>
+        public int LocDishType { get; set; }
+    }
+}
diff --git a/BPASmartClient.MorkMV1/Model/SuborderInfo.cs b/BPASmartClient.MorkMV1/Model/SuborderInfo.cs
new file mode 100644
index 00000000..a651fc5b
--- /dev/null
+++ b/BPASmartClient.MorkMV1/Model/SuborderInfo.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkMV1.Model
+{
+    public class SuborderInfo
+    {
+        /// <summary>
+        /// 实际荤素物料总数
+        /// </summary>
+        public int ActualCount { get; set; }
+
+        /// <summary>
+        /// 当前荤菜总数
+        /// </summary>
+        public int CuMeatDishesCount { get; set; }
+        /// <summary>
+        /// 实际荤菜出餐数量
+        /// </summary>
+        public int AcMeatDishesCount { get; set; }
+
+        /// <summary>
+        /// 荤菜位置集合信息
+        /// </summary>
+        public List<int> MeatDishesLoc { get; set; } = new List<int>();
+
+        /// <summary>
+        /// 当前素菜总数
+        /// </summary>
+        public int CuVegetableCount { get; set; }
+        /// <summary>
+        /// 实际素菜出餐数量
+        /// </summary>
+        public int AcVegetableCount { get; set; }
+        /// <summary>
+        /// 素菜位置集合信息
+        /// </summary>
+        public List<int> VegetableLoc { get; set; } = new List<int>();
+
+    }
+}

From 28f43621ae2f1cebeb0db8f755a971d2e282ce68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Wed, 10 May 2023 16:57:07 +0800
Subject: [PATCH 51/96] =?UTF-8?q?=E5=86=92=E8=8F=9C=E6=9C=BA=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkMV1/Control_MorkMV1.cs | 95 ++++-------------------
 1 file changed, 13 insertions(+), 82 deletions(-)

diff --git a/BPASmartClient.MorkMV1/Control_MorkMV1.cs b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
index ddbf8687..7ba64b20 100644
--- a/BPASmartClient.MorkMV1/Control_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
@@ -375,35 +375,7 @@ namespace BPASmartClient.MorkMV1
                                              LocDishType = x.LocDishType
                                          });
                                      }
-                                     //if (mORKM.RBTakeNoodleTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
-                                     //    mORKM.RBTakeNoodleTask.Enqueue(new OrderLocInfo()
-                                     //    {
-                                     //        GoodName = order.MorkOrder.GoodsName,
-                                     //        Loc = ushort.Parse(res.BatchingLoc),
-                                     //        SuborderId = order.MorkOrder.SuborderId,
-                                     //        SortNum = order.MorkOrder.SortNum,
-                                     //        BatchingId = res.BatchingId
-                                     //    });
                                  }
-                                 //else if (loc >= 10 && loc <= 11)
-                                 //{
-                                 //    int index = 0;
-                                 //    if (recipeBoms != null)
-                                 //    {
-                                 //        index = Array.FindIndex(recipeBoms.RecipeIds?.ToArray(), p => p.RecipeId == order.MorkOrder.RecipeId);
-                                 //        index++;
-                                 //    }
-                                 //    if (mORKM.TakeBowlTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
-                                 //        mORKM.TakeBowlTask.Enqueue(new OrderLocInfo()
-                                 //        {
-                                 //            BatchingId = res.BatchingId,
-                                 //            GoodName = order.MorkOrder.GoodsName,
-                                 //            Loc = ushort.Parse(res.BatchingLoc),
-                                 //            SuborderId = order.MorkOrder.SuborderId,
-                                 //            SortNum = order.MorkOrder.SortNum,
-                                 //            RecipeNumber = (index >= 1 && index <= 10) ? (ushort)index : (ushort)0
-                                 //        });
-                                 //}
                              }
                          }
                      }
@@ -448,16 +420,6 @@ namespace BPASmartClient.MorkMV1
                          });
                      }
 
-                     //if (mORKM.RBTakeNoodleTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
-                     //    mORKM.RBTakeNoodleTask.Enqueue(new OrderLocInfo()
-                     //    {
-                     //        GoodName = order.MorkOrder.GoodsName,
-                     //        Loc = ushort.Parse(res.BatchingLoc),
-                     //        SuborderId = order.MorkOrder.SuborderId,
-                     //        SortNum = order.MorkOrder.SortNum,
-                     //        BatchingId = res.BatchingId
-                     //    });
-
                  }
              });
         }
@@ -699,7 +661,6 @@ namespace BPASmartClient.MorkMV1
                                 int index = x.VegetableLoc.FindIndex(p => p == i + 1);
                                 if (index >= 0)
                                 {
-                                    //SetTakeNoodleLoc((ushort)(index + 1));
                                     SetTakeNoodleLoc((ushort)(x.VegetableLoc.ElementAt(index)));
                                     mORKM.NoodleCookerStatus[i] = false;
                                     WriteData($"VW260", (ushort)0);//设置出汤时间
@@ -718,11 +679,10 @@ namespace BPASmartClient.MorkMV1
                                 int index = x.MeatDishesLoc.FindIndex(p => p == i + 1);
                                 if (index >= 0)
                                 {
-                                    //SetTakeNoodleLoc((ushort)(index + 1));
-                                    SetTakeNoodleLoc((ushort)(x.VegetableLoc.ElementAt(index)));
+                                    SetTakeNoodleLoc((ushort)(x.MeatDishesLoc.ElementAt(index)));
                                     mORKM.NoodleCookerStatus[i] = false;
                                     WriteData($"VW260", (ushort)0);//设置出汤时间
-                                    DeviceProcessLogShow($"{x.VegetableLoc.ElementAt(index)} 号位置-[荤菜]-出餐控制,订单ID：{mORKM.CookNodelId[i]}");
+                                    DeviceProcessLogShow($"{x.MeatDishesLoc.ElementAt(index)} 号位置-[荤菜]-出餐控制,订单ID：{mORKM.CookNodelId[i]}");
                                     mORKM.CookNodelId[i] = string.Empty;
                                     mORKM.CookNoodleCom[i] = false;
                                     x.MeatDishesLoc.RemoveAt(index);
@@ -730,42 +690,9 @@ namespace BPASmartClient.MorkMV1
                                     mORKM.RobotOutDinnigLock = true;
                                 }
                             }
-
-                            //if (x.CuMeatDishesCount + x.CuVegetableCount == x.ActualCount)
-                            //{
-                            //    OrderChange(mORKM.IngredientsCompleteId, ORDER_STATUS.COMPLETED_COOK);
-                            //    DeviceProcessLogShow($"订单【{mORKM.IngredientsCompleteId}】制作完成");
-                            //    mORKM.CookCompleteFlatBit = true;
-                            //    mORKM.OutMealId = mORKM.IngredientsCompleteId;
-                            //    mORKM.OutMealName = mORKM.IngredientsCompleteName;
-                            //    mORKM.OutMealSortNum = mORKM.IngredientsCompleteSortNum;
-                            //    mORKM.IngredientsCompleteId = string.Empty;
-                            //}
                         }
                     }
                 }
-
-
-                //int loc = Array.FindIndex(mORKM.CookNodelId, p => p == mORKM.IngredientsCompleteId && p.Length > 0);
-                //if (loc >= 0 && loc <= 5)
-                //{
-                //    if (mORKM.CookNoodleCom[loc])
-                //    {
-                //        SetTakeNoodleLoc((ushort)(loc + 1));
-                //        mORKM.NoodleCookerStatus[loc] = false;
-                //        WriteData($"VW260", (ushort)0);//设置出汤时间
-                //        OrderChange(mORKM.IngredientsCompleteId, ORDER_STATUS.COMPLETED_COOK);
-                //        DeviceProcessLogShow($"订单【{mORKM.IngredientsCompleteId}】制作完成");
-                //        mORKM.CookCompleteFlatBit = true;
-                //        mORKM.OutMealId = mORKM.IngredientsCompleteId;
-                //        mORKM.OutMealName = mORKM.IngredientsCompleteName;
-                //        mORKM.OutMealSortNum = mORKM.IngredientsCompleteSortNum;
-                //        mORKM.IngredientsCompleteId = string.Empty;
-                //        mORKM.CookNodelId[loc] = string.Empty;
-                //        DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{mORKM.OutMealId}");
-                //        mORKM.CookNoodleCom[loc] = false;
-                //    }
-                //}
             }
         }
 
@@ -795,8 +722,6 @@ namespace BPASmartClient.MorkMV1
                 WriteData("M10.1", false);
                 DeviceProcessLogShow($"出餐订单序号【{mORKM.OutMealSortNum}】");
                 VoiceAPI.Speak(mORKM.OutMealSortNum.ToString());
-                //DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");
-                //Plugin.GetInstance().GetPlugin<MQTTMgr>().Publish($"MORKS/VoiceCall/{DeviceId}", mORKS.OutMealSortNum.ToString());
                 mORKM.CookCompleteFlatBit = false;
                 mORKM.OutMealId = string.Empty;
                 mORKM.OutMealName = string.Empty;
@@ -821,6 +746,7 @@ namespace BPASmartClient.MorkMV1
                     {
                         OrderChange(mORKM.IngredientsCompleteId, ORDER_STATUS.COMPLETED_COOK);
                         DeviceProcessLogShow($"订单【{mORKM.IngredientsCompleteId}】制作完成");
+                        mORKM.SuborderCount.Remove(mORKM.IngredientsCompleteId, out _);
                         mORKM.CookCompleteFlatBit = true;
                         mORKM.OutMealId = mORKM.IngredientsCompleteId;
                         mORKM.OutMealName = mORKM.IngredientsCompleteName;
@@ -828,20 +754,25 @@ namespace BPASmartClient.MorkMV1
                         mORKM.IngredientsCompleteId = string.Empty;
                         CookComplete();
                         DeviceProcessLogShow($"倒面完成");
+
                     }
                 }
                 mORKM.RobotOutDinnigLock = false;
             }
 
             int OutMealRequstCount = mORKM.CookNoodleCom.Where(p => p == true).ToList().Count;
-            //int mlCount = mORKS.NoodleCookerStatus.Where(p => p == true).ToList().Count - Json<MorksPar>.Data.parSets.Where(x => x.IsShield == true).ToList().Count;
             int mlCount = mORKM.nsm.Where(p => p.NoodleCookerStatus == true && p.IsShield == false).ToList().Count;
-            int index = Array.FindIndex(mORKM.CookNodelId, p => p == mORKM.IngredientsCompleteId);
-
-            bool isok = index >= 0 && index < mORKM.CookNoodleCom.Length && mORKM.CookNoodleCom[index];
 
+            bool isok = false;
+            for (int i = 0; i < mORKM.CookNodelId.Length; i++)
+            {
+                if (mORKM.CookNodelId[i] == mORKM.IngredientsCompleteId && mORKM.CookNoodleCom[i])
+                {
+                    isok = true;
+                    break;
+                }
+            }
             mORKM.PriorityJudgment = Delay.GetInstance("取餐优先级判断").Start(mORKM.TurntableLocLists.Count > 0 && !mORKM.TurntableLowPosition, 4);
-            //mORKS.RobotTaskInterlock = OutMealRequstCount > 0 && mORKS.AllowInvertedFace && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
             mORKM.RobotTaskInterlock = isok && mORKM.AllowInvertedFace && (mlCount >= 2 || mORKM.RBTakeNoodleTask.Count == 0 || mORKM.PriorityJudgment);
 
 

From 41c3682a9b2bc63aca2200b8b6666506682aa6c8 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Thu, 11 May 2023 10:05:37 +0800
Subject: [PATCH 52/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/ProcessControl.cs                     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
index b39de61f..5bd8c9fd 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
@@ -848,7 +848,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                 {
                     if (data.RecipesSource == RecipeSource.远程)
                     {
-                        if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1)
+                        if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1 && data.TrayCode == 1)
                         {
                             if (!(SiemensRecipeQueue1.Contains(data.RecipeCode)))
                             {
@@ -885,7 +885,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 }
                             }
                         }
-                        else if (SiemensRecipeQueue2.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe2)
+                        else if (SiemensRecipeQueue2.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe2 && data.TrayCode == 2)
                         {
                             if (!(SiemensRecipeQueue2.Contains(data.RecipeCode)))
                             {
@@ -920,7 +920,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 }
                             }
                         }
-                        else if (SiemensRecipeQueue3.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe3)
+                        else if (SiemensRecipeQueue3.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe3 && data.TrayCode == 3)
                         {
                             if (!(SiemensRecipeQueue3.Contains(data.RecipeCode)))
                             {
@@ -955,7 +955,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 }
                             }
                         }
-                        else if (SiemensRecipeQueue4.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe4)
+                        else if (SiemensRecipeQueue4.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe4 && data.TrayCode == 4)
                         {
                             if (!(SiemensRecipeQueue4.Contains(data.RecipeCode)))
                             {
@@ -993,26 +993,25 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     else 
                     {
-                        if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1)
+                        if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1 && data.TrayCode == 1)
                         {
                             SiemensRecipeQueue1.Enqueue(data.RecipeCode);
                             MessageNotify.GetInstance.ShowRunLog($"本地配方，配方：{data.RecipeCode}，加入队列1");
                         }
-                        else if (SiemensRecipeQueue2.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe2)
+                        else if (SiemensRecipeQueue2.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe2 && data.TrayCode == 2)
                         {
                             SiemensRecipeQueue2.Enqueue(data.RecipeCode);
                             MessageNotify.GetInstance.ShowRunLog($"本地配方，配方：{data.RecipeCode}，加入队列2");
                         }
-                        else if(SiemensRecipeQueue3.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe3)
+                        else if(SiemensRecipeQueue3.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe3 && data.TrayCode == 3)
                         {
                             SiemensRecipeQueue3.Enqueue(data.RecipeCode);
                             MessageNotify.GetInstance.ShowRunLog($"本地配方，配方：{data.RecipeCode}，加入队列3");
                         }
-                        else if (SiemensRecipeQueue4.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe4)
+                        else if (SiemensRecipeQueue4.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe4 && data.TrayCode == 4)
                         {
                             SiemensRecipeQueue4.Enqueue(data.RecipeCode);
                             MessageNotify.GetInstance.ShowRunLog($"本地配方，配方：{data.RecipeCode}，加入队列4");
-
                         }
                     }
                 }

From a1f9a33563be6db30d27401ac6cfde551c041b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Thu, 11 May 2023 16:28:44 +0800
Subject: [PATCH 53/96] =?UTF-8?q?=E7=85=AE=E9=9D=A2=E6=9C=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkMV1/Control_MorkMV1.cs | 5 ++++-
 BPASmartClient.MorkMV1/GVL_MorkMV1.cs     | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/BPASmartClient.MorkMV1/Control_MorkMV1.cs b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
index 7ba64b20..5b5fc14e 100644
--- a/BPASmartClient.MorkMV1/Control_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
@@ -34,6 +34,7 @@ namespace BPASmartClient.MorkMV1
         GVL_MorkMV1 mORKM = new GVL_MorkMV1();
         Alarm alarm = new Alarm();
 
+
         public override void DoMain()
         {
             MonitorViewModel.DeviceId = DeviceId;
@@ -734,9 +735,10 @@ namespace BPASmartClient.MorkMV1
                 mORKM.TakeNoodleInterlock = false;
                 mORKM.AllowTakeNoodle = false;
                 mORKM.TurntableInterlock = false;
+                mORKM.IsTakeNoodleOver = true;
                 DeviceProcessLogShow("机器人取面完成信号检测");
             }
-
+            //机器人倒面完成信号检测
             if (RTrig.GetInstance("RobotInvertedSurfaceCom").Start(mORKM.RobotInvertedSurfaceCom))
             {
                 if (mORKM.SuborderCount.ContainsKey(mORKM.IngredientsCompleteId))
@@ -753,6 +755,7 @@ namespace BPASmartClient.MorkMV1
                         mORKM.OutMealSortNum = mORKM.IngredientsCompleteSortNum;
                         mORKM.IngredientsCompleteId = string.Empty;
                         CookComplete();
+                        mORKM.IsTakeNoodleOver = false;
                         DeviceProcessLogShow($"倒面完成");
 
                     }
diff --git a/BPASmartClient.MorkMV1/GVL_MorkMV1.cs b/BPASmartClient.MorkMV1/GVL_MorkMV1.cs
index 1d1d96d3..0e43ae01 100644
--- a/BPASmartClient.MorkMV1/GVL_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/GVL_MorkMV1.cs
@@ -96,6 +96,11 @@ namespace BPASmartClient.MorkMV1
         /// </summary>
         [VariableMonitor("取面任务数量")]
         public int RBTakeNoodleTaskCount { get; set; }
+        /// <summary>
+        /// 取面是否完成，为false时为倒面完成
+        /// </summary>
+        [VariableMonitor("取面是否完成")]
+        public bool IsTakeNoodleOver { get; set; }
         #endregion
 
         #region 列表数据

From d38054383f46f72611efe3c1bfee1270b2dd39bd Mon Sep 17 00:00:00 2001
From: Nah <15196688790@163.com>
Date: Thu, 11 May 2023 18:21:07 +0800
Subject: [PATCH 54/96] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E9=A4=90?=
 =?UTF-8?q?=E5=92=8C=E5=8F=96=E8=8F=9C=E9=80=BB=E8=BE=91=E4=BA=92=E9=94=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkMV1/Control_MorkMV1.cs | 11 +++++------
 BPASmartClient.MorkMV1/GVL_MorkMV1.cs     |  5 -----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/BPASmartClient.MorkMV1/Control_MorkMV1.cs b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
index 5b5fc14e..3c08f9a7 100644
--- a/BPASmartClient.MorkMV1/Control_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
@@ -603,7 +603,7 @@ namespace BPASmartClient.MorkMV1
         private void TakeNoodleTask()
         {
             //取面控制
-            if (mORKM.AllowRun && mORKM.RobotStatus && !mORKM.Feeding && !mORKM.RobotTaskInterlock && mORKM.AllowTakeNoodle && mORKM.SiloInPlace && !mORKM.TakeNoodleInterlock && mORKM.RBTakeNoodleTask.Count > 0)
+            if (mORKM.AllowRun && mORKM.RobotStatus &&  !mORKM.RobotOutDinnigLock&&!mORKM.Feeding  && !mORKM.RobotTaskInterlock && mORKM.AllowTakeNoodle && mORKM.SiloInPlace && !mORKM.TakeNoodleInterlock && mORKM.RBTakeNoodleTask.Count > 0)
             {
                 if (mORKM.CurrentLoc == mORKM.CurrentFeedbackLoc)
                 {
@@ -646,7 +646,7 @@ namespace BPASmartClient.MorkMV1
         /// </summary>
         private void OutNoodleTask()
         {
-            if (mORKM.AllowInvertedFace && !mORKM.RobotOutDinnigLock && mORKM.RobotTaskInterlock && !mORKM.TakeNoodleInterlock && mORKM.RobotStatus)
+            if (mORKM.AllowInvertedFace && !mORKM.RobotOutDinnigLock  && mORKM.RobotTaskInterlock && !mORKM.TakeNoodleInterlock && mORKM.RobotStatus)
             {
                 for (int i = 0; i < mORKM.CookNodelId.Length; i++)
                 {
@@ -675,7 +675,7 @@ namespace BPASmartClient.MorkMV1
                             }
 
                             //执行取荤菜
-                            if (x.AcVegetableCount == x.CuVegetableCount && x.AcMeatDishesCount != x.CuMeatDishesCount)
+                            if (!mORKM.RobotOutDinnigLock && x.AcVegetableCount == x.CuVegetableCount && x.AcMeatDishesCount != x.CuMeatDishesCount)
                             {
                                 int index = x.MeatDishesLoc.FindIndex(p => p == i + 1);
                                 if (index >= 0)
@@ -735,7 +735,7 @@ namespace BPASmartClient.MorkMV1
                 mORKM.TakeNoodleInterlock = false;
                 mORKM.AllowTakeNoodle = false;
                 mORKM.TurntableInterlock = false;
-                mORKM.IsTakeNoodleOver = true;
+                //mORKM.NeedOutNoodle = true;
                 DeviceProcessLogShow("机器人取面完成信号检测");
             }
             //机器人倒面完成信号检测
@@ -755,12 +755,11 @@ namespace BPASmartClient.MorkMV1
                         mORKM.OutMealSortNum = mORKM.IngredientsCompleteSortNum;
                         mORKM.IngredientsCompleteId = string.Empty;
                         CookComplete();
-                        mORKM.IsTakeNoodleOver = false;
                         DeviceProcessLogShow($"倒面完成");
-
                     }
                 }
                 mORKM.RobotOutDinnigLock = false;
+                //mORKM.NeedOutNoodle = false;
             }
 
             int OutMealRequstCount = mORKM.CookNoodleCom.Where(p => p == true).ToList().Count;
diff --git a/BPASmartClient.MorkMV1/GVL_MorkMV1.cs b/BPASmartClient.MorkMV1/GVL_MorkMV1.cs
index 0e43ae01..1d1d96d3 100644
--- a/BPASmartClient.MorkMV1/GVL_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/GVL_MorkMV1.cs
@@ -96,11 +96,6 @@ namespace BPASmartClient.MorkMV1
         /// </summary>
         [VariableMonitor("取面任务数量")]
         public int RBTakeNoodleTaskCount { get; set; }
-        /// <summary>
-        /// 取面是否完成，为false时为倒面完成
-        /// </summary>
-        [VariableMonitor("取面是否完成")]
-        public bool IsTakeNoodleOver { get; set; }
         #endregion
 
         #region 列表数据

From 430a7ed234d541bc3534e3e79ff86d806c3018f8 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Fri, 12 May 2023 14:23:33 +0800
Subject: [PATCH 55/96] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
index 5bd8c9fd..fc3a26b2 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
@@ -839,6 +839,9 @@ namespace BPASmartClient.JXJFoodBigStation.Model
             }
         }
         #endregion
+        /// <summary>
+        /// 将西门子配方，添加到队列中
+        /// </summary>
         private void ReceviceData()
         {
             SiemensRecipes = Json<RemoteRecipe>.Data.Recipes;
@@ -1029,6 +1032,9 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                 GVL_BigStation.Recipe4DosingStatus = 0;
             }
         }
+        /// <summary>
+        /// 订单取消
+        /// </summary>
         public void Order_Cancel()
         {
             if (GVL_BigStation.Order_Cancel) //订单取消
@@ -1261,6 +1267,9 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                 }
             }
         }
+        /// <summary>
+        /// 配方队列，在配料过程中的逻辑处理
+        /// </summary>
         private void RecipeInfoToHKPLC()
         {
             if (SiemensRecipeQueue1.Count > 0)

From 30b9464355207de365afbf5da35ede3fc7b0fbcc Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Fri, 12 May 2023 15:14:44 +0800
Subject: [PATCH 56/96] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/ProcessControl.cs                   | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index 0d6f4442..2912495d 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -545,33 +545,38 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     case 5:
                                         if (SiemensDevice.XL_Status.Dosing_Confirm == false)
                                         {
-                                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
+                                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 6;
                                             MessageNotify.GetInstance.ShowRunLog($"配方{data.RecipeCode}，西门子确认配料信号复位完成");
                                         }
                                         break;
+                                    case 6:
+                                        for (int i = 0; i < 5; i++)
+                                        {
+                                            if (GVL_SmallStation.GetInstance.NotUseSmallStation)
+                                            {
+                                                if (RecipeQueueTray[i].Count == 0 && !RecipeQueueTray[0].Contains(data.RecipeCode) && !RecipeQueueTray[1].Contains(data.RecipeCode) && !RecipeQueueTray[2].Contains(data.RecipeCode) && !RecipeQueueTray[3].Contains(data.RecipeCode) && !RecipeQueueTray[4].Contains(data.RecipeCode))
+                                                {
+                                                    RecipeQueueTray[i].Enqueue(data.RecipeCode);
+                                                    GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
+                                                    MessageNotify.GetInstance.ShowRunLog($"西门子配方配料 ，不使用小料配料，配方{data.RecipeCode}，加入配方{i}");
+                                                }
+                                            }
+                                            else if (GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[i])
+                                            {
+                                                if (RecipeQueueTray[i].Count == 0 && !RecipeQueueTray[0].Contains(data.RecipeCode) && !RecipeQueueTray[1].Contains(data.RecipeCode) && !RecipeQueueTray[2].Contains(data.RecipeCode) && !RecipeQueueTray[3].Contains(data.RecipeCode) && !RecipeQueueTray[4].Contains(data.RecipeCode))
+                                                {
+                                                    RecipeQueueTray[i].Enqueue(data.RecipeCode);
+                                                    GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
+                                                    MessageNotify.GetInstance.ShowRunLog($"西门子配方配料 ，等待plc允许配料，配方{data.RecipeCode}，加入配方{i}");
+                                                }
+                                            }
+                                        }
+                                        break;
                                     default:
                                         break;
                                 }
                             }
-                            for (int i = 0; i < 5; i++)
-                            {
-                                if (GVL_SmallStation.GetInstance.NotUseSmallStation)
-                                {
-                                    if (RecipeQueueTray[i].Count == 0 && !RecipeQueueTray[0].Contains(data.RecipeCode) && !RecipeQueueTray[1].Contains(data.RecipeCode) && !RecipeQueueTray[2].Contains(data.RecipeCode) && !RecipeQueueTray[3].Contains(data.RecipeCode) && !RecipeQueueTray[4].Contains(data.RecipeCode))
-                                    {
-                                        RecipeQueueTray[i].Enqueue(data.RecipeCode);
-                                        MessageNotify.GetInstance.ShowRunLog($"西门子配方配料 ，不使用小料配料，配方{data.RecipeCode}，加入配方{i}");
-                                    }
-                                }
-                                else if (GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[i])
-                                {
-                                    if (RecipeQueueTray[i].Count == 0 && !RecipeQueueTray[0].Contains(data.RecipeCode) && !RecipeQueueTray[1].Contains(data.RecipeCode) && !RecipeQueueTray[2].Contains(data.RecipeCode) && !RecipeQueueTray[3].Contains(data.RecipeCode) && !RecipeQueueTray[4].Contains(data.RecipeCode))
-                                    {
-                                        RecipeQueueTray[i].Enqueue(data.RecipeCode);
-                                        MessageNotify.GetInstance.ShowRunLog($"西门子配方配料 ，等待plc允许配料，配方{data.RecipeCode}，加入配方{i}");
-                                    }
-                                }
-                            }
+                            
                         }
                     }
                 }
@@ -630,7 +635,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             }
         }
         /// <summary>
-        /// 执行配方队列中的第一个配方
+        /// 小料站配料
         /// </summary>
         private void RecipeInfoToHKPLC()
         {

From 6b7177e18320710da5f1c016e6a819216452b3b8 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Mon, 15 May 2023 15:43:45 +0800
Subject: [PATCH 57/96] =?UTF-8?q?=E7=85=AE=E9=9D=A2=E6=9C=BA=EF=BC=9A?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=E6=96=B0?=
 =?UTF-8?q?=E5=8A=A0=E7=85=AE=E9=9D=A2=E6=97=B6=E9=97=B4=E8=AE=BE=E5=AE=9A?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkS/Model/MorksPar.cs        |   2 +
 BPASmartClient.MorkS/View/ParSet.xaml         | 155 ++++++++++++++++--
 .../ViewModel/ParSetViewModel.cs              |  17 +-
 3 files changed, 158 insertions(+), 16 deletions(-)

diff --git a/BPASmartClient.MorkS/Model/MorksPar.cs b/BPASmartClient.MorkS/Model/MorksPar.cs
index a085e187..61a8f21c 100644
--- a/BPASmartClient.MorkS/Model/MorksPar.cs
+++ b/BPASmartClient.MorkS/Model/MorksPar.cs
@@ -21,5 +21,7 @@ namespace BPASmartClient.MorkS.Model
         /// 倒面条件 煮面口忙碌数量
         /// </summary>
         public int InvertedNoodles_OpenBusyNum { get; set; } = 5;
+
+        public ObservableCollection<ParSet> DishLibraryParSets { get; set; } = new ObservableCollection<ParSet>();
     }
 }
diff --git a/BPASmartClient.MorkS/View/ParSet.xaml b/BPASmartClient.MorkS/View/ParSet.xaml
index 531a53ed..b29f4e22 100644
--- a/BPASmartClient.MorkS/View/ParSet.xaml
+++ b/BPASmartClient.MorkS/View/ParSet.xaml
@@ -13,7 +13,7 @@
     mc:Ignorable="d">
 
     <UserControl.DataContext>
-        <vm:ParSetViewModel />
+        <vm:ParSetViewModel/>
     </UserControl.DataContext>
 
     <UserControl.Resources>
@@ -81,12 +81,14 @@
                 <RowDefinition Height="150" />
             </Grid.RowDefinitions>
 
-            <ItemsControl Grid.Row="0" ItemsSource="{Binding parSets}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="{Binding TextBlockContext}" />
-                            <TextBox
+            <StackPanel Orientation="Horizontal">
+                <!--煮面口参数设置-->
+                <ItemsControl Grid.Row="0" ItemsSource="{Binding parSets}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Style="{StaticResource TextBlockStyle}" Text="{Binding TextBlockContext}" />
+                                <TextBox
                                 Width="100"
                                 Margin="10,0,0,0"
                                 VerticalAlignment="Center"
@@ -97,8 +99,8 @@
                                 FontSize="21"
                                 Foreground="#ff34f7f7"
                                 Text="{Binding Minute}" />
-                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="（分）" />
-                            <TextBox
+                                <TextBlock Style="{StaticResource TextBlockStyle}" Text="（分）" />
+                                <TextBox
                                 Width="100"
                                 Margin="0,10"
                                 VerticalAlignment="Center"
@@ -109,9 +111,9 @@
                                 FontSize="21"
                                 Foreground="#ff34f7f7"
                                 Text="{Binding Second}" />
-                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="（秒）" />
+                                <TextBlock Style="{StaticResource TextBlockStyle}" Text="（秒）" />
 
-                            <CheckBox
+                                <CheckBox
                                 Height="20"
                                 Margin="10"
                                 VerticalAlignment="Center"
@@ -122,11 +124,134 @@
                                 IsChecked="{Binding IsShield}"
                                 Template="{StaticResource CbTemplate}" />
 
-                        </StackPanel>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="50" />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
 
+                    <Grid 
+                    Grid.Row="0"
+                    Margin="100,10,0,0"
+                    Background="#ff0C255F">
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock
+                        Grid.Column="0"
+                        FontSize="24"
+                        Style="{StaticResource TitleTextblockStyle}"
+                        Text="库位序号" />
+
+                        <TextBlock
+                        Grid.Column="1"
+                        FontSize="24"
+                        Style="{StaticResource TitleTextblockStyle}"
+                        Text="煮时间(分)" />
+
+                        <TextBlock
+                        Grid.Column="2"
+                        FontSize="24"
+                        Style="{StaticResource TitleTextblockStyle}"
+                        Text="煮时间(秒)" />
+
+                        <Border
+                        Grid.Column="0"
+                        Grid.ColumnSpan="4"
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,1,1" />
+                        <Border
+                        Grid.Column="1"
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,0,1,0" />
+                        <Border
+                        Grid.Column="3"
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,0,1,0" />
+
+
+                    </Grid>
+                    <Grid Grid.Row="1" Margin="100,0,0,0">
+                        <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                            <ItemsControl Foreground="DeepSkyBlue" ItemsSource="{Binding DishLibraryParSets}">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid Name="gr">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="157"/>
+                                                <ColumnDefinition Width="1*"/>
+                                                <ColumnDefinition Width="1*"/>
+                                            </Grid.ColumnDefinitions>
+
+                                            <TextBlock
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="18"
+                                            Text="{Binding TextBlockContext}" />
+
+                                            <!--<ComboBox
+                                            Grid.Column="1"
+                                            Height="auto"
+                                            Background="Transparent"
+                                            BorderThickness="0"
+                                            FontSize="18"
+                                            Foreground="DeepSkyBlue"
+                                            IsEditable="False"
+                                            ItemsSource="{Binding DataContext.DishTypeName, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                            SelectedIndex="{Binding LocDishType}" />-->
+
+                                            <Border
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="3"
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1,0,1,1"></Border>
+                                            
+                                            <Border
+                                            Grid.Column="1"
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1,0,1,0">
+                                                <TextBox
+                                            Grid.Column="1"
+                                            FontSize="18"
+                                            Style="{StaticResource InputTextboxStyle}"
+                                            Text="{Binding Minute}" />
+                                            </Border>
+                                            
+                                            <Border
+                                            Grid.Column="2"
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1,0,1,0">
+                                                <TextBox
+                                            Grid.Column="2"
+                                            FontSize="18"
+                                            Style="{StaticResource InputTextboxStyle}"
+                                            Text="{Binding Second}" />
+                                            </Border>
+                                        </Grid>
+
+                                        <DataTemplate.Triggers>
+                                            <Trigger Property="IsMouseOver" Value="true">
+                                                <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                            </Trigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </ScrollViewer>
+                    </Grid>
+                </Grid>
+            </StackPanel>
+            
+            <!--加汤设置-->
             <StackPanel Grid.Row="1" Orientation="Horizontal">
                 <TextBlock
                     Margin="40,0,0,0"
diff --git a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
index c77b1e3e..4b0d3c48 100644
--- a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
+++ b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
@@ -27,6 +27,20 @@ namespace BPASmartClient.MorkS.ViewModel
                 ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M0.6", Value = false });
             });
 
+            if (Json<MorksPar>.Data.DishLibraryParSets.Count < 5)
+            {
+                Json<MorksPar>.Data.DishLibraryParSets.Clear();
+                for (int i = 0; i < 5; i++)
+                {
+                    Json<MorksPar>.Data.DishLibraryParSets.Add(new ParSet()
+                    {
+                        Minute = 2,
+                        Second = 0,
+                        TextBlockContext = $"{i + 1}"
+                    });
+                }
+            }
+
             //VoicePlayTest = new RelayCommand(() => {
             //    VoiceAPI.Speak(new Random().Next(1,100).ToString());
             //});
@@ -44,7 +58,8 @@ namespace BPASmartClient.MorkS.ViewModel
         /// </summary>
         public float AddSoup { get { return Json<MorksPar>.Data.AddSoupTime; } set { Json<MorksPar>.Data.AddSoupTime = value; OnPropertyChanged(); } }
         public int OpenUseNumber { get { return Json<MorksPar>.Data.InvertedNoodles_OpenBusyNum; } set { Json<MorksPar>.Data.InvertedNoodles_OpenBusyNum = value; OnPropertyChanged(); } }
-        
+        public ObservableCollection<ParSet> DishLibraryParSets { get; set; } = Json<MorksPar>.Data.DishLibraryParSets;
+
         public float DelayTime { get { return _DelayTime; } set { _DelayTime = value; OnPropertyChanged(); } }
         private float _DelayTime;
 

From 874aa9c9b3024045ca9bb56c96ee6987ef87ed29 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Mon, 15 May 2023 16:18:33 +0800
Subject: [PATCH 58/96] =?UTF-8?q?=E7=85=AE=E9=9D=A2=E6=9C=BA=EF=BC=9A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=85=AE=E9=9D=A2=E6=97=B6=E9=97=B4=E5=86=99?=
 =?UTF-8?q?=E5=85=A5=E7=A8=8B=E5=BA=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkS/Control_Morks.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index a3a0b202..0a81bf42 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -608,10 +608,16 @@ namespace BPASmartClient.MorkS
                         OrderChange(orderLocInfo.SuborderId, ORDER_STATUS.COOKING);
                         DeviceProcessLogShow($"订单【{orderLocInfo.SuborderId}】,机器人倒面至【{loc + 1}】号煮面栏");
                         //写入煮面时间
-                        List<ushort> values = new List<ushort>();
-                        values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
-                        values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
-                        WriteData($"VW{116 + (loc * 6)}", values.ToArray());
+                        if (mORKS.TurntableFeedbackloc>=1 && mORKS.TurntableFeedbackloc<=5) {
+                              var x =  Json<MorksPar>.Data.parSets.FirstOrDefault(p => p.TextBlockContext == mORKS.TurntableFeedbackloc.ToString());
+                                if (x != null) {
+                                List<ushort> values = new List<ushort>();
+                                values.Add(x.Minute);
+                                values.Add(x.Second);
+                                WriteData($"VW{372 + (loc * 6)}", values.ToArray());
+                                DeviceProcessLogShow($"转盘位置{mORKS.TurntableFeedbackloc}：写入煮面时间{x.Minute}分{x.Second}秒。");
+                            }
+                        }
                         mORKS.TakeNoodleInterlock = true;
                     }
                 }

From e4b44efc61133a217ddc89c2dfc83fde8325a905 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Tue, 16 May 2023 10:15:46 +0800
Subject: [PATCH 59/96] =?UTF-8?q?=E7=85=AE=E9=9D=A2=E6=9C=BA=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E7=89=88=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=92=8C=E7=85=AE=E9=9D=A2?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=86=99=E5=85=A5=E5=88=A4=E6=96=AD=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Control_MorkSUpgradedVer.cs               |  18 ++-
 .../Model/MorksPar.cs                         |   1 +
 .../View/ParSet.xaml                          | 152 ++++++++++++++++--
 .../ViewModel/ParSetViewModel.cs              |  14 +-
 4 files changed, 166 insertions(+), 19 deletions(-)

diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index ee6177cb..f0c793d8 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -647,10 +647,20 @@ namespace BPASmartClient.MorkSUpgradedVer
                         if (mORKS.RBTakeNoodleTask.TryDequeue(out OrderLocInfo orderLocInfo))
                         {
                             //写入煮面时间
-                            List<ushort> values = new List<ushort>();
-                            values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
-                            values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
-                            WriteData($"VW{324 + (loc * 4)}", values.ToArray());
+                            //List<ushort> values = new List<ushort>();
+                            //values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
+                            //values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
+                            //WriteData($"VW{324 + (loc * 4)}", values.ToArray());
+                            if (mORKS.CurrentFeedbackLoc >= 1 && mORKS.CurrentFeedbackLoc <= 5) {
+                                var x = Json<MorksPar>.Data.DishLibraryParSets.FirstOrDefault(p => p.TextBlockContext == mORKS.CurrentFeedbackLoc.ToString());
+                                if (x != null) {
+                                    List<ushort> values = new List<ushort>();
+                                    values.Add(x.Minute);
+                                    values.Add(x.Second);
+                                    WriteData($"VW{324 + (loc * 4)}", values.ToArray());
+                                    DeviceProcessLogShow($"转盘位置[{mORKS.CurrentFeedbackLoc}]：写入煮面时间{x.Minute}分{x.Second}秒。");
+                                }
+                            }
 
                             mORKS.CurrentLoc = 0;
                             mORKS.CookNodelId[loc] = orderLocInfo.SuborderId;
diff --git a/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs b/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs
index ef2c0cb5..4b50dfa5 100644
--- a/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs
@@ -12,5 +12,6 @@ namespace BPASmartClient.MorkSUpgradedVer.Model
     internal class MorksPar
     {
         public ObservableCollection<ParSet> parSets { get; set; } = new ObservableCollection<ParSet>();
+        public ObservableCollection<ParSet> DishLibraryParSets { get; set; } = new ObservableCollection<ParSet>();
     }
 }
diff --git a/BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml b/BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml
index eb833a3a..d06c0166 100644
--- a/BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml
+++ b/BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml
@@ -76,12 +76,13 @@
 
         <!--  参数放置面板  -->
         <Grid Grid.Row="2">
-            <ItemsControl ItemsSource="{Binding parSets}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="{Binding TextBlockContext}" />
-                            <TextBox
+            <StackPanel Orientation="Horizontal">
+                <ItemsControl ItemsSource="{Binding parSets}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Style="{StaticResource TextBlockStyle}" Text="{Binding TextBlockContext}" />
+                                <TextBox
                                 Width="100"
                                 Margin="10,0,0,0"
                                 VerticalAlignment="Center"
@@ -92,8 +93,8 @@
                                 FontSize="21"
                                 Foreground="#ff34f7f7"
                                 Text="{Binding Minute}" />
-                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="（分）" />
-                            <TextBox
+                                <TextBlock Style="{StaticResource TextBlockStyle}" Text="（分）" />
+                                <TextBox
                                 Width="100"
                                 Margin="0,10"
                                 VerticalAlignment="Center"
@@ -104,9 +105,9 @@
                                 FontSize="21"
                                 Foreground="#ff34f7f7"
                                 Text="{Binding Second}" />
-                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="（秒）" />
+                                <TextBlock Style="{StaticResource TextBlockStyle}" Text="（秒）" />
 
-                            <CheckBox
+                                <CheckBox
                                 Height="20"
                                 Margin="10"
                                 VerticalAlignment="Center"
@@ -117,10 +118,133 @@
                                 IsChecked="{Binding IsShield}"
                                 Template="{StaticResource CbTemplate}" />
 
-                        </StackPanel>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="50" />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+
+                    <Grid 
+                    Grid.Row="0"
+                    Margin="100,10,0,0"
+                    Background="#ff0C255F">
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock
+                        Grid.Column="0"
+                        FontSize="24"
+                        Style="{StaticResource TitleTextblockStyle}"
+                        Text="库位序号" />
+
+                        <TextBlock
+                        Grid.Column="1"
+                        FontSize="24"
+                        Style="{StaticResource TitleTextblockStyle}"
+                        Text="煮时间(分)" />
+
+                        <TextBlock
+                        Grid.Column="2"
+                        FontSize="24"
+                        Style="{StaticResource TitleTextblockStyle}"
+                        Text="煮时间(秒)" />
+
+                        <Border
+                        Grid.Column="0"
+                        Grid.ColumnSpan="4"
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,1,1" />
+                        <Border
+                        Grid.Column="1"
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,0,1,0" />
+                        <Border
+                        Grid.Column="3"
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,0,1,0" />
+
+
+                    </Grid>
+                    <Grid Grid.Row="1" Margin="100,0,0,0">
+                        <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                            <ItemsControl Foreground="DeepSkyBlue" ItemsSource="{Binding DishLibraryParSets}">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid Name="gr">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="157"/>
+                                                <ColumnDefinition Width="1*"/>
+                                                <ColumnDefinition Width="1*"/>
+                                            </Grid.ColumnDefinitions>
+
+                                            <TextBlock
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="18"
+                                            Text="{Binding TextBlockContext}" />
+
+                                            <!--<ComboBox
+                                            Grid.Column="1"
+                                            Height="auto"
+                                            Background="Transparent"
+                                            BorderThickness="0"
+                                            FontSize="18"
+                                            Foreground="DeepSkyBlue"
+                                            IsEditable="False"
+                                            ItemsSource="{Binding DataContext.DishTypeName, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                            SelectedIndex="{Binding LocDishType}" />-->
+
+                                            <Border
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="3"
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1,0,1,1"></Border>
+
+                                            <Border
+                                            Grid.Column="1"
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1,0,1,0">
+                                                <TextBox
+                                            Grid.Column="1"
+                                            FontSize="18"
+                                            Style="{StaticResource InputTextboxStyle}"
+                                            Text="{Binding Minute}" />
+                                            </Border>
+
+                                            <Border
+                                            Grid.Column="2"
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1,0,1,0">
+                                                <TextBox
+                                            Grid.Column="2"
+                                            FontSize="18"
+                                            Style="{StaticResource InputTextboxStyle}"
+                                            Text="{Binding Second}" />
+                                            </Border>
+                                        </Grid>
+
+                                        <DataTemplate.Triggers>
+                                            <Trigger Property="IsMouseOver" Value="true">
+                                                <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                            </Trigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </ScrollViewer>
+                    </Grid>
+                </Grid>
+            </StackPanel>
+            
 
         </Grid>
 
diff --git a/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs
index 0aa320c6..03a8c2b4 100644
--- a/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs
+++ b/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs
@@ -19,12 +19,24 @@ namespace BPASmartClient.MorkSUpgradedVer.ViewModel
             SaveInfoCommand = new RelayCommand(SaveSettingData);
 
             ActionManage.GetInstance.Register(SaveSettingData, "初始化设定煮面时间");
-            
+
+            if (Json<MorksPar>.Data.DishLibraryParSets.Count < 5) {
+                Json<MorksPar>.Data.DishLibraryParSets.Clear();
+                for (int i = 0; i < 5; i++) {
+                    Json<MorksPar>.Data.DishLibraryParSets.Add(new ParSet() {
+                        Minute = 2,
+                        Second = 0,
+                        TextBlockContext = $"{i + 1}"
+                    });
+                }
+            }
+
         }
 
         public RelayCommand SaveInfoCommand { get; set; }
 
         public ObservableCollection<ParSet> parSets { get; set; } = Json<MorksPar>.Data.parSets;
+        public ObservableCollection<ParSet> DishLibraryParSets { get; set; } = Json<MorksPar>.Data.DishLibraryParSets;
 
         private void SaveSettingData()
         {

From e6625635ed2b35f9cfc97d29e34f5767f54a2131 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Tue, 16 May 2023 16:00:08 +0800
Subject: [PATCH 60/96] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=86=85=E5=90=8C=E4=B8=80=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E6=95=B0=E9=87=8F=E6=83=85=E5=86=B5=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkMV1/Control_MorkMV1.cs | 34 +++++++++++++++--------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/BPASmartClient.MorkMV1/Control_MorkMV1.cs b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
index 3c08f9a7..7a8fc0b7 100644
--- a/BPASmartClient.MorkMV1/Control_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
@@ -364,17 +364,29 @@ namespace BPASmartClient.MorkMV1
                                      var x = Json<MorksPar>.Data.DishLibraryParSets.FirstOrDefault(p => p.TextBlockContext == loc.ToString());
                                      if (x != null)
                                      {
-                                         oli.Add(new MOrderLocInfo()
-                                         {
-                                             GoodName = order.MorkOrder.GoodsName,
-                                             Loc = ushort.Parse(res.BatchingLoc),
-                                             SuborderId = order.MorkOrder.SuborderId,
-                                             SortNum = order.MorkOrder.SortNum,
-                                             BatchingId = res.BatchingId,
-                                             Minute = x.Minute,
-                                             Second = x.Second,
-                                             LocDishType = x.LocDishType
-                                         });
+                                         for (int i = 0; i < item.BatchingCount; i++) {
+                                             oli.Add(new MOrderLocInfo() {
+                                                 GoodName = order.MorkOrder.GoodsName,
+                                                 Loc = ushort.Parse(res.BatchingLoc),
+                                                 SuborderId = order.MorkOrder.SuborderId,
+                                                 SortNum = order.MorkOrder.SortNum,
+                                                 BatchingId = res.BatchingId,
+                                                 Minute = x.Minute,
+                                                 Second = x.Second,
+                                                 LocDishType = x.LocDishType
+                                             });
+                                         }
+                                         //oli.Add(new MOrderLocInfo()
+                                         //{
+                                         //    GoodName = order.MorkOrder.GoodsName,
+                                         //    Loc = ushort.Parse(res.BatchingLoc),
+                                         //    SuborderId = order.MorkOrder.SuborderId,
+                                         //    SortNum = order.MorkOrder.SortNum,
+                                         //    BatchingId = res.BatchingId,
+                                         //    Minute = x.Minute,
+                                         //    Second = x.Second,
+                                         //    LocDishType = x.LocDishType
+                                         //});
                                      }
                                  }
                              }

From bad0f807f74ca76d17b8fae595e7a0bf8f2c36e1 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Tue, 16 May 2023 17:24:08 +0800
Subject: [PATCH 61/96] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E7=9A=84=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkMV1/Control_MorkMV1.cs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/BPASmartClient.MorkMV1/Control_MorkMV1.cs b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
index 7a8fc0b7..3a711d13 100644
--- a/BPASmartClient.MorkMV1/Control_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
@@ -376,17 +376,6 @@ namespace BPASmartClient.MorkMV1
                                                  LocDishType = x.LocDishType
                                              });
                                          }
-                                         //oli.Add(new MOrderLocInfo()
-                                         //{
-                                         //    GoodName = order.MorkOrder.GoodsName,
-                                         //    Loc = ushort.Parse(res.BatchingLoc),
-                                         //    SuborderId = order.MorkOrder.SuborderId,
-                                         //    SortNum = order.MorkOrder.SortNum,
-                                         //    BatchingId = res.BatchingId,
-                                         //    Minute = x.Minute,
-                                         //    Second = x.Second,
-                                         //    LocDishType = x.LocDishType
-                                         //});
                                      }
                                  }
                              }
@@ -747,7 +736,6 @@ namespace BPASmartClient.MorkMV1
                 mORKM.TakeNoodleInterlock = false;
                 mORKM.AllowTakeNoodle = false;
                 mORKM.TurntableInterlock = false;
-                //mORKM.NeedOutNoodle = true;
                 DeviceProcessLogShow("机器人取面完成信号检测");
             }
             //机器人倒面完成信号检测
@@ -771,7 +759,6 @@ namespace BPASmartClient.MorkMV1
                     }
                 }
                 mORKM.RobotOutDinnigLock = false;
-                //mORKM.NeedOutNoodle = false;
             }
 
             int OutMealRequstCount = mORKM.CookNoodleCom.Where(p => p == true).ToList().Count;

From 8245c788ec15b474447e1009814f28840621ae42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Tue, 16 May 2023 17:34:20 +0800
Subject: [PATCH 62/96] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkMV1/Control_MorkMV1.cs | 54 +++++++++++++++++++++--
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/BPASmartClient.MorkMV1/Control_MorkMV1.cs b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
index 3a711d13..6c622c26 100644
--- a/BPASmartClient.MorkMV1/Control_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
@@ -364,8 +364,10 @@ namespace BPASmartClient.MorkMV1
                                      var x = Json<MorksPar>.Data.DishLibraryParSets.FirstOrDefault(p => p.TextBlockContext == loc.ToString());
                                      if (x != null)
                                      {
-                                         for (int i = 0; i < item.BatchingCount; i++) {
-                                             oli.Add(new MOrderLocInfo() {
+                                         for (int i = 0; i < item.BatchingCount; i++)
+                                         {
+                                             oli.Add(new MOrderLocInfo()
+                                             {
                                                  GoodName = order.MorkOrder.GoodsName,
                                                  Loc = ushort.Parse(res.BatchingLoc),
                                                  SuborderId = order.MorkOrder.SuborderId,
@@ -604,7 +606,7 @@ namespace BPASmartClient.MorkMV1
         private void TakeNoodleTask()
         {
             //取面控制
-            if (mORKM.AllowRun && mORKM.RobotStatus &&  !mORKM.RobotOutDinnigLock&&!mORKM.Feeding  && !mORKM.RobotTaskInterlock && mORKM.AllowTakeNoodle && mORKM.SiloInPlace && !mORKM.TakeNoodleInterlock && mORKM.RBTakeNoodleTask.Count > 0)
+            if (mORKM.AllowRun && mORKM.RobotStatus && !mORKM.RobotOutDinnigLock && !mORKM.Feeding && !mORKM.RobotTaskInterlock && mORKM.AllowTakeNoodle && mORKM.SiloInPlace && !mORKM.TakeNoodleInterlock && mORKM.RBTakeNoodleTask.Count > 0)
             {
                 if (mORKM.CurrentLoc == mORKM.CurrentFeedbackLoc)
                 {
@@ -647,7 +649,7 @@ namespace BPASmartClient.MorkMV1
         /// </summary>
         private void OutNoodleTask()
         {
-            if (mORKM.AllowInvertedFace && !mORKM.RobotOutDinnigLock  && mORKM.RobotTaskInterlock && !mORKM.TakeNoodleInterlock && mORKM.RobotStatus)
+            if (mORKM.AllowInvertedFace && !mORKM.RobotOutDinnigLock && mORKM.RobotTaskInterlock && !mORKM.TakeNoodleInterlock && mORKM.RobotStatus)
             {
                 for (int i = 0; i < mORKM.CookNodelId.Length; i++)
                 {
@@ -698,6 +700,48 @@ namespace BPASmartClient.MorkMV1
             }
         }
 
+        /// <summary>
+        /// 验证是否可以出餐
+        /// </summary>
+        /// <returns></returns>
+        private bool IsCanDiningOut()
+        {
+            if (mORKM.AllowInvertedFace && !mORKM.RobotOutDinnigLock && mORKM.RobotTaskInterlock && !mORKM.TakeNoodleInterlock && mORKM.RobotStatus)
+            {
+                for (int i = 0; i < mORKM.CookNodelId.Length; i++)
+                {
+                    if (mORKM.CookNodelId[i] == mORKM.IngredientsCompleteId && !string.IsNullOrEmpty(mORKM.CookNodelId[i]))
+                    {
+                        if (mORKM.CookNoodleCom[i] && mORKM.SuborderCount.ContainsKey(mORKM.CookNodelId[i]))
+                        {
+                            var x = mORKM.SuborderCount[mORKM.CookNodelId[i]];
+
+                            //执行取素菜操作
+                            if (x.AcVegetableCount != x.CuVegetableCount)
+                            {
+                                int index = x.VegetableLoc.FindIndex(p => p == i + 1);
+                                if (index >= 0)
+                                {
+                                    return true;
+                                }
+                            }
+
+                            //执行取荤菜
+                            if (!mORKM.RobotOutDinnigLock && x.AcVegetableCount == x.CuVegetableCount && x.AcMeatDishesCount != x.CuMeatDishesCount)
+                            {
+                                int index = x.MeatDishesLoc.FindIndex(p => p == i + 1);
+                                if (index >= 0)
+                                {
+                                    return true;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+
         /// <summary>
         /// 信号检测
         /// </summary>
@@ -769,6 +813,8 @@ namespace BPASmartClient.MorkMV1
             {
                 if (mORKM.CookNodelId[i] == mORKM.IngredientsCompleteId && mORKM.CookNoodleCom[i])
                 {
+                    int a = mORKM.nsm.Where(p => p.NoodleCookerStatus == false && p.IsShield == false).ToList().Count;
+                    if (a > 0 && !IsCanDiningOut()) break;
                     isok = true;
                     break;
                 }

From c401517339d05285c4ce7541c87214d497f8a512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Tue, 16 May 2023 17:39:36 +0800
Subject: [PATCH 63/96] =?UTF-8?q?=E8=BF=98=E5=8E=9FMORKS=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkS/Control_Morks.cs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index 0a81bf42..a3a0b202 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -608,16 +608,10 @@ namespace BPASmartClient.MorkS
                         OrderChange(orderLocInfo.SuborderId, ORDER_STATUS.COOKING);
                         DeviceProcessLogShow($"订单【{orderLocInfo.SuborderId}】,机器人倒面至【{loc + 1}】号煮面栏");
                         //写入煮面时间
-                        if (mORKS.TurntableFeedbackloc>=1 && mORKS.TurntableFeedbackloc<=5) {
-                              var x =  Json<MorksPar>.Data.parSets.FirstOrDefault(p => p.TextBlockContext == mORKS.TurntableFeedbackloc.ToString());
-                                if (x != null) {
-                                List<ushort> values = new List<ushort>();
-                                values.Add(x.Minute);
-                                values.Add(x.Second);
-                                WriteData($"VW{372 + (loc * 6)}", values.ToArray());
-                                DeviceProcessLogShow($"转盘位置{mORKS.TurntableFeedbackloc}：写入煮面时间{x.Minute}分{x.Second}秒。");
-                            }
-                        }
+                        List<ushort> values = new List<ushort>();
+                        values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
+                        values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
+                        WriteData($"VW{116 + (loc * 6)}", values.ToArray());
                         mORKS.TakeNoodleInterlock = true;
                     }
                 }

From 155c2752a34632934195181e66d8c551e5e9790e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Tue, 16 May 2023 17:58:02 +0800
Subject: [PATCH 64/96] 1

---
 BPASmartClient.MorkMV1/Control_MorkMV1.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/BPASmartClient.MorkMV1/Control_MorkMV1.cs b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
index 6c622c26..53f961f0 100644
--- a/BPASmartClient.MorkMV1/Control_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
@@ -704,9 +704,9 @@ namespace BPASmartClient.MorkMV1
         /// 验证是否可以出餐
         /// </summary>
         /// <returns></returns>
-        private bool IsCanDiningOut()
+        private bool IsCanDiningOut(bool condition)
         {
-            if (mORKM.AllowInvertedFace && !mORKM.RobotOutDinnigLock && mORKM.RobotTaskInterlock && !mORKM.TakeNoodleInterlock && mORKM.RobotStatus)
+            if (mORKM.AllowInvertedFace && condition && !mORKM.RobotOutDinnigLock && !mORKM.TakeNoodleInterlock && mORKM.RobotStatus)
             {
                 for (int i = 0; i < mORKM.CookNodelId.Length; i++)
                 {
@@ -806,21 +806,19 @@ namespace BPASmartClient.MorkMV1
             }
 
             int OutMealRequstCount = mORKM.CookNoodleCom.Where(p => p == true).ToList().Count;
-            int mlCount = mORKM.nsm.Where(p => p.NoodleCookerStatus == true && p.IsShield == false).ToList().Count;
-
+            int BusyCount = mORKM.nsm.Where(p => p.NoodleCookerStatus == true && p.IsShield == false).ToList().Count;//忙碌数量
+            int IdleCount = mORKM.nsm.Where(p => p.NoodleCookerStatus == false && p.IsShield == false).ToList().Count;//空闲数量
             bool isok = false;
             for (int i = 0; i < mORKM.CookNodelId.Length; i++)
             {
                 if (mORKM.CookNodelId[i] == mORKM.IngredientsCompleteId && mORKM.CookNoodleCom[i])
                 {
-                    int a = mORKM.nsm.Where(p => p.NoodleCookerStatus == false && p.IsShield == false).ToList().Count;
-                    if (a > 0 && !IsCanDiningOut()) break;
                     isok = true;
                     break;
                 }
             }
             mORKM.PriorityJudgment = Delay.GetInstance("取餐优先级判断").Start(mORKM.TurntableLocLists.Count > 0 && !mORKM.TurntableLowPosition, 4);
-            mORKM.RobotTaskInterlock = isok && mORKM.AllowInvertedFace && (mlCount >= 2 || mORKM.RBTakeNoodleTask.Count == 0 || mORKM.PriorityJudgment);
+            mORKM.RobotTaskInterlock = IsCanDiningOut(isok && IdleCount > 0) && (BusyCount >= 2 || mORKM.RBTakeNoodleTask.Count == 0 || mORKM.PriorityJudgment);
 
 
         }

From e7079de37575ad30860e036caf87344f0eecb4ea Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Tue, 16 May 2023 18:31:12 +0800
Subject: [PATCH 65/96] =?UTF-8?q?=E4=BF=AE=E6=94=B9RobotTaskInterlock?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=88=A4=E6=96=AD=E7=9A=84IdleCount=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=BA>=3D0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkMV1/Control_MorkMV1.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BPASmartClient.MorkMV1/Control_MorkMV1.cs b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
index 53f961f0..d94555a4 100644
--- a/BPASmartClient.MorkMV1/Control_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
@@ -818,7 +818,7 @@ namespace BPASmartClient.MorkMV1
                 }
             }
             mORKM.PriorityJudgment = Delay.GetInstance("取餐优先级判断").Start(mORKM.TurntableLocLists.Count > 0 && !mORKM.TurntableLowPosition, 4);
-            mORKM.RobotTaskInterlock = IsCanDiningOut(isok && IdleCount > 0) && (BusyCount >= 2 || mORKM.RBTakeNoodleTask.Count == 0 || mORKM.PriorityJudgment);
+            mORKM.RobotTaskInterlock = IsCanDiningOut(isok && IdleCount >= 0) && (BusyCount >= 2 || mORKM.RBTakeNoodleTask.Count == 0 || mORKM.PriorityJudgment);
 
 
         }

From 5dcb08398a6fdbe12332dc214b87a38febe827a4 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Wed, 17 May 2023 13:21:25 +0800
Subject: [PATCH 66/96] =?UTF-8?q?=E5=8F=96=E7=B4=A0=E8=8F=9C=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=A4=9A=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkMV1/Control_MorkMV1.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BPASmartClient.MorkMV1/Control_MorkMV1.cs b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
index d94555a4..eb7ed237 100644
--- a/BPASmartClient.MorkMV1/Control_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
@@ -660,7 +660,7 @@ namespace BPASmartClient.MorkMV1
                             var x = mORKM.SuborderCount[mORKM.CookNodelId[i]];
 
                             //执行取素菜操作
-                            if (x.AcVegetableCount != x.CuVegetableCount)
+                            if (!mORKM.RobotOutDinnigLock && x.AcVegetableCount != x.CuVegetableCount)
                             {
                                 int index = x.VegetableLoc.FindIndex(p => p == i + 1);
                                 if (index >= 0)

From a2d4c2c77a08892873dbd3bcd6a38cf07552dc7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Wed, 17 May 2023 15:33:02 +0800
Subject: [PATCH 67/96] 1

---
 .../Control_MorkSUpgradedVer - 复制.cs      | 874 ++++++++++++++++++
 1 file changed, 874 insertions(+)
 create mode 100644 BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer - 复制.cs

diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer - 复制.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer - 复制.cs
new file mode 100644
index 00000000..269b081b
--- /dev/null
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer - 复制.cs	
@@ -0,0 +1,874 @@
+//using System;
+//using System.Collections.Generic;
+//using BPA.Message.Enum;
+//using BPASmartClient.Device;
+//using BPASmartClient.EventBus;
+//using BPASmartClient.Model;
+//using BPASmartClient.Peripheral;
+//using static BPASmartClient.EventBus.EventBus;
+//using BPASmartClient.Helper;
+//using System.Threading;
+//using BPASmartClient.Message;
+//using BPA.Message;
+//using System.Linq;
+//using BPASmartClient.Model.PLC;
+//using System.Threading.Tasks;
+//using System.Reflection;
+//using BPASmartClient.MorkSUpgradedVer.Model;
+//using System.Collections.ObjectModel;
+//using BPASmartClient.MorkSUpgradedVer.ViewModel;
+//using BPASmartClient.Business;
+//using BPASmartClient.Model.小炒机;
+//using BPA.Models;
+//using System.Windows.Forms;
+//using System.Media;
+//using BPASmartClient.CustomResource;
+////using BPA.Helper;
+
+//namespace BPASmartClient.MorkSUpgradedVer
+//{
+//    public class Control_MorkSUpgradedVer : BaseDevice
+//    {
+//        public override DeviceClientType DeviceType => DeviceClientType.MORKS;
+//        GVL_MorkSUpgradedVer mORKS = new GVL_MorkSUpgradedVer();
+//        Alarm alarm = new Alarm();
+
+//        public override void DoMain()
+//        {
+//            MonitorViewModel.DeviceId = DeviceId;
+//            ServerInit();
+//            DataParse();
+//            Json<MorksPar>.Read();
+//            Json<OrderStatistics>.Read();
+//            if (Json<MorksPar>.Data.parSets == null) Json<MorksPar>.Data.parSets = new ObservableCollection<ParSet>();
+//            if (Json<MorksPar>.Data.parSets.Count < 6)
+//            {
+//                Json<MorksPar>.Data.parSets.Clear();
+//                for (int i = 0; i < 6; i++)
+//                {
+//                    Json<MorksPar>.Data.parSets.Add(new ParSet()
+//                    {
+//                        CheckBoxContext = $"煮面口{i + 1}屏蔽",
+//                        Minute = 1,
+//                        Second = 0,
+//                        IsShield = false,
+//                        TextBlockContext = $"煮面口{i + 1}时间设定"
+//                    });
+//                }
+//            }
+
+//            ActionManage.GetInstance.Register(new Action<object[]>((o) =>
+//            {
+//                if (o.Length > 0)
+//                {
+//                    Random rd = new Random();
+//                    ThreadManage.GetInstance().StartLong(new Action(() =>
+//                    {
+//                        int NoodleLoc = (int)o[0] == 0 ? rd.Next(1, 6) : (int)o[0];
+//                        int BowlLoc = (int)o[1] == 0 ? rd.Next(10, 12) : (int)o[1];
+
+//                        string guid = new Guid().ToString();
+
+//                        mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { Loc = (ushort)NoodleLoc, SuborderId = guid });
+//                        MessageLog.GetInstance.Show($"添加订单：面条位置【{NoodleLoc}】");
+
+//                        mORKS.TakeBowlTask.Enqueue(new OrderLocInfo() { Loc = (ushort)BowlLoc, SuborderId = guid });
+//                        MessageLog.GetInstance.Show($"添加订单：碗位置【{BowlLoc}】");
+//                        Thread.Sleep(60000);
+//                    }), "ForOrder");
+//                }
+//            }), "EnableForOrder");
+
+//            ActionManage.GetInstance.Register(new Action<object>((o) =>
+//            {
+//                if (o != null && o is WritePar writePar) WriteData(writePar.Address, writePar.Value);
+//            }), "WriteVW");
+//            ActionManage.GetInstance.Register(new Action<object>((o) =>
+//            {
+//                if (o != null && o is WritePar writePar) WriteData(writePar.Address, writePar.Value);
+//            }), "WriteBools");
+//            ActionManage.GetInstance.Register(new Action(() => { DeviceInit(); }), "InitDevice");
+//        }
+
+//        public override void ResetProgram()
+//        {
+//            mORKS = null;
+//            mORKS = new GVL_MorkSUpgradedVer();
+//        }
+
+//        public override void Stop()
+//        {
+
+//        }
+
+//        private void ServerInit()
+//        {
+//            //物料信息
+//            EventBus.EventBus.GetInstance().Subscribe<MaterialDeliveryEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
+//             {
+//                 if (@event == null) return;
+//                 if (@event is MaterialDeliveryEvent material)
+//                 {
+//                     orderMaterialDelivery = material.orderMaterialDelivery;
+//                 }
+//             });
+
+//            //配方数据信息
+//            EventBus.EventBus.GetInstance().Subscribe<RecipeBomEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
+//            {
+//                if (@event == null) return;
+//                if (@event is RecipeBomEvent recipe)
+//                {
+//                    recipeBoms = recipe.recipeBoms;
+//                }
+//            });
+
+
+//        }
+
+//        private void OrderChange(string subid, ORDER_STATUS oRDER_STATUS)
+//        {
+//            var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
+//            string goodName = string.Empty;
+//            string SortNum = string.Empty;
+//            if (res != null)
+//            {
+//                goodName = res.MorkOrder.GoodsName;
+//                SortNum = res.MorkOrder.SortNum.ToString();
+//            }
+
+//            //if (mORKS.doe.ContainsKey(subid))
+//            //{
+//            //    goodName = mORKS.doe[subid].MorkOrder.GoodsName;
+//            //    SortNum = mORKS.doe[subid].MorkOrder.SortNum.ToString();
+//            if (!string.IsNullOrEmpty(goodName) && !string.IsNullOrEmpty(SortNum))
+//            {
+//                EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+//                var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
+//                if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
+//                {
+//                    if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
+//                    {
+//                        DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
+//                        DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
+//                        {
+//                            Status = oRDER_STATUS,
+//                            GoodName = goodName,
+//                            SortNum = SortNum,
+//                            StopTime = DateTime.Now.ToString("HH:mm:ss")
+//                        });
+//                    }
+//                    else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
+//                    {
+//                        var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
+//                        if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
+//                    }
+//                    else
+//                    {
+//                        DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
+//                    }
+//                }
+//                else
+//                {
+//                    DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
+//                    {
+//                        Status = oRDER_STATUS,
+//                        GoodName = goodName,
+//                        SortNum = SortNum,
+//                        StartTime = DateTime.Now.ToString("HH:mm:ss")
+//                    });
+//                }
+//                //mORKS.doe.Remove(subid, out _);
+//            }
+//            //}
+
+
+
+//            //var res = mORKS.doOrderEvents.FirstOrDefault(p => p.MorkOrder.SuborderId == subid);
+//            //string goodName = string.Empty;
+//            //string SortNum = string.Empty;
+//            //if (res != null)
+//            //{
+//            //    goodName = res.MorkOrder.GoodsName;
+//            //    SortNum = res.MorkOrder.SortNum.ToString();
+//            //}
+
+//            //EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+
+//            //var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
+//            //if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
+//            //{
+//            //    if (oRDER_STATUS == ORDER_STATUS.COMPLETED_COOK)
+//            //    {
+//            //        DataServer.GetInstance.morkS.MakeOrder.RemoveAt(index);
+//            //        DataServer.GetInstance.morkS.MakeOrderOver.Add(new OrderMakeModel()
+//            //        {
+//            //            Status = oRDER_STATUS,
+//            //            GoodName = goodName,
+//            //            SortNum = SortNum,
+//            //            StopTime = DateTime.Now.ToString("HH:mm:ss")
+//            //        });
+//            //    }
+//            //    else if (oRDER_STATUS == ORDER_STATUS.COMPLETED_TAKE)
+//            //    {
+//            //        var temp = DataServer.GetInstance.morkS.MakeOrderOver.FirstOrDefault(p => p.SortNum == SortNum);
+//            //        if (temp != null) DataServer.GetInstance.morkS.MakeOrderOver.Remove(temp);
+//            //    }
+//            //    else
+//            //    {
+//            //        DataServer.GetInstance.morkS.MakeOrder.ElementAt(index).Status = oRDER_STATUS;
+//            //    }
+//            //}
+//            //else
+//            //{
+//            //    DataServer.GetInstance.morkS.MakeOrder.Add(new OrderMakeModel()
+//            //    {
+//            //        Status = oRDER_STATUS,
+//            //        GoodName = goodName,
+//            //        SortNum = SortNum,
+//            //        StartTime = DateTime.Now.ToString("HH:mm:ss")
+//            //    });
+//            //}
+//        }
+
+//        private void GetStatus(string key, Action<object> action)
+//        {
+//            if (peripheralStatus.ContainsKey(key))
+//            {
+//                if (peripheralStatus[key] != null)
+//                {
+//                    action?.Invoke(peripheralStatus[key]);
+//                }
+//            }
+//        }
+
+//        public override void ReadData()
+//        {
+//            DataServer.GetInstance.morkS.Alarm.Clear();
+//            alarms.ForEach(item =>
+//            {
+//                DataServer.GetInstance.morkS.Alarm.Add(new AlarmModel()
+//                {
+//                    AlarmTime = $"{item.Date} {item.Time}",
+//                    AlarmMs = item.Info
+//                });
+//            });
+
+//            GetStatus("M0.1", new Action<object>((obj) =>
+//             {
+//                 if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 7)
+//                 {
+//                     Initing = !bools[0];
+//                     mORKS.InitComplete = bools[0];
+//                     mORKS.MoveScrewRodInitCom = bools[1];
+//                     mORKS.SacrificialVesselInitCom = bools[2];
+//                     mORKS.CylinderInitCom = bools[3];
+//                     mORKS.NoodleCookerInitCom = bools[4];
+//                     mORKS.RobotInitCom = bools[5];
+//                     mORKS.SiloInitCom = bools[6];
+
+//                     alarm.DeviceNoInit = !mORKS.InitComplete;
+//                     alarm.MoveScrewRodNoInit = !mORKS.MoveScrewRodInitCom;
+//                     alarm.SacrificialVesselNoInit = !mORKS.SacrificialVesselInitCom;
+//                     alarm.CylinderNoInit = !mORKS.CylinderInitCom;
+//                     alarm.NoodleCookerNoInit = !mORKS.NoodleCookerInitCom;
+//                     alarm.RobotNoInit = !mORKS.RobotInitCom;
+//                     alarm.SiloNoInit = !mORKS.SiloInitCom;
+//                 }
+//             }));
+
+//            GetStatus("M10.0", new Action<object>((obj) =>
+//            {
+//                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 2)
+//                {
+//                    mORKS.AllowInvertedFace = bools[0];
+//                    mORKS.DiningComplete = bools[1];
+//                }
+//            }));
+
+//            GetStatus("M10.4", new Action<object>((obj) =>
+//            {
+//                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+//                {
+//                    mORKS.DropBowlMechanismStatus = bools[0];
+//                }
+//            }));
+
+//            GetStatus("M12.2", new Action<object>((obj) =>
+//            {
+//                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+//                {
+//                    mORKS.FixedFlag = bools[0];
+//                }
+//            }));
+
+//            GetStatus("M13.5", new Action<object>((obj) =>
+//            {
+//                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+//                {
+//                    mORKS.SiloInPlace = bools[0];
+//                }
+//            }));
+
+//            GetStatus("M16.7", new Action<object>((obj) =>
+//            {
+//                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+//                {
+//                    mORKS.RobotTakeNoodleCom = bools[0];
+//                }
+//            }));
+
+//            GetStatus("M17.4", new Action<object>((obj) =>
+//            {
+//                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+//                {
+//                    mORKS.RobotStatus = bools[0];
+//                }
+//            }));
+
+//            GetStatus("M18.0", new Action<object>((obj) =>
+//            {
+//                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 5)
+//                {
+//                    mORKS.SmallBowlYesOrNoCheck = bools[0];
+//                    mORKS.LargeBowYesOrNoCheck = bools[1];
+//                    mORKS.TurntableLowPosition = bools[2];
+//                    mORKS.TurntableHighPosition = bools[3];
+//                    alarm.Supply2_LossBowl = !mORKS.SmallBowlYesOrNoCheck;
+//                    alarm.Supply1_LossBowl = !mORKS.LargeBowYesOrNoCheck;
+//                }
+//            }));
+
+//            GetStatus("VW17", new Action<object>((obj) =>
+//            {
+//                if (obj is ushort[] ushorts && ushorts.Length > 0 && ushorts.Length <= 1)
+//                {
+//                    var tt = ushorts.UshortsToBytes(true).BytesToUshorts();
+
+//                    for (byte i = 0; i < 6; i++)
+//                    {
+//                        if (RTrig.GetInstance($"CookNoodleCom{i + 1}").Start(tt[0].GetBitValue((byte)(i + 1))))
+//                        {
+//                            if (!string.IsNullOrEmpty(mORKS.CookNodelId[i]))
+//                                mORKS.CookNoodleCom[i] = true;
+//                        }
+//                    }
+
+//                    //mORKS.CookNoodleCom[0] = tt[0].GetBitValue(1);
+//                    //mORKS.CookNoodleCom[1] = tt[0].GetBitValue(2);
+//                    //mORKS.CookNoodleCom[2] = tt[0].GetBitValue(3);
+//                    //mORKS.CookNoodleCom[3] = tt[0].GetBitValue(4);
+//                    //mORKS.CookNoodleCom[4] = tt[0].GetBitValue(5);
+//                    //mORKS.CookNoodleCom[5] = tt[0].GetBitValue(6);
+//                    mORKS.Heating = ushorts[0].GetBitValue(15);
+//                    mORKS.TemperatureReaches = ushorts[0].GetBitValue(16);
+
+//                    alarm.MachineLowTemperature = !mORKS.TemperatureReaches;
+//                }
+
+//            }));
+
+//            GetStatus("VW770", new Action<object>((obj) =>
+//            {
+//                if (obj is ushort[] ushorts && ushorts.Length > 0 && ushorts.Length <= 1)
+//                {
+//                    mORKS.CurrentFeedbackLoc = ushorts[0];
+//                }
+
+//            }));
+
+//            mORKS.TakeBowlTaskCount = mORKS.TakeBowlTask.Count;
+//            mORKS.RBTakeNoodleTaskCount = mORKS.RBTakeNoodleTask.Count;
+
+//            for (int i = 0; i < Json<MorksPar>.Data.parSets.Count; i++)
+//            {
+//                mORKS.nsm.ElementAt(i).IsShield = Json<MorksPar>.Data.parSets.ElementAt(i).IsShield;
+//                mORKS.nsm.ElementAt(i).NoodleCookerStatus = mORKS.NoodleCookerStatus[i];
+//            }
+
+//        }
+
+//        /// <summary>
+//        /// 数据解析
+//        /// </summary>
+//        private void DataParse()
+//        {
+//            EventBus.EventBus.GetInstance().Subscribe<DoOrderEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBackHandle)
+//             {
+//                 if (@event == null) return;
+//                 if (@event is DoOrderEvent order)
+//                 {
+//                     mORKS.doOrderEvents.Add(order);
+//                     //mORKS.doe.TryAdd(order.MorkOrder.SuborderId, order);
+//                     if (order.MorkOrder.GoodBatchings == null) return;
+//                     if (mORKS.HistorySuborderId.Contains(order.MorkOrder.SuborderId)) return;
+//                     OrderCount++;
+//                     if (DateTime.Now.Subtract(Json<OrderStatistics>.Data.StatisticsTime).Days != 0)
+//                         Json<OrderStatistics>.Data.Count = 0;
+//                     Json<OrderStatistics>.Data.StatisticsTime = DateTime.Now;
+//                     Json<OrderStatistics>.Data.Count++;
+//                     Json<OrderStatistics>.Save();
+//                     OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT);
+//                     DeviceProcessLogShow($"接收到{OrderCount}次订单，订单ID：{order.MorkOrder.SuborderId}");
+//                     mORKS.HistorySuborderId.Add(order.MorkOrder.SuborderId);
+//                     foreach (var item in order.MorkOrder.GoodBatchings)
+//                     {
+//                         var res = orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId);
+//                         if (res != null)
+//                         {
+//                             if (ushort.TryParse(res.BatchingLoc, out ushort loc))
+//                             {
+//                                 if (loc >= 1 && loc <= 5)
+//                                 {
+//                                     if (mORKS.RBTakeNoodleTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+//                                         mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo()
+//                                         {
+//                                             GoodName = order.MorkOrder.GoodsName,
+//                                             Loc = ushort.Parse(res.BatchingLoc),
+//                                             SuborderId = order.MorkOrder.SuborderId,
+//                                             SortNum = order.MorkOrder.SortNum,
+//                                             BatchingId = res.BatchingId
+//                                         });
+//                                 }
+//                                 else if (loc >= 10 && loc <= 11)
+//                                 {
+//                                     int index = 0;
+//                                     if (recipeBoms != null)
+//                                     {
+//                                         index = Array.FindIndex(recipeBoms.RecipeIds?.ToArray(), p => p.RecipeId == order.MorkOrder.RecipeId);
+//                                         index++;
+//                                     }
+//                                     if (mORKS.TakeBowlTask.FirstOrDefault(p => p.SuborderId == order.MorkOrder.SuborderId) == null)
+//                                         mORKS.TakeBowlTask.Enqueue(new OrderLocInfo()
+//                                         {
+//                                             BatchingId = res.BatchingId,
+//                                             GoodName = order.MorkOrder.GoodsName,
+//                                             Loc = ushort.Parse(res.BatchingLoc),
+//                                             SuborderId = order.MorkOrder.SuborderId,
+//                                             SortNum = order.MorkOrder.SortNum,
+//                                             RecipeNumber = (index >= 1 && index <= 10) ? (ushort)index : (ushort)0
+//                                         });
+//                                 }
+//                             }
+//                         }
+//                     }
+//                 }
+//             });
+//        }
+
+//        public override void MainTask()
+//        {
+//            mORKS.AllowRun = mORKS.InitComplete;
+//            if (Json<KeepDataBase>.Data.IsVerify)
+//                IsHealth = mORKS.InitComplete;
+//            else
+//                IsHealth = true;
+
+//            TakeBowlTask();
+
+//            TakeNoodleTask();
+
+//            OutNoodleTask();
+
+//            SingleDetect();
+
+//            TurntableControl();
+//        }
+
+//        private void BowlControl(OrderLocInfo orderLocInfo)
+//        {
+//            if (orderLocInfo.Loc >= 10 && orderLocInfo.Loc <= 11)
+//            {
+//                mORKS.TakeBowlId = orderLocInfo.SuborderId;
+//                mORKS.TakeBowName = orderLocInfo.GoodName;
+//                mORKS.TakeBowSortNum = orderLocInfo.SortNum;
+//                TakeBowlControl(orderLocInfo.Loc);
+//                OrderChange(mORKS.TakeBowlId, ORDER_STATUS.COOKING);
+//                DeviceProcessLogShow($"订单【{mORKS.TakeBowlId}】执行取碗控制,位置:[{orderLocInfo.Loc}]");
+//                mORKS.TakeBowlInterlock = true;
+//            }
+//        }
+
+//        /// <summary>
+//        /// 取碗控制
+//        /// </summary>
+//        private void TakeBowlTask()
+//        {
+//            if (mORKS.AllowRun && mORKS.TakeBowlTask.Count > 0 && !mORKS.DropBowlMechanismStatus && !mORKS.TakeBowlInterlock)
+//            {
+//                ushort BowLoc = 0;
+//                var res = orderMaterialDelivery?.BatchingInfo?.Where(p => p.BatchingId == mORKS.TakeBowlTask.ElementAt(0).BatchingId).ToList();
+//                if (res == null || res?.Count == 0)
+//                {
+//                    if (mORKS.TakeBowlTask.TryDequeue(out OrderLocInfo orderLocInfo)) BowlControl(orderLocInfo);
+//                }
+//                else
+//                {
+//                    foreach (var item in res)
+//                    {
+//                        if (ushort.TryParse(item.BatchingLoc, out ushort loc))
+//                        {
+//                            if (loc == 10 && mORKS.SmallBowlYesOrNoCheck)
+//                            {
+//                                BowLoc = loc;
+//                                break;
+//                            }
+//                            else if (loc == 11 && mORKS.LargeBowYesOrNoCheck)
+//                            {
+//                                BowLoc = loc;
+//                                break;
+//                            }
+//                        }
+//                    }
+
+//                    if (BowLoc >= 10 && BowLoc <= 11)
+//                    {
+//                        if (mORKS.TakeBowlTask.TryDequeue(out OrderLocInfo orderLocInfo))
+//                        {
+//                            orderLocInfo.Loc = BowLoc;
+//                            BowlControl(orderLocInfo);
+//                        }
+//                    }
+//                }
+//            }
+//        }
+
+//        /// <summary>
+//        /// 转台控制
+//        /// </summary>
+//        private void TurntableControl()
+//        {
+//            if (Global.EnableLocalSimOrder)
+//            {
+//                //不做轮询，直接取面，模拟订单使用
+//                if (mORKS.SiloInPlace && !mORKS.Feeding && mORKS.InitComplete && !mORKS.AllowTakeNoodle && mORKS.RBTakeNoodleTask.Count > 0)
+//                {
+//                    if (mORKS.TurntableLowPosition)
+//                    {
+//                        TurntableStart(mORKS.RBTakeNoodleTask.ElementAt(0).Loc);
+//                        mORKS.TurntableLocLists.Clear();
+//                        mORKS.AllowTakeNoodle = true;
+//                        DeviceProcessLogShow($"控制机器人去转台【{mORKS.RBTakeNoodleTask.ElementAt(0).Loc}】号位置取面");
+//                    }
+//                }
+//            }
+//            else
+//            {
+//                //正常轮询
+//                if (Delay.GetInstance("到位检测延时").Start(mORKS.SiloInPlace, 2))
+//                {
+//                    if (mORKS.SiloInPlace && !mORKS.Feeding && mORKS.InitComplete && !mORKS.AllowTakeNoodle && mORKS.RBTakeNoodleTask.Count > 0)
+//                    {
+
+//                        var result = orderMaterialDelivery.BatchingInfo.Where(p => p.BatchingId == mORKS.RBTakeNoodleTask.ElementAt(0).BatchingId).ToList();
+//                        if (result != null)
+//                        {
+//                            var res = result.FirstOrDefault(P => P.BatchingLoc == mORKS.CurrentFeedbackLoc.ToString());
+//                            if (mORKS.TurntableLowPosition && res != null)
+//                            {
+//                                TurntableStart(mORKS.CurrentFeedbackLoc);
+//                                mORKS.TurntableLocLists.Clear();
+//                                mORKS.AllowTakeNoodle = true;
+//                                DeviceProcessLogShow($"控制机器人去转台【{mORKS.CurrentFeedbackLoc}】号位置取面");
+//                            }
+//                            else
+//                            {
+//                                if (!mORKS.TurntableInterlock)
+//                                {
+//                                    foreach (var item in result)
+//                                    {
+//                                        if (ushort.TryParse(item.BatchingLoc, out ushort loc))
+//                                        {
+//                                            if (mORKS.CurrentFeedbackLoc != loc && !mORKS.TurntableLocLists.Contains(loc))
+//                                            {
+//                                                if (!mORKS.TurntableLowPosition)
+//                                                {
+//                                                    DeviceProcessLogShow($"执行了转台启动互锁信号复位");
+//                                                }
+//                                                TurntableStart(loc);
+//                                                DeviceProcessLogShow($"没有物料检测的启动转台控制,转台位置：[{loc}]");
+//                                                break;
+//                                            }
+//                                            else if (mORKS.CurrentFeedbackLoc == loc && !mORKS.TurntableLocLists.Contains(loc)) mORKS.TurntableLocLists.Add(loc);
+//                                        }
+//                                    }
+//                                }
+//                            }
+//                        }
+//                        else DeviceProcessLogShow("未找到可用的物料信息");
+//                    }
+//                }
+//            }
+
+//            //补料中检测
+//            if (RTrig.GetInstance("mORKS.Feeding").Start(mORKS.Feeding))
+//            {
+//                mORKS.AllowTakeNoodle = false;
+//                mORKS.TakeNoodleInterlock = false;
+//            }
+
+//            //转台到位检测
+//            if (RTrig.GetInstance("TurntableInPlace").Start(mORKS.SiloInPlace && mORKS.CurrentLoc == mORKS.CurrentFeedbackLoc))
+//            {
+
+//                mORKS.TurntableInterlock = false;
+//                DeviceProcessLogShow("转台到位检测");
+//            }
+
+//            //补料完成检测
+//            if (RTrig.GetInstance("FeedComplete").Start(mORKS.FeedComplete))
+//            {
+//                if (!mORKS.AllowTakeNoodle && mORKS.TurntableLocLists.Count > 0)
+//                {
+//                    mORKS.TurntableLocLists.Clear();
+//                    mORKS.TurntableInterlock = false;
+//                    DeviceProcessLogShow("补料完成检测");
+//                }
+//            }
+
+//        }
+
+//        /// <summary>
+//        /// 取面任务
+//        /// </summary>
+//        private void TakeNoodleTask()
+//        {
+//            //取面控制
+//            if (mORKS.AllowRun && mORKS.RobotStatus && !mORKS.Feeding && !mORKS.RobotTaskInterlock && mORKS.AllowTakeNoodle && mORKS.SiloInPlace && !mORKS.TakeNoodleInterlock && mORKS.RBTakeNoodleTask.Count > 0)
+//            {
+//                if (mORKS.CurrentLoc == mORKS.CurrentFeedbackLoc)
+//                {
+//                    //int loc = Array.FindIndex(mORKS.NoodleCookerStatus, p => p == false);//查找煮面炉空闲位置
+//                    int loc = mORKS.nsm.ToList().FindIndex(p => p.NoodleCookerStatus == false && p.IsShield == false);//查找煮面炉空闲位置
+//                    if (loc >= 0 && loc <= 5)
+//                    {
+//                        //if (!Json<MorksPar>.Data.parSets.ElementAt(loc).IsShield)//检查该煮面篮是否被屏蔽
+//                        //{
+//                        if (mORKS.RBTakeNoodleTask.TryDequeue(out OrderLocInfo orderLocInfo))
+//                        {
+//                            //写入煮面时间
+//                            //List<ushort> values = new List<ushort>();
+//                            //values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
+//                            //values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
+//                            //WriteData($"VW{324 + (loc * 4)}", values.ToArray());
+//                            if (mORKS.CurrentFeedbackLoc >= 1 && mORKS.CurrentFeedbackLoc <= 5) {
+//                                var x = Json<MorksPar>.Data.DishLibraryParSets.FirstOrDefault(p => p.TextBlockContext == mORKS.CurrentFeedbackLoc.ToString());
+//                                if (x != null) {
+//                                    List<ushort> values = new List<ushort>();
+//                                    values.Add(x.Minute);
+//                                    values.Add(x.Second);
+//                                    WriteData($"VW{324 + (loc * 4)}", values.ToArray());
+//                                    DeviceProcessLogShow($"转盘位置[{mORKS.CurrentFeedbackLoc}]：写入煮面时间{x.Minute}分{x.Second}秒。");
+//                                }
+//                            }
+
+//                            mORKS.CurrentLoc = 0;
+//                            mORKS.CookNodelId[loc] = orderLocInfo.SuborderId;
+//                            mORKS.NoodleCookerStatus[loc] = true;
+//                            SetFallNoodleLoc((ushort)(loc + 1));
+//                            //机器人开始取面
+//                            OrderChange(orderLocInfo.SuborderId, ORDER_STATUS.COOKING);
+//                            DeviceProcessLogShow($"订单【{orderLocInfo.SuborderId}】,机器人倒面至【{loc + 1}】号煮面栏");
+
+//                            mORKS.TakeNoodleInterlock = true;
+//                        }
+//                    }
+//                }
+//            }
+//        }
+
+//        /// <summary>
+//        /// 出餐控制
+//        /// </summary>
+//        private void OutNoodleTask()
+//        {
+//            if (mORKS.AllowInvertedFace && mORKS.RobotTaskInterlock && !mORKS.TakeNoodleInterlock && mORKS.RobotStatus)
+//            {
+//                int loc = Array.FindIndex(mORKS.CookNodelId, p => p == mORKS.IngredientsCompleteId && p.Length > 0);
+//                if (loc >= 0 && loc <= 5)
+//                {
+//                    if (mORKS.CookNoodleCom[loc])
+//                    {
+//                        SetTakeNoodleLoc((ushort)(loc + 1));
+//                        mORKS.NoodleCookerStatus[loc] = false;
+//                        WriteData($"VW260", (ushort)0);//设置出汤时间
+//                        OrderChange(mORKS.IngredientsCompleteId, ORDER_STATUS.COMPLETED_COOK);
+//                        DeviceProcessLogShow($"订单【{mORKS.IngredientsCompleteId}】制作完成");
+//                        mORKS.CookCompleteFlatBit = true;
+//                        mORKS.OutMealId = mORKS.IngredientsCompleteId;
+//                        mORKS.OutMealName = mORKS.IngredientsCompleteName;
+//                        mORKS.OutMealSortNum = mORKS.IngredientsCompleteSortNum;
+//                        mORKS.IngredientsCompleteId = string.Empty;
+//                        mORKS.CookNodelId[loc] = string.Empty;
+//                        DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{mORKS.OutMealId}");
+//                        mORKS.CookNoodleCom[loc] = false;
+//                    }
+//                }
+//            }
+//        }
+
+//        /// <summary>
+//        /// 信号检测
+//        /// </summary>
+//        private void SingleDetect()
+//        {
+//            //允许倒面信号检测
+//            if (RTrig.GetInstance("AllowFallNoodle").Start(mORKS.AllowInvertedFace))
+//            {
+//                mORKS.IngredientsCompleteId = mORKS.TakeBowlId;
+//                mORKS.IngredientsCompleteName = mORKS.TakeBowName;
+//                mORKS.IngredientsCompleteSortNum = mORKS.TakeBowSortNum;
+//                mORKS.TakeBowSortNum = 0;
+//                mORKS.TakeBowlId = string.Empty;
+//                mORKS.TakeBowName = string.Empty;
+//                DeviceProcessLogShow($"碗到位，允许到面,{mORKS.IngredientsCompleteId}");
+//                mORKS.TakeBowlInterlock = false;
+//            }
+
+//            //取餐完成逻辑处理
+//            if (RTrig.GetInstance("CompleteChange1").Start(mORKS.DiningComplete) && mORKS.CookCompleteFlatBit == true)
+//            {
+//                OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
+//                DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成");
+//                WriteData("M10.1", false);
+//                DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
+//                VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
+//                //DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");
+//                //Plugin.GetInstance().GetPlugin<MQTTMgr>().Publish($"MORKS/VoiceCall/{DeviceId}", mORKS.OutMealSortNum.ToString());
+//                mORKS.CookCompleteFlatBit = false;
+//                mORKS.OutMealId = string.Empty;
+//                mORKS.OutMealName = string.Empty;
+//                mORKS.OutMealSortNum = 0;
+//            }
+
+//            //机器人取面完成信号检测
+//            if (RTrig.GetInstance("TakeNoodleComplete").Start(mORKS.RobotTakeNoodleCom))
+//            {
+//                mORKS.TakeNoodleInterlock = false;
+//                mORKS.AllowTakeNoodle = false;
+//                mORKS.TurntableInterlock = false;
+//                DeviceProcessLogShow("机器人取面完成信号检测");
+//            }
+
+//            int OutMealRequstCount = mORKS.CookNoodleCom.Where(p => p == true).ToList().Count;
+//            //int mlCount = mORKS.NoodleCookerStatus.Where(p => p == true).ToList().Count - Json<MorksPar>.Data.parSets.Where(x => x.IsShield == true).ToList().Count;
+//            int mlCount = mORKS.nsm.Where(p => p.NoodleCookerStatus == true && p.IsShield == false).ToList().Count;
+//            int index = Array.FindIndex(mORKS.CookNodelId, p => p == mORKS.IngredientsCompleteId);
+
+//            bool isok = index >= 0 && index < mORKS.CookNoodleCom.Length && mORKS.CookNoodleCom[index];
+
+//            mORKS.PriorityJudgment = Delay.GetInstance("取餐优先级判断").Start(mORKS.TurntableLocLists.Count > 0 && !mORKS.TurntableLowPosition, 4);
+//            //mORKS.RobotTaskInterlock = OutMealRequstCount > 0 && mORKS.AllowInvertedFace && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
+//            mORKS.RobotTaskInterlock = isok && mORKS.AllowInvertedFace && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
+
+
+//        }
+//        /// <summary>
+//        /// 语音提醒取餐
+//        /// </summary>
+//        /// <param name="meal"></param>
+//        private void WaitMeaLSpeak(string meal)
+//        {
+//            //VoiceAPI.m_SystemPlayWav(@"Vioce\电子提示音.wav");
+//            //Thread.Sleep(1000);
+//            //if (meal != null) mORKS.speech.Speak(meal);
+//            //VoiceAPI.m_SystemPlayWav(@"Vioce\取餐通知.wav");
+//        }
+
+//        #region PLC 控制函数
+
+//        private void WriteData(string address, object value)
+//        {
+//            EventBus.EventBus.GetInstance().Publish(new WriteModel() { DeviceId = DeviceId, Address = address, Value = value });
+//        }
+
+//        /// <summary>
+//        /// 设备初始化
+//        /// </summary>
+//        public async void DeviceInit()
+//        {
+//            WriteData("M0.0", true);
+//            await Task.Delay(1000);
+//            WriteData("M0.0", false);
+//        }
+
+//        /// <summary>
+//        /// 取碗控制
+//        /// </summary>
+//        /// <param name="loc"></param>
+//        private void TakeBowlControl(ushort loc)
+//        {
+//            if (loc == 10)//一次性碗
+//            {
+//                WriteData("M9.1", true);
+//            }
+//            else if (loc == 11)//大碗
+//            {
+//                WriteData("M9.0", true);
+//            }
+//        }
+
+//        /// <summary>
+//        /// 启动转台
+//        /// </summary>
+//        /// <param name="loc"></param>
+//        private void TurntableStart(ushort loc)
+//        {
+//            if (loc >= 1 && loc <= 5)
+//            {
+//                mORKS.CurrentLoc = loc;
+//                mORKS.TurntableInterlock = true;
+//                mORKS.TurntableLocLists.Add(loc);
+//                WriteData($"M13.{loc - 1}", true);
+//            }
+//        }
+
+//        /// <summary>
+//        /// 设置倒面位置
+//        /// </summary>
+//        /// <param name="loc"></param>
+//        private void SetFallNoodleLoc(ushort loc)
+//        {
+//            if (loc >= 1 && loc <= 6)
+//                WriteData($"M14.{loc - 1}", true);
+//        }
+
+//        /// <summary>
+//        /// 设置取面位置
+//        /// </summary>
+//        /// <param name="loc"></param>
+//        private void SetTakeNoodleLoc(ushort loc)
+//        {
+//            if (loc >= 1 && loc <= 6)
+//                WriteData($"M15.{loc - 1}", true);
+//        }
+
+
+
+//        public override void SimOrder()
+//        {
+//            EventBus.EventBus.GetInstance().Subscribe<MorksSimorderModel>(0, delegate (IEvent @event, EventCallBackHandle callBackHandle)
+//            {
+//                if (@event != null && @event is MorksSimorderModel msm)
+//                {
+//                    string guid = Guid.NewGuid().ToString();
+//                    if (msm.NoodleLoc >= 1 && msm.NoodleLoc <= 5)
+//                    {
+//                        mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { Loc = (ushort)msm.NoodleLoc, SuborderId = guid });
+//                        MessageLog.GetInstance.Show($"添加订单：面条位置【{(ushort)msm.NoodleLoc}】");
+//                    }
+
+//                    if (msm.Bowloc >= 10 && msm.Bowloc <= 11)
+//                    {
+//                        mORKS.TakeBowlTask.Enqueue(new OrderLocInfo() { Loc = (ushort)msm.Bowloc, SuborderId = guid });
+//                        MessageLog.GetInstance.Show($"添加订单：碗位置【{(ushort)msm.Bowloc}】");
+//                    }
+
+//                }
+//            });
+//        }
+//        #endregion
+
+
+//    }
+//}

From f90ff1ed54de4ec9538d731e58c190c3dcf882f7 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Wed, 17 May 2023 17:55:00 +0800
Subject: [PATCH 68/96] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=87=BA=E9=A4=90?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?=
 =?UTF-8?q?=EF=BC=9B2.=E5=88=A0=E9=99=A4=E5=87=BA=E7=A2=97=E5=87=BA?=
 =?UTF-8?q?=E9=A4=90=E8=AE=A2=E5=8D=95=E5=8F=B7=E7=BB=91=E5=AE=9A=E3=80=82?=
 =?UTF-8?q?3.=E6=96=B0=E5=A2=9E=E5=87=BA=E9=A4=90=E4=BA=92=E9=94=81?=
 =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E4=BF=AE=E6=94=B9=E5=A4=9A=E5=87=BA=E9=A4=90?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=8C=E6=97=B6=E5=8F=91=E5=87=BA=E8=A2=AB?=
 =?UTF-8?q?=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Control_MorkSUpgradedVer.cs               | 89 +++++++++++++------
 .../GVL_MorkSUpgradedVer.cs                   | 14 ++-
 2 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index f0c793d8..3716998c 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -411,6 +411,7 @@ namespace BPASmartClient.MorkSUpgradedVer
                      OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT);
                      DeviceProcessLogShow($"接收到{OrderCount}次订单，订单ID：{order.MorkOrder.SuborderId}");
                      mORKS.HistorySuborderId.Add(order.MorkOrder.SuborderId);
+                     mORKS.IDSortNums.TryAdd(order.MorkOrder.SuborderId, order.MorkOrder.SortNum);
                      foreach (var item in order.MorkOrder.GoodBatchings)
                      {
                          var res = orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId);
@@ -479,12 +480,17 @@ namespace BPASmartClient.MorkSUpgradedVer
         {
             if (orderLocInfo.Loc >= 10 && orderLocInfo.Loc <= 11)
             {
-                mORKS.TakeBowlId = orderLocInfo.SuborderId;
+                //mORKS.TakeBowlId = orderLocInfo.SuborderId;
                 mORKS.TakeBowName = orderLocInfo.GoodName;
                 mORKS.TakeBowSortNum = orderLocInfo.SortNum;
                 TakeBowlControl(orderLocInfo.Loc);
-                OrderChange(mORKS.TakeBowlId, ORDER_STATUS.COOKING);
-                DeviceProcessLogShow($"订单【{mORKS.TakeBowlId}】执行取碗控制,位置:[{orderLocInfo.Loc}]");
+
+                //OrderChange(mORKS.TakeBowlId, ORDER_STATUS.COOKING);
+                OrderChange(orderLocInfo.SuborderId, ORDER_STATUS.COOKING);
+
+                //DeviceProcessLogShow($"订单【{mORKS.TakeBowlId}】执行取碗控制,位置:[{orderLocInfo.Loc}]");
+                DeviceProcessLogShow($"订单【{orderLocInfo.SuborderId}】执行取碗控制,位置:[{orderLocInfo.Loc}]");
+
                 mORKS.TakeBowlInterlock = true;
             }
         }
@@ -661,7 +667,6 @@ namespace BPASmartClient.MorkSUpgradedVer
                                     DeviceProcessLogShow($"转盘位置[{mORKS.CurrentFeedbackLoc}]：写入煮面时间{x.Minute}分{x.Second}秒。");
                                 }
                             }
-
                             mORKS.CurrentLoc = 0;
                             mORKS.CookNodelId[loc] = orderLocInfo.SuborderId;
                             mORKS.NoodleCookerStatus[loc] = true;
@@ -682,27 +687,49 @@ namespace BPASmartClient.MorkSUpgradedVer
         /// </summary>
         private void OutNoodleTask()
         {
-            if (mORKS.AllowInvertedFace && mORKS.RobotTaskInterlock && !mORKS.TakeNoodleInterlock && mORKS.RobotStatus)
-            {
-                int loc = Array.FindIndex(mORKS.CookNodelId, p => p == mORKS.IngredientsCompleteId && p.Length > 0);
-                if (loc >= 0 && loc <= 5)
-                {
-                    if (mORKS.CookNoodleCom[loc])
-                    {
-                        SetTakeNoodleLoc((ushort)(loc + 1));
-                        mORKS.NoodleCookerStatus[loc] = false;
-                        WriteData($"VW260", (ushort)0);//设置出汤时间
-                        OrderChange(mORKS.IngredientsCompleteId, ORDER_STATUS.COMPLETED_COOK);
-                        DeviceProcessLogShow($"订单【{mORKS.IngredientsCompleteId}】制作完成");
-                        mORKS.CookCompleteFlatBit = true;
-                        mORKS.OutMealId = mORKS.IngredientsCompleteId;
-                        mORKS.OutMealName = mORKS.IngredientsCompleteName;
-                        mORKS.OutMealSortNum = mORKS.IngredientsCompleteSortNum;
-                        mORKS.IngredientsCompleteId = string.Empty;
-                        mORKS.CookNodelId[loc] = string.Empty;
-                        DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{mORKS.OutMealId}");
-                        mORKS.CookNoodleCom[loc] = false;
-                    }
+            if (mORKS.AllowInvertedFace && mORKS.RobotTaskInterlock && !mORKS.RobotOutDinnigLock && !mORKS.TakeNoodleInterlock && mORKS.RobotStatus)
+            {
+                #region 修改之前的代码
+                //int loc = Array.FindIndex(mORKS.CookNodelId, p => p == mORKS.IngredientsCompleteId && p.Length > 0);
+                //if (loc >= 0 && loc <= 5)
+                //{
+                //    if (mORKS.CookNoodleCom[loc])
+                //    {
+                //        SetTakeNoodleLoc((ushort)(loc + 1));
+                //        mORKS.NoodleCookerStatus[loc] = false;
+                //        WriteData($"VW260", (ushort)0);//设置出汤时间
+                //        OrderChange(mORKS.IngredientsCompleteId, ORDER_STATUS.COMPLETED_COOK);
+                //        DeviceProcessLogShow($"订单【{mORKS.IngredientsCompleteId}】制作完成");
+                //        mORKS.CookCompleteFlatBit = true;
+                //        mORKS.OutMealId = mORKS.IngredientsCompleteId;
+                //        mORKS.OutMealName = mORKS.IngredientsCompleteName;
+                //        mORKS.OutMealSortNum = mORKS.IngredientsCompleteSortNum;
+                //        mORKS.IngredientsCompleteId = string.Empty;
+                //        mORKS.CookNodelId[loc] = string.Empty;
+                //        DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{mORKS.OutMealId}");
+                //        mORKS.CookNoodleCom[loc] = false;
+                //    }
+                //} 
+                #endregion
+
+                for (int loc = 0; loc < mORKS.CookNodelId.Length; loc++) {
+                    
+                        if (mORKS.CookNoodleCom[loc]&&!mORKS.RobotOutDinnigLock) {
+                            SetTakeNoodleLoc((ushort)(loc + 1));
+                            mORKS.NoodleCookerStatus[loc] = false;
+                            WriteData($"VW260", (ushort)0);//设置出汤时间
+                            OrderChange(mORKS.CookNodelId[loc], ORDER_STATUS.COMPLETED_COOK);
+                            DeviceProcessLogShow($"订单【{mORKS.CookNodelId[loc]}】制作完成");
+                            mORKS.CookCompleteFlatBit = true;
+                            mORKS.OutMealId = mORKS.CookNodelId[loc];
+                            mORKS.OutMealName = mORKS.IngredientsCompleteName;
+                            mORKS.OutMealSortNum = mORKS.IngredientsCompleteSortNum;
+                            mORKS.IngredientsCompleteId = string.Empty;
+                            mORKS.CookNodelId[loc] = string.Empty;
+                            DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{mORKS.OutMealId}");
+                            mORKS.CookNoodleCom[loc] = false;
+                            mORKS.RobotOutDinnigLock = true;
+                        }
                 }
             }
         }
@@ -715,14 +742,16 @@ namespace BPASmartClient.MorkSUpgradedVer
             //允许倒面信号检测
             if (RTrig.GetInstance("AllowFallNoodle").Start(mORKS.AllowInvertedFace))
             {
-                mORKS.IngredientsCompleteId = mORKS.TakeBowlId;
+                //mORKS.IngredientsCompleteId = mORKS.TakeBowlId;
                 mORKS.IngredientsCompleteName = mORKS.TakeBowName;
                 mORKS.IngredientsCompleteSortNum = mORKS.TakeBowSortNum;
                 mORKS.TakeBowSortNum = 0;
                 mORKS.TakeBowlId = string.Empty;
                 mORKS.TakeBowName = string.Empty;
-                DeviceProcessLogShow($"碗到位，允许到面,{mORKS.IngredientsCompleteId}");
+                //DeviceProcessLogShow($"碗到位，允许到面,{mORKS.IngredientsCompleteId}");
+                DeviceProcessLogShow($"碗到位，允许倒面。");
                 mORKS.TakeBowlInterlock = false;
+                mORKS.RobotOutDinnigLock = false;
             }
 
             //取餐完成逻辑处理
@@ -731,6 +760,9 @@ namespace BPASmartClient.MorkSUpgradedVer
                 OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
                 DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成");
                 WriteData("M10.1", false);
+                int takeDinningNum;
+                mORKS.IDSortNums.TryRemove(mORKS.OutMealId, out takeDinningNum);
+                mORKS.OutMealSortNum = takeDinningNum;
                 DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
                 VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
                 //DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");
@@ -759,7 +791,8 @@ namespace BPASmartClient.MorkSUpgradedVer
 
             mORKS.PriorityJudgment = Delay.GetInstance("取餐优先级判断").Start(mORKS.TurntableLocLists.Count > 0 && !mORKS.TurntableLowPosition, 4);
             //mORKS.RobotTaskInterlock = OutMealRequstCount > 0 && mORKS.AllowInvertedFace && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
-            mORKS.RobotTaskInterlock = isok && mORKS.AllowInvertedFace && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
+            //mORKS.RobotTaskInterlock = isok && mORKS.AllowInvertedFace && (mlCount >= 2 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
+            mORKS.RobotTaskInterlock = mORKS.AllowInvertedFace && (mlCount >= 6 || mORKS.RBTakeNoodleTask.Count == 0 || mORKS.PriorityJudgment);
 
 
         }
diff --git a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
index 72a1f0b9..044a51e2 100644
--- a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
@@ -59,6 +59,11 @@ namespace BPASmartClient.MorkSUpgradedVer
         /// </summary>
         [VariableMonitor("转台互锁信号")]
         public bool TurntableInterlock { get; set; }
+        /// <summary>
+        /// 机器人出餐互锁
+        /// </summary>
+        [VariableMonitor("机器人出餐互锁")]
+        public bool RobotOutDinnigLock { get; set; }
 
 
         /// <summary>
@@ -103,6 +108,11 @@ namespace BPASmartClient.MorkSUpgradedVer
         /// </summary>
         public ConcurrentQueue<OrderLocInfo> TakeBowlTask { get; set; } = new ConcurrentQueue<OrderLocInfo>();
 
+        /// <summary>
+        /// 订单ID对应的排序号字典
+        /// </summary>
+        public ConcurrentDictionary<string, int> IDSortNums { get; set; } = new ConcurrentDictionary<string, int>();
+
 
         public List<DoOrderEvent> doOrderEvents { get; set; } = new List<DoOrderEvent>();
 
@@ -123,7 +133,7 @@ namespace BPASmartClient.MorkSUpgradedVer
         /// </summary>
         public string TakeBowName { get; set; } = string.Empty;
         /// <summary>
-        /// 配料完成订单名称
+        /// 取碗完成订单排序号
         /// </summary>
         public int TakeBowSortNum { get; set; } = 0;
 
@@ -137,7 +147,7 @@ namespace BPASmartClient.MorkSUpgradedVer
         /// </summary>
         public string IngredientsCompleteName { get; set; } = string.Empty;
         /// <summary>
-        /// 配料完成订单名称
+        /// 配料完成订单排序号
         /// </summary>
         public int IngredientsCompleteSortNum { get; set; } = 0;
 

From 282d1efbed75cd740a73e9a4ffad89d482fa42c4 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Thu, 18 May 2023 09:59:07 +0800
Subject: [PATCH 69/96] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E9=A4=90?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=BA=8F=E5=8F=B7=E6=9F=A5=E6=89=BE=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Control_MorkSUpgradedVer.cs                           | 8 ++++----
 BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs   | 6 ------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index 3716998c..6841e9c2 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -411,7 +411,6 @@ namespace BPASmartClient.MorkSUpgradedVer
                      OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT);
                      DeviceProcessLogShow($"接收到{OrderCount}次订单，订单ID：{order.MorkOrder.SuborderId}");
                      mORKS.HistorySuborderId.Add(order.MorkOrder.SuborderId);
-                     mORKS.IDSortNums.TryAdd(order.MorkOrder.SuborderId, order.MorkOrder.SortNum);
                      foreach (var item in order.MorkOrder.GoodBatchings)
                      {
                          var res = orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId);
@@ -760,9 +759,10 @@ namespace BPASmartClient.MorkSUpgradedVer
                 OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
                 DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成");
                 WriteData("M10.1", false);
-                int takeDinningNum;
-                mORKS.IDSortNums.TryRemove(mORKS.OutMealId, out takeDinningNum);
-                mORKS.OutMealSortNum = takeDinningNum;
+
+                var orderEvent= mORKS.doOrderEvents.FirstOrDefault(order => order.MorkOrder.SuborderId == mORKS.OutMealId);
+                mORKS.OutMealSortNum = orderEvent?.MorkOrder.SortNum ?? 0;
+
                 DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
                 VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
                 //DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");
diff --git a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
index 044a51e2..638c1cda 100644
--- a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs
@@ -108,12 +108,6 @@ namespace BPASmartClient.MorkSUpgradedVer
         /// </summary>
         public ConcurrentQueue<OrderLocInfo> TakeBowlTask { get; set; } = new ConcurrentQueue<OrderLocInfo>();
 
-        /// <summary>
-        /// 订单ID对应的排序号字典
-        /// </summary>
-        public ConcurrentDictionary<string, int> IDSortNums { get; set; } = new ConcurrentDictionary<string, int>();
-
-
         public List<DoOrderEvent> doOrderEvents { get; set; } = new List<DoOrderEvent>();
 
         public ConcurrentDictionary<string, DoOrderEvent> doe { get; set; } = new ConcurrentDictionary<string, DoOrderEvent>();

From 03e6d090da84ab508270f2e0940bf46170fa7dc8 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Fri, 19 May 2023 19:03:33 +0800
Subject: [PATCH 70/96] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=87=BA=E6=B1=A4?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=AE=BE=E5=AE=9A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkS/View/ParSet.xaml         | 130 +++++++++++++++++-
 .../ViewModel/ParSetViewModel.cs              |  65 ++++++++-
 2 files changed, 191 insertions(+), 4 deletions(-)

diff --git a/BPASmartClient.MorkS/View/ParSet.xaml b/BPASmartClient.MorkS/View/ParSet.xaml
index b29f4e22..615872fe 100644
--- a/BPASmartClient.MorkS/View/ParSet.xaml
+++ b/BPASmartClient.MorkS/View/ParSet.xaml
@@ -8,7 +8,7 @@
     xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
     xmlns:vm="clr-namespace:BPASmartClient.MorkS.ViewModel"
     Name="参数设置界面"
-    d:DesignHeight="450"
+    d:DesignHeight="800"
     d:DesignWidth="800"
     mc:Ignorable="d">
 
@@ -79,6 +79,8 @@
             <Grid.RowDefinitions>
                 <RowDefinition />
                 <RowDefinition Height="150" />
+                <RowDefinition Height="75" />
+                <RowDefinition Height="75" />
             </Grid.RowDefinitions>
 
             <StackPanel Orientation="Horizontal">
@@ -325,6 +327,132 @@
                     Style="{StaticResource TextBlockStyle}"
                     Text="(个)" />
             </StackPanel>
+            <!--抽汤时间设定-->
+            <WrapPanel Grid.Row="2" Orientation="Horizontal">
+                <!--间隔时间设定-->
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock
+                    Margin="10,0,0,0"
+                    FontSize="21"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="间隔时间设定:" />
+                    <TextBox
+                    Width="100"
+                    Margin="10,0,0,0"
+                    VerticalAlignment="Center"
+                    Background="Transparent"
+                    BorderBrush="#FF23CACA"
+                    CaretBrush="Aqua"
+                    FontFamily="楷体"
+                    FontSize="21"
+                    Foreground="#ff34f7f7"
+                    Text="{Binding IntervalTime}" />
+                    <TextBlock
+                    Margin="10,0,0,0"
+                    FontSize="21"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="(秒)" />
+                </StackPanel>
+                <!--反转抽汤时间设定-->
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock
+                    Margin="10,0,0,0"
+                    FontSize="21"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="反转抽汤时间设定:" />
+                    <TextBox
+                    Width="100"
+                    Margin="10,0,0,0"
+                    VerticalAlignment="Center"
+                    Background="Transparent"
+                    BorderBrush="#FF23CACA"
+                    CaretBrush="Aqua"
+                    FontFamily="楷体"
+                    FontSize="21"
+                    Foreground="#ff34f7f7"
+                    Text="{Binding BackwardSoupSootTime}" />
+                    <TextBlock
+                    Margin="10,0,0,0"
+                    FontSize="21"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="(秒)" />
+                </StackPanel>
+                <!--翻转后再次出汤时间设定-->
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock
+                    Margin="10,0,0,0"
+                    FontSize="21"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="翻转后再次出汤时间设定:" />
+                    <TextBox
+                    Width="100"
+                    Margin="10,0,0,0"
+                    VerticalAlignment="Center"
+                    Background="Transparent"
+                    BorderBrush="#FF23CACA"
+                    CaretBrush="Aqua"
+                    FontFamily="楷体"
+                    FontSize="21"
+                    Foreground="#ff34f7f7"
+                    Text="{Binding BackwardedOutSoupTime}" />
+                    <TextBlock
+                    Margin="10,0,0,0"
+                    FontSize="21"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="(秒)" />
+                </StackPanel>
+                <!--未反转抽汤情况下时间设定-->
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock
+                    Margin="10,0,0,0"
+                    FontSize="21"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="未反转抽汤情况下时间设定:" />
+                    <TextBox
+                    Width="100"
+                    Margin="10,0,0,0"
+                    VerticalAlignment="Center"
+                    Background="Transparent"
+                    BorderBrush="#FF23CACA"
+                    CaretBrush="Aqua"
+                    FontFamily="楷体"
+                    FontSize="21"
+                    Foreground="#ff34f7f7"
+                    Text="{Binding UnBackwardSoupSootTime}" />
+                    <TextBlock
+                    Margin="10,0,0,0"
+                    FontSize="21"
+                    Style="{StaticResource TextBlockStyle}"
+                    Text="(秒)" />
+                </StackPanel>
+            </WrapPanel>
+            <!--抽汤调试按钮-->
+            <StackPanel Grid.Row="3" Orientation="Horizontal">
+                <Button
+                    Margin="5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Command="{Binding SoupSootForwardCommand}"
+                    Content="抽汤正转"
+                    Foreground="Aqua"
+                    Style="{StaticResource ButtonStyle}" />
+                <Button
+                    Margin="5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Command="{Binding SoupSootBackwardCommand}"
+                    Content="抽汤反转"
+                    Foreground="Aqua"
+                    Style="{StaticResource ButtonStyle}" />
+                <Button
+                    Margin="5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Command="{Binding SoupSootStopCommand}"
+                    Content="抽汤停止"
+                    Foreground="Aqua"
+                    Style="{StaticResource ButtonStyle}" />
+            </StackPanel>
         </Grid>
 
     </Grid>
diff --git a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
index 4b0d3c48..90092641 100644
--- a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
+++ b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
@@ -10,6 +10,7 @@ using BPASmartClient.Model;
 using BPASmartClient.MorkS.Model;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.Input;
+using Org.BouncyCastle.Utilities;
 
 namespace BPASmartClient.MorkS.ViewModel
 {
@@ -18,8 +19,14 @@ namespace BPASmartClient.MorkS.ViewModel
         public ParSetViewModel()
         {
             SaveInfoCommand = new RelayCommand(SaveSettingData);
+            SoupSootForwardCommand=new RelayCommand(SoupSootForward);
+            SoupSootBackwardCommand = new RelayCommand(SoupSootBackward);
+            SoupSootStopCommand = new RelayCommand(SoupSootStop);
+
 
             ActionManage.GetInstance.Register(SaveSettingData, "初始化设定煮面时间");
+
+
             CommandStart = new RelayCommand(async ()=>
             {
                 ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M0.6", Value = true });
@@ -48,15 +55,41 @@ namespace BPASmartClient.MorkS.ViewModel
 
         public RelayCommand SaveInfoCommand { get; set; }
         public RelayCommand CommandStart { get; set; }
-
+        public RelayCommand SoupSootForwardCommand { get; set; }
+        public RelayCommand SoupSootBackwardCommand { get; set; }
+        public RelayCommand SoupSootStopCommand { get; set; }
+        #region 时间设定
+        /// <summary>
+        /// 间隔时间设定
+        /// </summary>
+        public float IntervalTime { get { return _IntervalTime; } set { _IntervalTime = value; OnPropertyChanged(); } }
+        private float _IntervalTime;
+        /// <summary>
+        /// 反转抽汤时间设定
+        /// </summary>
+        public float BackwardSoupSootTime { get { return _BackwardSoupSootTime; } set { _BackwardSoupSootTime = value; OnPropertyChanged(); } }
+        private float _BackwardSoupSootTime;
+        /// <summary>
+        /// 反转过后再次出汤时间设定
+        /// </summary>
+        public float BackwardedOutSoupTime { get { return _BackwardedOutSoupTime; } set { _BackwardedOutSoupTime = value; OnPropertyChanged(); } }
+        private float _BackwardedOutSoupTime;
+        /// <summary>
+        /// 未反转抽汤下时间设定
+        /// </summary>
+        public float UnBackwardSoupSootTime { get { return _UnBackwardSoupSootTime; } set { _UnBackwardSoupSootTime = value; OnPropertyChanged(); } }
+        private float _UnBackwardSoupSootTime;
         //public RelayCommand VoicePlayTest { get; set; }
-        
-        public ObservableCollection<ParSet> parSets { get; set; } = Json<MorksPar>.Data.parSets;
+
 
         /// <summary>
         /// 加汤时间设置
         /// </summary>
         public float AddSoup { get { return Json<MorksPar>.Data.AddSoupTime; } set { Json<MorksPar>.Data.AddSoupTime = value; OnPropertyChanged(); } }
+        #endregion
+
+
+        public ObservableCollection<ParSet> parSets { get; set; } = Json<MorksPar>.Data.parSets;
         public int OpenUseNumber { get { return Json<MorksPar>.Data.InvertedNoodles_OpenBusyNum; } set { Json<MorksPar>.Data.InvertedNoodles_OpenBusyNum = value; OnPropertyChanged(); } }
         public ObservableCollection<ParSet> DishLibraryParSets { get; set; } = Json<MorksPar>.Data.DishLibraryParSets;
 
@@ -85,6 +118,32 @@ namespace BPASmartClient.MorkS.ViewModel
             ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2282", Value = times });
             ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M260.0", Value = bools.ToArray() });
             Json<MorksPar>.Save();
+
+            WriteTimeSet(IntervalTime);
+            WriteTimeSet(BackwardSoupSootTime);
+            WriteTimeSet(BackwardedOutSoupTime);
+            WriteTimeSet(UnBackwardSoupSootTime);
+        }
+
+        private void WriteTimeSet(float TimePar) {
+            ushort paras = Convert.ToUInt16(TimePar * 10);
+            ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2282", Value = paras });
+        }
+        
+        private async void SoupSootForward() {
+            ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.0", Value = true });
+            await Task.Delay((int)DelayTime * 1000);
+            ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.0", Value = false });
+        }
+        private async void SoupSootBackward() {
+            ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.1", Value = true });
+            await Task.Delay((int)DelayTime * 1000);
+            ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.1", Value = false });
+        }
+        private async void SoupSootStop() {
+            ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.2", Value = true });
+            await Task.Delay((int)DelayTime * 1000);
+            ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.2", Value = false });
         }
     }
 }

From e2a02e06671a2cbb4c7489e04c2206c4aa7265f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Sat, 20 May 2023 14:34:39 +0800
Subject: [PATCH 71/96] =?UTF-8?q?=E7=85=AE=E9=9D=A2=E6=9C=BA=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkS/Model/MorksPar.cs        |  20 +-
 BPASmartClient.MorkS/View/ParSet.xaml         | 524 +++++++++---------
 .../ViewModel/ParSetViewModel.cs              |  51 +-
 3 files changed, 325 insertions(+), 270 deletions(-)

diff --git a/BPASmartClient.MorkS/Model/MorksPar.cs b/BPASmartClient.MorkS/Model/MorksPar.cs
index 61a8f21c..2e53c17f 100644
--- a/BPASmartClient.MorkS/Model/MorksPar.cs
+++ b/BPASmartClient.MorkS/Model/MorksPar.cs
@@ -16,12 +16,30 @@ namespace BPASmartClient.MorkS.Model
         /// <summary>
         /// 加汤时间，单位秒
         /// </summary>
-        public float AddSoupTime { get; set; } = 2;
+        public ushort AddSoupTime { get; set; } = 2;
+
         /// <summary>
         /// 倒面条件 煮面口忙碌数量
         /// </summary>
         public int InvertedNoodles_OpenBusyNum { get; set; } = 5;
 
+        /// <summary>
+        /// 间隔时间设定
+        /// </summary>
+        public ushort IntervalTime { get; set; }
+        /// <summary>
+        /// 反转抽汤时间设定
+        /// </summary>
+        public ushort BackwardSoupSootTime { get; set; }
+        /// <summary>
+        /// 反转过后再次出汤时间设定
+        /// </summary>
+        public ushort BackwardedOutSoupTime { get; set; }
+        /// <summary>
+        /// 未反转抽汤下时间设定
+        /// </summary>
+        public ushort UnBackwardSoupSootTime { get; set; }
+
         public ObservableCollection<ParSet> DishLibraryParSets { get; set; } = new ObservableCollection<ParSet>();
     }
 }
diff --git a/BPASmartClient.MorkS/View/ParSet.xaml b/BPASmartClient.MorkS/View/ParSet.xaml
index 615872fe..d816dc69 100644
--- a/BPASmartClient.MorkS/View/ParSet.xaml
+++ b/BPASmartClient.MorkS/View/ParSet.xaml
@@ -13,7 +13,7 @@
     mc:Ignorable="d">
 
     <UserControl.DataContext>
-        <vm:ParSetViewModel/>
+        <vm:ParSetViewModel />
     </UserControl.DataContext>
 
     <UserControl.Resources>
@@ -78,53 +78,53 @@
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>
                 <RowDefinition />
-                <RowDefinition Height="150" />
-                <RowDefinition Height="75" />
-                <RowDefinition Height="75" />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
             </Grid.RowDefinitions>
 
             <StackPanel Orientation="Horizontal">
-                <!--煮面口参数设置-->
+                <!--  煮面口参数设置  -->
                 <ItemsControl Grid.Row="0" ItemsSource="{Binding parSets}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock Style="{StaticResource TextBlockStyle}" Text="{Binding TextBlockContext}" />
                                 <TextBox
-                                Width="100"
-                                Margin="10,0,0,0"
-                                VerticalAlignment="Center"
-                                Background="Transparent"
-                                BorderBrush="#FF23CACA"
-                                CaretBrush="Aqua"
-                                FontFamily="楷体"
-                                FontSize="21"
-                                Foreground="#ff34f7f7"
-                                Text="{Binding Minute}" />
+                                    Width="100"
+                                    Margin="10,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    BorderBrush="#FF23CACA"
+                                    CaretBrush="Aqua"
+                                    FontFamily="楷体"
+                                    FontSize="21"
+                                    Foreground="#ff34f7f7"
+                                    Text="{Binding Minute}" />
                                 <TextBlock Style="{StaticResource TextBlockStyle}" Text="（分）" />
                                 <TextBox
-                                Width="100"
-                                Margin="0,10"
-                                VerticalAlignment="Center"
-                                Background="Transparent"
-                                BorderBrush="#FF23CACA"
-                                CaretBrush="Aqua"
-                                FontFamily="楷体"
-                                FontSize="21"
-                                Foreground="#ff34f7f7"
-                                Text="{Binding Second}" />
+                                    Width="100"
+                                    Margin="0,10"
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    BorderBrush="#FF23CACA"
+                                    CaretBrush="Aqua"
+                                    FontFamily="楷体"
+                                    FontSize="21"
+                                    Foreground="#ff34f7f7"
+                                    Text="{Binding Second}" />
                                 <TextBlock Style="{StaticResource TextBlockStyle}" Text="（秒）" />
 
                                 <CheckBox
-                                Height="20"
-                                Margin="10"
-                                VerticalAlignment="Center"
-                                Background="#FF2AB2E7"
-                                Content="{Binding CheckBoxContext}"
-                                FontSize="14"
-                                Foreground="#00c2f4"
-                                IsChecked="{Binding IsShield}"
-                                Template="{StaticResource CbTemplate}" />
+                                    Height="20"
+                                    Margin="10"
+                                    VerticalAlignment="Center"
+                                    Background="#FF2AB2E7"
+                                    Content="{Binding CheckBoxContext}"
+                                    FontSize="14"
+                                    Foreground="#00c2f4"
+                                    IsChecked="{Binding IsShield}"
+                                    Template="{StaticResource CbTemplate}" />
 
                             </StackPanel>
                         </DataTemplate>
@@ -136,10 +136,10 @@
                         <RowDefinition />
                     </Grid.RowDefinitions>
 
-                    <Grid 
-                    Grid.Row="0"
-                    Margin="100,10,0,0"
-                    Background="#ff0C255F">
+                    <Grid
+                        Grid.Row="0"
+                        Margin="100,10,0,0"
+                        Background="#ff0C255F">
 
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition />
@@ -148,36 +148,36 @@
                         </Grid.ColumnDefinitions>
 
                         <TextBlock
-                        Grid.Column="0"
-                        FontSize="24"
-                        Style="{StaticResource TitleTextblockStyle}"
-                        Text="库位序号" />
+                            Grid.Column="0"
+                            FontSize="24"
+                            Style="{StaticResource TitleTextblockStyle}"
+                            Text="库位序号" />
 
                         <TextBlock
-                        Grid.Column="1"
-                        FontSize="24"
-                        Style="{StaticResource TitleTextblockStyle}"
-                        Text="煮时间(分)" />
+                            Grid.Column="1"
+                            FontSize="24"
+                            Style="{StaticResource TitleTextblockStyle}"
+                            Text="煮时间(分)" />
 
                         <TextBlock
-                        Grid.Column="2"
-                        FontSize="24"
-                        Style="{StaticResource TitleTextblockStyle}"
-                        Text="煮时间(秒)" />
+                            Grid.Column="2"
+                            FontSize="24"
+                            Style="{StaticResource TitleTextblockStyle}"
+                            Text="煮时间(秒)" />
 
                         <Border
-                        Grid.Column="0"
-                        Grid.ColumnSpan="4"
-                        BorderBrush="{StaticResource bordColor}"
-                        BorderThickness="1,1,1,1" />
+                            Grid.Column="0"
+                            Grid.ColumnSpan="4"
+                            BorderBrush="{StaticResource bordColor}"
+                            BorderThickness="1,1,1,1" />
                         <Border
-                        Grid.Column="1"
-                        BorderBrush="{StaticResource bordColor}"
-                        BorderThickness="1,0,1,0" />
+                            Grid.Column="1"
+                            BorderBrush="{StaticResource bordColor}"
+                            BorderThickness="1,0,1,0" />
                         <Border
-                        Grid.Column="3"
-                        BorderBrush="{StaticResource bordColor}"
-                        BorderThickness="1,0,1,0" />
+                            Grid.Column="3"
+                            BorderBrush="{StaticResource bordColor}"
+                            BorderThickness="1,0,1,0" />
 
 
                     </Grid>
@@ -188,17 +188,17 @@
                                     <DataTemplate>
                                         <Grid Name="gr">
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="157"/>
-                                                <ColumnDefinition Width="1*"/>
-                                                <ColumnDefinition Width="1*"/>
+                                                <ColumnDefinition Width="157" />
+                                                <ColumnDefinition Width="1*" />
+                                                <ColumnDefinition Width="1*" />
                                             </Grid.ColumnDefinitions>
 
                                             <TextBlock
-                                            Grid.Column="0"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            FontSize="18"
-                                            Text="{Binding TextBlockContext}" />
+                                                Grid.Column="0"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                FontSize="18"
+                                                Text="{Binding TextBlockContext}" />
 
                                             <!--<ComboBox
                                             Grid.Column="1"
@@ -212,31 +212,31 @@
                                             SelectedIndex="{Binding LocDishType}" />-->
 
                                             <Border
-                                            Grid.Column="0"
-                                            Grid.ColumnSpan="3"
-                                            BorderBrush="{StaticResource bordColor}"
-                                            BorderThickness="1,0,1,1"></Border>
-                                            
+                                                Grid.Column="0"
+                                                Grid.ColumnSpan="3"
+                                                BorderBrush="{StaticResource bordColor}"
+                                                BorderThickness="1,0,1,1" />
+
                                             <Border
-                                            Grid.Column="1"
-                                            BorderBrush="{StaticResource bordColor}"
-                                            BorderThickness="1,0,1,0">
+                                                Grid.Column="1"
+                                                BorderBrush="{StaticResource bordColor}"
+                                                BorderThickness="1,0,1,0">
                                                 <TextBox
-                                            Grid.Column="1"
-                                            FontSize="18"
-                                            Style="{StaticResource InputTextboxStyle}"
-                                            Text="{Binding Minute}" />
+                                                    Grid.Column="1"
+                                                    FontSize="18"
+                                                    Style="{StaticResource InputTextboxStyle}"
+                                                    Text="{Binding Minute}" />
                                             </Border>
-                                            
+
                                             <Border
-                                            Grid.Column="2"
-                                            BorderBrush="{StaticResource bordColor}"
-                                            BorderThickness="1,0,1,0">
+                                                Grid.Column="2"
+                                                BorderBrush="{StaticResource bordColor}"
+                                                BorderThickness="1,0,1,0">
                                                 <TextBox
-                                            Grid.Column="2"
-                                            FontSize="18"
-                                            Style="{StaticResource InputTextboxStyle}"
-                                            Text="{Binding Second}" />
+                                                    Grid.Column="2"
+                                                    FontSize="18"
+                                                    Style="{StaticResource InputTextboxStyle}"
+                                                    Text="{Binding Second}" />
                                             </Border>
                                         </Grid>
 
@@ -252,183 +252,202 @@
                     </Grid>
                 </Grid>
             </StackPanel>
-            
-            <!--加汤设置-->
-            <StackPanel Grid.Row="1" Orientation="Horizontal">
-                <TextBlock
-                    Margin="40,0,0,0"
-                    FontSize="21"
-                    Style="{StaticResource TextBlockStyle}"
-                    Text="加汤时间:" />
-                <TextBox
-                    Width="100"
-                    Margin="10,0,0,0"
-                    VerticalAlignment="Center"
-                    Background="Transparent"
-                    BorderBrush="#FF23CACA"
-                    CaretBrush="Aqua"
-                    FontFamily="楷体"
-                    FontSize="21"
-                    Foreground="#ff34f7f7"
-                    Text="{Binding AddSoup}" />
-                <TextBlock
-                    Margin="10,0,0,0"
-                    FontSize="21"
-                    Style="{StaticResource TextBlockStyle}"
-                    Text="(秒)" />
-                <TextBlock
-                    Margin="40,0,0,0"
-                    FontSize="21"
-                    Style="{StaticResource TextBlockStyle}"
-                    Text="清洗加汤管道时间:" />
-                <TextBox
-                    Width="100"
-                    Margin="10,0,0,0"
-                    VerticalAlignment="Center"
-                    Background="Transparent"
-                    BorderBrush="#FF23CACA"
-                    CaretBrush="Aqua"
-                    FontFamily="楷体"
-                    FontSize="21"
-                    Foreground="#ff34f7f7"
-                    Text="{Binding DelayTime}" />
-                <TextBlock
-                    Margin="10,0,0,0"
-                    FontSize="21"
-                    Style="{StaticResource TextBlockStyle}"
-                    Text="(秒)" />
-                <Button
-                    Margin="5"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Command="{Binding CommandStart}"
-                    Content="启动"
-                    Foreground="Aqua"
-                    Style="{StaticResource ButtonStyle}" />
-                <TextBlock
-                    Margin="40,0,0,0"
-                    FontSize="21"
-                    Style="{StaticResource TextBlockStyle}"
-                    Text="倒面条件，煮面口使用数量:" />
-                <TextBox
-                    Width="100"
-                    Margin="10,0,0,0"
-                    VerticalAlignment="Center"
-                    Background="Transparent"
-                    BorderBrush="#FF23CACA"
-                    CaretBrush="Aqua"
-                    FontFamily="楷体"
-                    FontSize="21"
-                    Foreground="#ff34f7f7"
-                    Text="{Binding OpenUseNumber}" />
-                <TextBlock
-                    Margin="10,0,0,0"
-                    FontSize="21"
-                    Style="{StaticResource TextBlockStyle}"
-                    Text="(个)" />
-            </StackPanel>
-            <!--抽汤时间设定-->
-            <WrapPanel Grid.Row="2" Orientation="Horizontal">
-                <!--间隔时间设定-->
-                <StackPanel Orientation="Horizontal">
+
+            <!--  加汤设置  -->
+
+            <!--  抽汤时间设定  -->
+            <StackPanel Grid.Row="2" HorizontalAlignment="Left">
+                <!--<StackPanel
+                    Margin="0,5"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
                     <TextBlock
-                    Margin="10,0,0,0"
-                    FontSize="21"
-                    Style="{StaticResource TextBlockStyle}"
-                    Text="间隔时间设定:" />
+                        FontSize="21"
+                        Style="{StaticResource TextBlockStyle}"
+                        Text="加汤时间:" />
                     <TextBox
-                    Width="100"
-                    Margin="10,0,0,0"
-                    VerticalAlignment="Center"
-                    Background="Transparent"
-                    BorderBrush="#FF23CACA"
-                    CaretBrush="Aqua"
-                    FontFamily="楷体"
-                    FontSize="21"
-                    Foreground="#ff34f7f7"
-                    Text="{Binding IntervalTime}" />
+                        Width="100"
+                        Margin="10,0,0,0"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="#FF23CACA"
+                        CaretBrush="Aqua"
+                        FontFamily="楷体"
+                        FontSize="21"
+                        Foreground="#ff34f7f7"
+                        Text="{Binding AddSoup}" />
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontSize="21"
+                        Style="{StaticResource TextBlockStyle}"
+                        Text="(秒)" />
+                </StackPanel>-->
+
+                <StackPanel
+                    Margin="0,5"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
                     <TextBlock
-                    Margin="10,0,0,0"
-                    FontSize="21"
-                    Style="{StaticResource TextBlockStyle}"
-                    Text="(秒)" />
+                        FontSize="21"
+                        Style="{StaticResource TextBlockStyle}"
+                        Text="清洗加汤管道时间:" />
+                    <TextBox
+                        Width="100"
+                        Margin="10,0,0,0"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="#FF23CACA"
+                        CaretBrush="Aqua"
+                        FontFamily="楷体"
+                        FontSize="21"
+                        Foreground="#ff34f7f7"
+                        Text="{Binding DelayTime, UpdateSourceTrigger=PropertyChanged}" />
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontSize="21"
+                        Style="{StaticResource TextBlockStyle}"
+                        Text="(秒)" />
                 </StackPanel>
-                <!--反转抽汤时间设定-->
-                <StackPanel Orientation="Horizontal">
+
+                <StackPanel
+                    Margin="0,5"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
                     <TextBlock
-                    Margin="10,0,0,0"
-                    FontSize="21"
-                    Style="{StaticResource TextBlockStyle}"
-                    Text="反转抽汤时间设定:" />
+                        FontSize="21"
+                        Style="{StaticResource TextBlockStyle}"
+                        Text="倒面条件，煮面口使用数量:" />
                     <TextBox
-                    Width="100"
-                    Margin="10,0,0,0"
-                    VerticalAlignment="Center"
-                    Background="Transparent"
-                    BorderBrush="#FF23CACA"
-                    CaretBrush="Aqua"
-                    FontFamily="楷体"
-                    FontSize="21"
-                    Foreground="#ff34f7f7"
-                    Text="{Binding BackwardSoupSootTime}" />
+                        Width="100"
+                        Margin="10,0,0,0"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="#FF23CACA"
+                        CaretBrush="Aqua"
+                        FontFamily="楷体"
+                        FontSize="21"
+                        Foreground="#ff34f7f7"
+                        Text="{Binding OpenUseNumber, UpdateSourceTrigger=PropertyChanged}" />
                     <TextBlock
-                    Margin="10,0,0,0"
-                    FontSize="21"
-                    Style="{StaticResource TextBlockStyle}"
-                    Text="(秒)" />
+                        Margin="10,0,0,0"
+                        FontSize="21"
+                        Style="{StaticResource TextBlockStyle}"
+                        Text="(个)" />
                 </StackPanel>
-                <!--翻转后再次出汤时间设定-->
-                <StackPanel Orientation="Horizontal">
+
+                <!--  间隔时间设定  -->
+                <StackPanel
+                    Margin="0,5"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
                     <TextBlock
-                    Margin="10,0,0,0"
-                    FontSize="21"
-                    Style="{StaticResource TextBlockStyle}"
-                    Text="翻转后再次出汤时间设定:" />
+                        Margin="10,0,0,0"
+                        FontSize="21"
+                        Style="{StaticResource TextBlockStyle}"
+                        Text="反转间隔时间设定:" />
                     <TextBox
-                    Width="100"
-                    Margin="10,0,0,0"
-                    VerticalAlignment="Center"
-                    Background="Transparent"
-                    BorderBrush="#FF23CACA"
-                    CaretBrush="Aqua"
-                    FontFamily="楷体"
-                    FontSize="21"
-                    Foreground="#ff34f7f7"
-                    Text="{Binding BackwardedOutSoupTime}" />
+                        Width="100"
+                        Margin="10,0,0,0"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="#FF23CACA"
+                        CaretBrush="Aqua"
+                        FontFamily="楷体"
+                        FontSize="21"
+                        Foreground="#ff34f7f7"
+                        Text="{Binding IntervalTime, UpdateSourceTrigger=PropertyChanged}" />
                     <TextBlock
-                    Margin="10,0,0,0"
-                    FontSize="21"
-                    Style="{StaticResource TextBlockStyle}"
-                    Text="(秒)" />
+                        Margin="10,0,0,0"
+                        FontSize="21"
+                        Style="{StaticResource TextBlockStyle}"
+                        Text="(秒)" />
                 </StackPanel>
-                <!--未反转抽汤情况下时间设定-->
-                <StackPanel Orientation="Horizontal">
+                <!--  反转抽汤时间设定  -->
+                <StackPanel
+                    Margin="0,5"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
                     <TextBlock
-                    Margin="10,0,0,0"
-                    FontSize="21"
-                    Style="{StaticResource TextBlockStyle}"
-                    Text="未反转抽汤情况下时间设定:" />
+                        Margin="10,0,0,0"
+                        FontSize="21"
+                        Style="{StaticResource TextBlockStyle}"
+                        Text="反转抽汤时间设定:" />
                     <TextBox
-                    Width="100"
-                    Margin="10,0,0,0"
-                    VerticalAlignment="Center"
-                    Background="Transparent"
-                    BorderBrush="#FF23CACA"
-                    CaretBrush="Aqua"
-                    FontFamily="楷体"
-                    FontSize="21"
-                    Foreground="#ff34f7f7"
-                    Text="{Binding UnBackwardSoupSootTime}" />
+                        Width="100"
+                        Margin="10,0,0,0"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="#FF23CACA"
+                        CaretBrush="Aqua"
+                        FontFamily="楷体"
+                        FontSize="21"
+                        Foreground="#ff34f7f7"
+                        Text="{Binding BackwardSoupSootTime, UpdateSourceTrigger=PropertyChanged}" />
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontSize="21"
+                        Style="{StaticResource TextBlockStyle}"
+                        Text="(秒)" />
+                </StackPanel>
+                <!--  反转后再次出汤时间设定  -->
+                <StackPanel
+                    Margin="0,5"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontSize="21"
+                        Style="{StaticResource TextBlockStyle}"
+                        Text="反转后再次出汤时间设定:" />
+                    <TextBox
+                        Width="100"
+                        Margin="10,0,0,0"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="#FF23CACA"
+                        CaretBrush="Aqua"
+                        FontFamily="楷体"
+                        FontSize="21"
+                        Foreground="#ff34f7f7"
+                        Text="{Binding BackwardedOutSoupTime, UpdateSourceTrigger=PropertyChanged}" />
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontSize="21"
+                        Style="{StaticResource TextBlockStyle}"
+                        Text="(秒)" />
+                </StackPanel>
+                <!--  未反转抽汤情况下时间设定  -->
+                <StackPanel
+                    Margin="0,5"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontSize="21"
+                        Style="{StaticResource TextBlockStyle}"
+                        Text="未反转抽汤情况下时间设定:" />
+                    <TextBox
+                        Width="100"
+                        Margin="10,0,0,0"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="#FF23CACA"
+                        CaretBrush="Aqua"
+                        FontFamily="楷体"
+                        FontSize="21"
+                        Foreground="#ff34f7f7"
+                        Text="{Binding UnBackwardSoupSootTime, UpdateSourceTrigger=PropertyChanged}" />
                     <TextBlock
-                    Margin="10,0,0,0"
-                    FontSize="21"
-                    Style="{StaticResource TextBlockStyle}"
-                    Text="(秒)" />
+                        Margin="10,0,0,0"
+                        FontSize="21"
+                        Style="{StaticResource TextBlockStyle}"
+                        Text="(秒)" />
                 </StackPanel>
-            </WrapPanel>
-            <!--抽汤调试按钮-->
+            </StackPanel>
+            <!--  抽汤调试按钮  -->
             <StackPanel Grid.Row="3" Orientation="Horizontal">
                 <Button
+                    Width="100"
                     Margin="5"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
@@ -437,6 +456,7 @@
                     Foreground="Aqua"
                     Style="{StaticResource ButtonStyle}" />
                 <Button
+                    Width="100"
                     Margin="5"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
@@ -445,6 +465,7 @@
                     Foreground="Aqua"
                     Style="{StaticResource ButtonStyle}" />
                 <Button
+                    Width="100"
                     Margin="5"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
@@ -452,6 +473,15 @@
                     Content="抽汤停止"
                     Foreground="Aqua"
                     Style="{StaticResource ButtonStyle}" />
+                <Button
+                    Width="100"
+                    Margin="5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Command="{Binding CommandStart}"
+                    Content="清洗启动"
+                    Foreground="Aqua"
+                    Style="{StaticResource ButtonStyle}" />
             </StackPanel>
         </Grid>
 
diff --git a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
index 90092641..fa396d5a 100644
--- a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
+++ b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
@@ -19,7 +19,7 @@ namespace BPASmartClient.MorkS.ViewModel
         public ParSetViewModel()
         {
             SaveInfoCommand = new RelayCommand(SaveSettingData);
-            SoupSootForwardCommand=new RelayCommand(SoupSootForward);
+            SoupSootForwardCommand = new RelayCommand(SoupSootForward);
             SoupSootBackwardCommand = new RelayCommand(SoupSootBackward);
             SoupSootStopCommand = new RelayCommand(SoupSootStop);
 
@@ -27,7 +27,7 @@ namespace BPASmartClient.MorkS.ViewModel
             ActionManage.GetInstance.Register(SaveSettingData, "初始化设定煮面时间");
 
 
-            CommandStart = new RelayCommand(async ()=>
+            CommandStart = new RelayCommand(async () =>
             {
                 ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M0.6", Value = true });
                 await Task.Delay((int)DelayTime * 1000);
@@ -58,34 +58,31 @@ namespace BPASmartClient.MorkS.ViewModel
         public RelayCommand SoupSootForwardCommand { get; set; }
         public RelayCommand SoupSootBackwardCommand { get; set; }
         public RelayCommand SoupSootStopCommand { get; set; }
+
         #region 时间设定
         /// <summary>
         /// 间隔时间设定
         /// </summary>
-        public float IntervalTime { get { return _IntervalTime; } set { _IntervalTime = value; OnPropertyChanged(); } }
-        private float _IntervalTime;
+        public ushort IntervalTime { get { return Json<MorksPar>.Data.IntervalTime; } set { Json<MorksPar>.Data.IntervalTime = value; OnPropertyChanged(); } }
         /// <summary>
         /// 反转抽汤时间设定
         /// </summary>
-        public float BackwardSoupSootTime { get { return _BackwardSoupSootTime; } set { _BackwardSoupSootTime = value; OnPropertyChanged(); } }
-        private float _BackwardSoupSootTime;
+        public ushort BackwardSoupSootTime { get { return Json<MorksPar>.Data.BackwardSoupSootTime; } set { Json<MorksPar>.Data.BackwardSoupSootTime = value; OnPropertyChanged(); } }
         /// <summary>
         /// 反转过后再次出汤时间设定
         /// </summary>
-        public float BackwardedOutSoupTime { get { return _BackwardedOutSoupTime; } set { _BackwardedOutSoupTime = value; OnPropertyChanged(); } }
-        private float _BackwardedOutSoupTime;
+        public ushort BackwardedOutSoupTime { get { return Json<MorksPar>.Data.BackwardedOutSoupTime; } set { Json<MorksPar>.Data.BackwardedOutSoupTime = value; OnPropertyChanged(); } }
         /// <summary>
         /// 未反转抽汤下时间设定
         /// </summary>
-        public float UnBackwardSoupSootTime { get { return _UnBackwardSoupSootTime; } set { _UnBackwardSoupSootTime = value; OnPropertyChanged(); } }
-        private float _UnBackwardSoupSootTime;
+        public ushort UnBackwardSoupSootTime { get { return Json<MorksPar>.Data.UnBackwardSoupSootTime; } set { Json<MorksPar>.Data.UnBackwardSoupSootTime = value; OnPropertyChanged(); } }
         //public RelayCommand VoicePlayTest { get; set; }
 
 
         /// <summary>
         /// 加汤时间设置
         /// </summary>
-        public float AddSoup { get { return Json<MorksPar>.Data.AddSoupTime; } set { Json<MorksPar>.Data.AddSoupTime = value; OnPropertyChanged(); } }
+        //public ushort AddSoup { get { return Json<MorksPar>.Data.AddSoupTime; } set { Json<MorksPar>.Data.AddSoupTime = value; OnPropertyChanged(); } }
         #endregion
 
 
@@ -114,33 +111,43 @@ namespace BPASmartClient.MorkS.ViewModel
                 bools.Add(Json<MorksPar>.Data.parSets[i].IsShield);
                 ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = $"VW{116 + (i * 6)}", Value = values.ToArray() });
             }
-            ushort times = Convert.ToUInt16(Json<MorksPar>.Data.AddSoupTime * 10);
-            ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2282", Value = times });
+            //ushort times = Convert.ToUInt16(Json<MorksPar>.Data.AddSoupTime * 10);
+            //ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2282", Value = times });
+
+            ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2282", Value = (ushort)(UnBackwardSoupSootTime * 10) });
+            ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2284", Value = (ushort)(IntervalTime * 10) });
+            ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2286", Value = (ushort)(BackwardSoupSootTime * 10) });
+            ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2288", Value = (ushort)(BackwardedOutSoupTime * 10) });
+
             ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M260.0", Value = bools.ToArray() });
             Json<MorksPar>.Save();
 
-            WriteTimeSet(IntervalTime);
-            WriteTimeSet(BackwardSoupSootTime);
-            WriteTimeSet(BackwardedOutSoupTime);
-            WriteTimeSet(UnBackwardSoupSootTime);
+            //WriteTimeSet(IntervalTime);
+            //WriteTimeSet(BackwardSoupSootTime);
+            //WriteTimeSet(BackwardedOutSoupTime);
+            //WriteTimeSet(UnBackwardSoupSootTime);
         }
 
-        private void WriteTimeSet(float TimePar) {
+        private void WriteTimeSet(float TimePar)
+        {
             ushort paras = Convert.ToUInt16(TimePar * 10);
             ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2282", Value = paras });
         }
-        
-        private async void SoupSootForward() {
+
+        private async void SoupSootForward()
+        {
             ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.0", Value = true });
             await Task.Delay((int)DelayTime * 1000);
             ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.0", Value = false });
         }
-        private async void SoupSootBackward() {
+        private async void SoupSootBackward()
+        {
             ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.1", Value = true });
             await Task.Delay((int)DelayTime * 1000);
             ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.1", Value = false });
         }
-        private async void SoupSootStop() {
+        private async void SoupSootStop()
+        {
             ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.2", Value = true });
             await Task.Delay((int)DelayTime * 1000);
             ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.2", Value = false });

From 22bb9ec016d724f97a63785c57f1a01ece48d1b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Tue, 23 May 2023 18:23:07 +0800
Subject: [PATCH 72/96] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/NewLocalRecipeView.xaml              | 126 +++++++++++++++++-
 1 file changed, 122 insertions(+), 4 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
index d9cb3f60..a647fa61 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
@@ -47,6 +47,19 @@
                         </Setter>
                     </Style>
                     <!--#endregion-->
+
+
+                    <Style x:Key="tbStyle" TargetType="TextBox">
+                        <Setter Property="BorderThickness" Value="0" />
+                        <Setter Property="Foreground" Value="DeepSkyBlue" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                        <Setter Property="CaretBrush" Value="Orange" />
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="Margin" Value="5,0,0,0" />
+                        <Setter Property="FontSize" Value="18" />
+                    </Style>
+
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
@@ -180,7 +193,61 @@
                     <ColumnDefinition Width="1*" />
                     <ColumnDefinition Width="1*" />
                 </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0">
+
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    Text="原料名称" />
+
+                <TextBlock
+                    Grid.Column="1"
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    Text="原料类型" />
+
+                <TextBlock
+                    Grid.Column="2"
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    Text="原料位置" />
+
+                <TextBlock
+                    Grid.Column="3"
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    Text="原料桶号" />
+
+                <TextBlock
+                    Grid.Column="4"
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    Text="原料重量(kg)" />
+
+                <TextBlock
+                    Grid.Column="5"
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    Text="功能操作" />
+
+                <Border
+                    Grid.ColumnSpan="6"
+                    BorderBrush="#8800bfff"
+                    BorderThickness="1" />
+                <Border
+                    Grid.Column="1"
+                    BorderBrush="#8800bfff"
+                    BorderThickness="1,0,1,0" />
+                <Border
+                    Grid.Column="3"
+                    BorderBrush="#8800bfff"
+                    BorderThickness="1,0,1,0" />
+                <Border
+                    Grid.Column="5"
+                    BorderBrush="#8800bfff"
+                    BorderThickness="1,0,1,0" />
+
+
+                <!--<Grid Grid.Column="0">
                     <TextBlock
                         HorizontalAlignment="Center"
                         FontSize="16"
@@ -218,7 +285,7 @@
                         Text="功能操作" />
                     <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                 </Grid>
-                <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,0" />
+                <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,0" />-->
             </Grid>
             <Grid Grid.Row="3">
                 <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
@@ -234,7 +301,58 @@
                                         <ColumnDefinition />
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
-                                    <Grid Grid.Column="0">
+
+
+                                    <TextBox Style="{StaticResource tbStyle}" Text="{Binding RawMaterialName}" />
+
+                                    <TextBox
+                                        Grid.Column="1"
+                                        Style="{StaticResource tbStyle}"
+                                        Text="{Binding RawMaterialType}" />
+
+                                    <TextBox
+                                        Grid.Column="2"
+                                        Style="{StaticResource tbStyle}"
+                                        Text="{Binding RawMaterialLocation}" />
+
+                                    <TextBox
+                                        Grid.Column="3"
+                                        Style="{StaticResource tbStyle}"
+                                        Text="{Binding RawMaterialBarrelNum}" />
+
+                                    <TextBox
+                                        Grid.Column="4"
+                                        Style="{StaticResource tbStyle}"
+                                        Text="{Binding RawMaterialWeight}" />
+
+                                    <Button
+                                        Grid.Column="5"
+                                        Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding RawMaterialLocation}"
+                                        Content="删除"
+                                        FontSize="16" />
+
+                                    <Border
+                                        Grid.ColumnSpan="6"
+                                        BorderBrush="#8800bfff"
+                                        BorderThickness="1,0,1,1" />
+
+                                    <Border
+                                        Grid.Column="1"
+                                        BorderBrush="#8800bfff"
+                                        BorderThickness="1,0,1,0" />
+
+                                    <Border
+                                        Grid.Column="3"
+                                        BorderBrush="#8800bfff"
+                                        BorderThickness="1,0,1,0" />
+
+                                    <Border
+                                        Grid.Column="5"
+                                        BorderBrush="#8800bfff"
+                                        BorderThickness="1,0,1,0" />
+
+                                    <!--<Grid Grid.Column="0">
                                         <TextBox Text="{Binding RawMaterialName}" />
                                         <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                     </Grid>
@@ -260,7 +378,7 @@
                                         <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                     </Grid>
 
-                                    <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,1" />
+                                    <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,1" />-->
 
                                 </Grid>
                                 <DataTemplate.Triggers>

From 56024e18019d03469af7faa2c1a8820e3ce7f956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Wed, 24 May 2023 14:17:27 +0800
Subject: [PATCH 73/96] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BPASmartClient.CustomResource.csproj      |  38 ++++++++++++++++++
 .../Image/弹框/BG.png                       | Bin 0 -> 18129 bytes
 .../Image/弹框/bh.png                       | Bin 0 -> 11456 bytes
 .../Image/弹框/biankuang_.png               | Bin 0 -> 10907 bytes
 .../Image/弹框/bz.png                       | Bin 0 -> 7953 bytes
 .../Image/弹框/c.png                        | Bin 0 -> 22359 bytes
 .../Image/弹框/ch.png                       | Bin 0 -> 7144 bytes
 .../Image/弹框/j1.png                       | Bin 0 -> 10554 bytes
 .../Image/弹框/j2.png                       | Bin 0 -> 664 bytes
 .../Image/弹框/j3.png                       | Bin 0 -> 7593 bytes
 .../Image/弹框/j4.png                       | Bin 0 -> 17987 bytes
 .../Image/弹框/j5.png                       | Bin 0 -> 2684 bytes
 .../Image/弹框/j6.png                       | Bin 0 -> 6047 bytes
 .../Image/弹框/sbj.png                      | Bin 0 -> 10682 bytes
 .../Image/弹框/wbjx.png                     | Bin 0 -> 7593 bytes
 .../Image/弹框/xsbj.png                     | Bin 0 -> 803 bytes
 .../Image/弹框/ybjx.png                     | Bin 0 -> 28684 bytes
 .../Image/弹框/z22.png                      | Bin 0 -> 16517 bytes
 .../Image/弹框/z4.png                       | Bin 0 -> 11940 bytes
 .../Image/弹框/弹窗.png                   | Bin 0 -> 38972 bytes
 .../View/NewLocalRecipeView.xaml              |  21 +++++++---
 21 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/BG.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/bh.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/biankuang_.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/bz.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/c.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/ch.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/j1.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/j2.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/j3.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/j4.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/j5.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/j6.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/sbj.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/wbjx.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/xsbj.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/ybjx.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/z22.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/z4.png
 create mode 100644 BPASmartClient.CustomResource/Image/弹框/弹窗.png

diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
index da3d3ed2..222df551 100644
--- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
+++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
@@ -127,6 +127,25 @@
     <None Remove="Image\工艺流程.jpg" />
     <None Remove="Image\工艺流程.png" />
     <None Remove="Image\底部背景.png" />
+    <None Remove="Image\弹框\BG.png" />
+    <None Remove="Image\弹框\bh.png" />
+    <None Remove="Image\弹框\biankuang_.png" />
+    <None Remove="Image\弹框\bz.png" />
+    <None Remove="Image\弹框\c.png" />
+    <None Remove="Image\弹框\ch.png" />
+    <None Remove="Image\弹框\j1.png" />
+    <None Remove="Image\弹框\j2.png" />
+    <None Remove="Image\弹框\j3.png" />
+    <None Remove="Image\弹框\j4.png" />
+    <None Remove="Image\弹框\j5.png" />
+    <None Remove="Image\弹框\j6.png" />
+    <None Remove="Image\弹框\sbj.png" />
+    <None Remove="Image\弹框\wbjx.png" />
+    <None Remove="Image\弹框\xsbj.png" />
+    <None Remove="Image\弹框\ybjx.png" />
+    <None Remove="Image\弹框\z22.png" />
+    <None Remove="Image\弹框\z4.png" />
+    <None Remove="Image\弹框\弹窗.png" />
     <None Remove="Image\弹窗2.png" />
     <None Remove="Image\按钮\AddGreen.png" />
     <None Remove="Image\按钮\Delete.png" />
@@ -344,6 +363,25 @@
     <Resource Include="Image\容器边框2.png" />
     <Resource Include="Image\工艺流程.jpg" />
     <Resource Include="Image\工艺流程.png" />
+    <Resource Include="Image\弹框\BG.png" />
+    <Resource Include="Image\弹框\bh.png" />
+    <Resource Include="Image\弹框\biankuang_.png" />
+    <Resource Include="Image\弹框\bz.png" />
+    <Resource Include="Image\弹框\c.png" />
+    <Resource Include="Image\弹框\ch.png" />
+    <Resource Include="Image\弹框\j1.png" />
+    <Resource Include="Image\弹框\j2.png" />
+    <Resource Include="Image\弹框\j3.png" />
+    <Resource Include="Image\弹框\j4.png" />
+    <Resource Include="Image\弹框\j5.png" />
+    <Resource Include="Image\弹框\j6.png" />
+    <Resource Include="Image\弹框\sbj.png" />
+    <Resource Include="Image\弹框\wbjx.png" />
+    <Resource Include="Image\弹框\xsbj.png" />
+    <Resource Include="Image\弹框\ybjx.png" />
+    <Resource Include="Image\弹框\z22.png" />
+    <Resource Include="Image\弹框\z4.png" />
+    <Resource Include="Image\弹框\弹窗.png" />
     <Resource Include="Image\弹窗2.png" />
     <Resource Include="Image\按钮\AddGreen.png" />
     <Resource Include="Image\按钮\Delete.png" />
diff --git a/BPASmartClient.CustomResource/Image/弹框/BG.png b/BPASmartClient.CustomResource/Image/弹框/BG.png
new file mode 100644
index 0000000000000000000000000000000000000000..1db7f46aa5ce1200804a1577e71c53a41fc8c35a
GIT binary patch
literal 18129
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

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/bh.png b/BPASmartClient.CustomResource/Image/弹框/bh.png
new file mode 100644
index 0000000000000000000000000000000000000000..80e8eddbbb2f52196f3c92bbdf4fd46f8d7fab55
GIT binary patch
literal 11456
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
ZMn4O^@`-odR{H$<%ky8fpS}3~zXK6j#oYh^

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/biankuang_.png b/BPASmartClient.CustomResource/Image/弹框/biankuang_.png
new file mode 100644
index 0000000000000000000000000000000000000000..5efb3757e6919eab1c5f2b0bee41eeb45232060d
GIT binary patch
literal 10907
zcmeAS@N?(olHy`uVBq!ia0y~yU~gbxVA0@U1B$$6J$!?KL4m>3#WAE}&YL@m*<pzi
z4G+tUGbXZ5mN1FnVN3s@KjRGB|Ecu{Q-r7aNFCk8nIzF+QD`xtQQq%vfck8M?rg5-
zyUSw>9?1Ar%K7cFe1GWdZ+7<NM|Nx0_pN=-zuZm@Xb%twl)k)nxA5b!xhM6vTQo{S
z1Q~v?vm`*64IN8&MkJd_Cx5=n!o~;@^IMv|dFPEPJEjlc<&$e}&px045kIi9<c7}k
z2IU1%bxMAJm@CrXe*E#LDpx4F?(VG_2SlJMGrzukdU@mi&8D4i&&S6~iihR>|9ZER
zvEuvL?vEdDF8*&R4pkU)<8Do9iSNNfj~;b0-VnS15oQo%GJvogS{QgBECEFZW(doL
z;{b#)sthAQyl=l=U2it??6DsoKfm~P`Zw==35c46B);f(-zKx~Z@1cPaqQElj}6?9
zf9-94ynOrY<Tr1B*Fi({^MgA#4cEok$z2(Z3s8`ZraExK7|n)|{4rWCfx}_61O^Ag
zXyGtgI53Rnh0(k)+7Jb&fziAG35L;nVYFTt%?qP>fnl^>7_Ao=M*Gf?L@>1a&iile
ztiGzT$bjK6`{oDd4{4bRHVe*H*tEcGo0PP6w)S2NeU}e%O|5gqvX*l=3dE!;XG~se
z{QFsDLc*!{kA1!yu`?*a$5=TSp@VP=P7I*&Um)lZXn>8Pjw%}skkJ$Z&K09s1{@5d
zg#$PkMoUX@Ff@!74x@#`XkHkmdEw23Uk(fmTw$QK0AMeU7XIL17)|iQG{KK1^3e(%
zoCZca$dF(dE%3qNFk0Y)gMmQdkXGFv_vikTci#=`*80Wmm)$FST)uCPF(f4&XgQOw
ze|+oH$NQPz#z-V@{9%44=lj9W!Rmj1e%%aPM`vId{*CY0yN9QP+lyFDAR0%9C?VlM
z@(|^boXb+5t-l|Ce>F=e`rnT)bu#re=8c{Z(;7Z!?5od@*;i@MdG@+)`Q%>4AHNQ#
ztDhICsr(!T8wfmi=IYbQg^ypZJ}KXz4PRMl_K(p<bMst7z1S~jq2q+<$#-?OA1Gsa
za5SmsZ?v!k3&awO>DSH{aqnP~f^ZSJNJAp|598^|teeW)CU$@%Jzf1=);T3K0RVRl
Btr!3R

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/bz.png b/BPASmartClient.CustomResource/Image/弹框/bz.png
new file mode 100644
index 0000000000000000000000000000000000000000..56d9c134938cb1f64723111a952c772caa3ea2a9
GIT binary patch
literal 7953
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

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/c.png b/BPASmartClient.CustomResource/Image/弹框/c.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7f60607f936c954d174f23320bb44232ce07cf7
GIT binary patch
literal 22359
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
NO)r{MU%2_;{{e9aq;3EJ

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/ch.png b/BPASmartClient.CustomResource/Image/弹框/ch.png
new file mode 100644
index 0000000000000000000000000000000000000000..c70773827806bda6a684daa1b8a9870be8bf9efb
GIT binary patch
literal 7144
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
JzT;ni^B)Z$xa|M{

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/j1.png b/BPASmartClient.CustomResource/Image/弹框/j1.png
new file mode 100644
index 0000000000000000000000000000000000000000..194d0a2f794e391ea0ac8af82f5b6467ba8d8c0e
GIT binary patch
literal 10554
zcmeAS@N?(olHy`uVBq!ia0y~yU~gbxVA0@U1B$$6J$!?KL4m>3#WAE}&YL?2IS&Ph
zxE@?SLv9PZ^``nQtdm{uaB3>H&*ZxIT#x_HX`A@pKwThEP!%rB1Yw$R9Dpzw1h*eH
zzBhkn?q*$xzyV2}(`O$4v;QK|aJ}@|?puNo;Rih5{uV6JU%&|ADzPL$7!4eZ5)hVx
z69dS3K+qx3Fscj~MWX=%N)4ka1QZGk45L{F91Np{12`B)3kPs8j1~^yU>GeNAi*$N
zIE)q!qj_O8FN`)CM>|lX9jF9IK``1zf`r3p2MQbxqirN`FpPGfz`-!$3x}Uui`mr~
zm<$<MlwVw3@Ynp+Z?7Gx%bHqj#Gyl-E{LH{CId)G;?Tmt17Qg$GB86}qsqYHFd87>
zU>HpykX#`+nq@!%F<Ll)lf!7?01k%H!T}r%45NhuI2=X`hta}efbzne%d+JR3>;rU
zYXL@UYEUv9&5Wa&aey-8Xa*e3fTIHo;NoYrWe5(2(aMO3%IL`6wHvRUDcuQMf5<s6
wUAl<>!2Q>4V9g8+?Vp&WAWX!Vuf~j-@(1^b@Ki8fwFAj{y85}Sb4q9e0Pa@iv;Y7A

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/j2.png b/BPASmartClient.CustomResource/Image/弹框/j2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c75f654c8eae8315574cf1f9e1a3fe3e8b40051
GIT binary patch
literal 664
zcmeAS@N?(olHy`uVBq!ia0y~yVEh7PH*v55$ql!x9x*U5#e2FqhE&XXdn1;UDNw}i
z;$wdqWsYwb(%3e%C+J>OcT_ugCT%Ut^G~)pJ9b;%wPR+;xpl9GVMA>b9|Pm@qr!5=
zpG|Za*4#@?Ten|%x?}y>Gk4n<HdM9$U+}w#y@A1T6c6VxXn6dH^ZCq5X)%Vd_kZdi
t<oRvyKg*DCyJjb|L&E~*1J}-;5x24AbTx?k69G(d44$rjF6*2UngH>(rhWhb

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/j3.png b/BPASmartClient.CustomResource/Image/弹框/j3.png
new file mode 100644
index 0000000000000000000000000000000000000000..d26e313475e4ae96c560175e2f775e9b9d51baf6
GIT binary patch
literal 7593
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

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/j4.png b/BPASmartClient.CustomResource/Image/弹框/j4.png
new file mode 100644
index 0000000000000000000000000000000000000000..df0ae8a35d17e7b115d7084603640f868ab33792
GIT binary patch
literal 17987
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

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/j5.png b/BPASmartClient.CustomResource/Image/弹框/j5.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8bef9577d5ad1fcc7a96afff0bf4d400a7614a6
GIT binary patch
literal 2684
zcmeAS@N?(olHy`uVBq!ia0y~yVD(^NV2t8m1B#rvyj_ujfy>#`#WAE}&f6P?j0Y41
z4jfpnZ9MD4`V|}}=eFiV{=QQWRLQ{5WOtDfNHu6Ri-5Q%j6A?xol)*+XpAO?(Y(OW
vFj^Fh7L23y!f3S!Y$S{p1tY2`ST?iL=QoSgiC$?>kiR`${an^LB{Ts5GhNZx

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/j6.png b/BPASmartClient.CustomResource/Image/弹框/j6.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ee865f2c0ca221af2af04b52f35a1705a199844
GIT binary patch
literal 6047
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
Y{||Nb*$8qPSQRibFhf*aaryWE0aKUpaR2}S

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/sbj.png b/BPASmartClient.CustomResource/Image/弹框/sbj.png
new file mode 100644
index 0000000000000000000000000000000000000000..f06fbced17d325a95cff7bd2fa5ac0bf77c70093
GIT binary patch
literal 10682
zcmeAS@N?(olHy`uVBq!ia0y~yU~gbxVA0@U1B$$6J$!?KL4m>3#WAE}&YL?MeVGje
z94>OFEYdk3=ffn-psUJ!!H8K%)b~b1pp&y_P~(%Ddy`{!?wovDzjAZ6jZ9kYcjMw}
zwqhorVL;$pZd|<iSDHBY83>=@fWANjBZRHQk^o^ea4<?hSPD)IAXflE$BlUrk1NyS
z#3Mf^H%dap8vegdO|uif`7bMNUHvW#(T4kJ&tASygIZ-F{r-MB>-6JH8}t_tWdo58
z8Hvia8GkNFnYz~<8W|Di{zW{$`$mp`9ycT=6b^`AfUp<@nG7H-hZY7N2unbbff>Sb
z;Wz+cj4B%q5Qfnd0!aj;Sq2;qqlE)F7)DD=a4?J(4x@zw!)RU@%?k{p^}=YqFxp>$
z)CQw@VKgs{=7rI`Fxq#9q=7-67e0hrm*-p#5MT)?U>0ZLR4NdhuuD+m;L{yEPddb6
zI#gSpOn5)#^5>qCi>kYKeeh(5cxtrO3l4|T9v~z+j1CWh!(p`P0}h7K!eO*<80`{6
zO2*N=Fq#)e^8&r{!m9&Ja~K#nOF?S^M%yIdP#<lRfP-PQ93Cx)N6TS)mBXWD?`YYJ
zb!_BK+Or)SPi3a<voV3B#REZc>CfJ-Z>(efaQxU3aoDQ51k3Z$bFYuC*a8I-B~{mM
z>+Cn_&vu=db>Fx+E`bjc<_`?_o;h<_Y4-c=dhb{t9Dcjzfd*{#+y57}X?EfD4Dk-6
eEr%01bA~@aT;=l5#$~A>OFUiuT-G@yGywpAbo|x;

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/wbjx.png b/BPASmartClient.CustomResource/Image/弹框/wbjx.png
new file mode 100644
index 0000000000000000000000000000000000000000..d26e313475e4ae96c560175e2f775e9b9d51baf6
GIT binary patch
literal 7593
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

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/xsbj.png b/BPASmartClient.CustomResource/Image/弹框/xsbj.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c85421ed981b3121f2e75583dc783c9265bc4fc
GIT binary patch
literal 803
zcmeAS@N?(olHy`uVBq!ia0y~yVEh7Pw{frmNp0^6AcyIdr;B4q#hkZy6|-a$B^)m5
zKYgjU#7IkTU5HybW9vJGNXNy=Ub`D!oeB~ckDOYX!miIEG{a8Nc>RT)bC{Lg&KTVP
z!z^BBtiIg*_g|UoU(dwI{+!1U@F_J-uix^#^n7-PocRlw9S*!pXqj(ZyuE16*6Yj;
zch}FXjIexs^GwX1IWla2zn`i3D#>`jzVvs^nva!|CDHE~1QcG7hd+F=|MI@u@SUy}
zL(ZYUn;rt)RehR`K|1}kECUnED5gsolo@}{H9XcobLZ9#3?J@W&!5?^&;L{8i+{KJ
zKjjw;8#v!j<K6z0kAbm?OuV~U@ZR||x2GoG{khzVVb80Yv~ywm7VTeW&-3f(=Z(j<
xE?_>e+V0Gmr-tzpb;}tz1WFig?3!80k{2#>K5oJxQDEX{@O1TaS?83{1OVYZw0Hmj

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/ybjx.png b/BPASmartClient.CustomResource/Image/弹框/ybjx.png
new file mode 100644
index 0000000000000000000000000000000000000000..26f2014b25865cf9f60f19e086bbaffe5029a012
GIT binary patch
literal 28684
zcmeEt_dna;`+m39ic)H;wnl7Kd$m+)>?HOoN{LNTTdSy5t;VQXB}j-Jd$bg_)rze~
zq!O`btS_(6=k@;l5#RSO$>Wj7<M}+-xv%To=f1CV5~Zi3PD9B`dEvqZnr9kMz!xrD
z$-i*nlJ50uXTKoTs|zk%xO3szlgH54=_}JtMd(RCu5IyA%YexZ$!wp;8h5yJ;bR{d
zZf?Zoaz6`uM+XXw3iyx)&<IqiO<$;=7I-uw<1#%aoaO)cE7N;huGx(1rrCG(Z*05?
z<X0?P&=Wv_xxLu}owJBDPQ7oI0%yhBC1zx?N{1^r`{yOIq9y@oNxb|lQBHpwyQOgN
zbTa<flB~Mh4MYIYkw^BR<-6=B<M2VMxxIQI;$_QPG7#bBth0xNgKspu?H!ndmJbeB
zypq9Wa?HxsGJLRc{cwvIycbMd@9#L-QC>N`el|<3ZPoZw+v-!ZKSy*w7H^fOG@PWz
z?^%vwbsHpub914)lZjBUt7tMjST=b(`<O^<FDdS@s1ls@3Ow@Q$_Lb*Kmh?qeKGIx
z?gaj22T|_YF43ltvlsu7haS+@7d0n<{f_`!b$wvPiMcF=Yl<WVP)PlW&vg`NmN(K%
zgt*32{k{Oc-F=`ZZqR~Dq&qI^1Or=Llej>K1a+bA@!~h*n=q5TA!Un_g4~)}&;6;_
z(;M%--PHL8cgvJ@L~xnU&-rtx`lKW4KPQu890IasEgQ!#?SMzM7TX@=lJM;k1s$~c
z2QfT|c#+@g<AMH%hm3eB^ZwU;9cIa|ngE|@FKVt*bUI-M6K*G}_QA1nv}<t7PjKuV
zRAnGaXx#9bFu#CokWBvO53uUjbfsj7Ux(+>b~)Lm6Q`rIoM`>B8Vo8iq0jSKS<~@D
z#!qnF&)-HtyGTAXJV8dFWnAO}zO}b8!^_{mG^{9n&_rh$gJ233#-B_C=_P9xn~W5C
zf~s3v{ry0=de6pBva>oo%>ua1SAy6}XH#=c%4QR;*2?X6vNaK2=>&#bmU!|LIu#8a
ztkpzUfKGpYfBVSV$iABv&`{a0;HmI=O0L^qcVhDg`z1u`-nLCvYkxe)hs3S=QA$K>
zMC2B_?V0K)2&>#|l5xJ>BW;uT472>{&G9XN1B6sQ2Ar2Lzu~FfZR25Zqr-6ojBKn~
zB^!Z(T*e|N>mQYjK>q4ok>k3)kZ1j)W+S`foKxh`Dxf(snY~X`A@ude#==HY9A7i<
zhq=97JtAJ^PI8xPjg@RB+u2OqRfV3la662@dMhm3mWp0vm&hzr6~r!8aE`(=Z86`z
z3Op5+4Cr)<_}zj|{e(+(bH0SKrUn;VI97uNnv)>pFOmcPE9<Tz@zs|Q7|m6^U$=^L
z)P?L6!<F2TiO1~4jkA%Kcf1{lL<8{TMQub?FK*zkVT%q{s*aUE(KK_U`XDjAivmpL
z+x1ctxHc9E#%vcM!siwV$15*ydexBn?SdX4;>uCTMLK>2g0hI$QFhfy3z2lo4Px($
zqAotskIFmO_7YH)VuH7sf5AA%R2*6@yU1C4yR|Z@x@@)>$27V6oyX8b8M61;$++x;
z8tkfcJ?E`Ny|0YXUSNSkwZELgwSnanAY2)Eu)`l=<jCQ(vqJFB<+cTqoKh}fGW9-~
z^fq~-a+$|*mXEjZ)@t=PZR)u)eb^T~Tlw3H$^A+2lf`mVOGU!cSoSS62QVo$W8YCB
z(4}nhm76Q4^N~2$j_%S&0&ZqL<-?wtAnFWpC>spY32znU85P9Par@X<=&#d<A+wi&
zflWSHn5p{!77*8`%2mO>6<6E1(X4>70XyKqZ^<VA!@AiHTAKGf%}&M*#UvT2o9$Z~
zjcmnC7jZKYw{Iil<)i0Ys<}zgJTLi(DHF@2=HmnCAVte$);K8)>FI!@s#o$@fhfCl
z{nW|R5-snyE=*bHuz0Fq><HjTOd}P6X=f4-WkW|$`dI{`4fS_caw9cVxs3P^qYR8N
zx<%|EyziK6N!vAb1;bV4ORo)mXb*lZ?I#0q>R_PmHfeK#Coz6BuIkyquBrb;{To;Y
zfyNfTF6%pf8MAPRQ+c=bkdJt6<q%0CugVKW+i|cZo4mL8#sVh+M5udq`7Sh|QdSZb
zXd!MSKjK&P;8U-i`y$EWS9>DM%iSxS?ta;FFTyczP!gSyaz}+t)hys7@*xjaf*}0v
zv<q;Wn08`y?}Gc~qm$XgHYbbR)2thzYxhqHfMfN>O9ip51Bcgh<q93sZjN9-uwIhZ
zcALy<S>ujJ9-5i%f?}RTu=BcosI6MwQLUoJJ-}`Ms>4=uQTil>!kXLa$>P#4r)&}-
z*fgDxKLevitzYRQzv8n8i`=Z(HdHhxQz(wZ(+3Ze^a!QX`I>$4O9`tVZVuJ$u&!)#
zTcE!cQM|B=d*jbBu^GTYNF=w40^jM^M(9|Z25J5UIgOj;^(N2keIbe;s$nRqGDFNp
zM5*m4&eP3T?@@?lYb1~14Q(e$85!|pV5C$v>xW94FH&Nt+qg=VY_P<~hfIWbDmkMs
zk^>TkBB~+{PW*WpCjo$$o?mu_gEcKTcX^_L@g?#Bd*Fu86H}|q)5AekT_u6+ciJup
zp8gR%%E{sE$O(|h+!H%c3|tk>RTUe#^i3DvdIx<R9VosWJ*NXo)(zgogF&abpv{M8
zxGtQu?f*L1JMB627l&juHC}syKTGI%_^hERGh8{<)6X|1ROM4Y_hNJ*Is7gvn=FW>
z6G3dfdME{?#>lbS8wloAwf-2g>H#)Z+qohF$zpRsvt7OqyOANAo1J{YuF0E`S#`dL
z3%7AA05E88v?S(ua;}gzNX|9)%GvN=BV~^RESKWAnp_b)6eufSSKKCHO{w`XD>r1l
zGvBRo`Q?dotl30tK|{Yo*FC2TJ5}CNd-bDz-}ioo&nI#DF1#+1N^~TtJ7sv(`=Icu
zT+e&5=N}bS6+M?}Yx-@a1#I@kCQ&F{fyA?`<Tc2)4hZ@lEb@f}CvRp25N1exB3<Lk
zR)!n$fg|pyYtZ_2MiFh9t7pLIob$ip>9j^lCU=PCi}=jCnysIE>9au!inV}(nUmk#
zcL=JvBA%f5qAvrJgW#s^Rqy(}*sEH8`{<uGi1IHvl}!ON(sB1XAZfx`PRdppYK#%d
z$#A6v>}TT%itc<+SNsysb4owx+UF^^*9VIX&83<L{l$zBD{Y`6R|~S<=pBS7@ZuQ~
zchk7gzT$%PiAabq7$jORbP%2|vKlyF?>2jk*j{AlpYk7?JT=w)+_IO@)%2F|8-rSQ
zagy0yl??RPE!2fkO=i4zi<l~`j9m_7+2*J&WSDGq-cT*Br0pYw8*+_vDFmKC4j-Gy
zCUR<Fnp%|}1@0~82YV!MhMWvHPM(s~WDoO!h%?QI7FqeKI?cvlcK(4iVc-%}Z7YN6
zw-Es~?d=3qhmg)79sa_7)>ZH&#<`uE2{T7?c=OE4Ux9XmyxlBR3w%WvCc6W?Xk7w4
zcpAxGQ&!9anIY@=Q|rIH3X-1#&0E}QQfYrcx$F&;62ZX_Io=`zw>Ku}Umr|n`8%Hh
z+C3ZPbg9vE_q6E8@D>qEB|12I7N@fyT>vZwOXS<g>}<jZeGza=54`hUN#pL(YX1`a
zWT8U3@fZT6g|qUdt|^~x1U+KROFTs+3<ePA1JfjT$e>Un-8OwyxAOYdDL(4Ua(1F9
z*Hyz1pfGZbOyo}Szt7QCKmQ$7s$ebRxHp+KLjh^tK95ar8@-ldeFP+5Ab<YR_H-T$
z^ypkW?jiXtNV7ev{9P+i`N?Cp64~Z@uJP@^Xz8XM>BIee%w+N61khI=x48iwG)sO&
z5ThjA119ca0v$|F+-Pz(nW5njt5#%L1MGdZ>A|RVM{`})FH3m}FCE?7a;rp9i^T@v
zasij81_vZv<t9L0Q}Ehuh<8c)@vM{B&PtvqVYmU=eb|#m4?brqb{-bwDB(*89GbY@
zie%Mm+{C?1o;@UN1-SJC8+TS{+>YyQ&+402M-M*Swi6Ih9ijF29uHy<T|1lt;n*Pw
zTZ2#DWF1bcR#=*zy4>sWf;EN^DMB#0N5#WcI=YK+F5z19MLD4$jzG)E0<OVa(V!)Z
zdiZG%WY6_9E`}$?pZ6VPGO4LP?KuJE2YCxT0~I=C^T@lI@zAm=m}YMH4Ah1ses3lL
zOa}DL?2n#e;9}_tRYaWX)zJ=!fE)6M!Lx&VviW;$c@0w40*Ha3>Yf}qQAI<PS?p{Q
zO)!RCAP;OYz7_=^%!xE?8ni-ZnT;L^A_JEz)@Be#*(I~}$5_#`r9OV;97upE`3%B^
zCc9!7slGY_;xV%~a4we7&j$~t{ddp-R#V5j`5~KUp*cW<Dbh<i`%O8#t8+JhDShpd
z{MxnLh*)8}FmyO+z8wUHN|ot|L|)3@x)qV1ECW`=)&N5uA~yFo$=rVacS(TMEnJPv
z^VnAKM9@LS+Bo9qN069z2?eCz`7M%kXFI^?3M7BxA3QR`hPoLU%(20K24V)yne`1j
zdtL(gk~;4Vw)(S>@@=urYyy&c!SPW^K6Uknev3H0$C!X_xr3u1r}tYYuTWwFR}An-
zA$djWN)+3$n{1E}ZqxYmmET?5wg%|H^R%{AtZ>jb6Dv-%<I+kz`jIc<dO9-DRgF&d
zKT$G()C(FeGw7U4Mj<8en?J!>LT4H3p|`byJ8;9nU7I&Y+h#?q$UX6k(ns6M=2gar
zOSBA`v}!uOknxvKm$48X<;K;epvY~3e85i!l<;Krs+|k5yY)G0q{9;!FKlNTX{7Au
zfD>FUA3lIOb&c2?2>%#9^x<h%z5>y;x~bL1{dceB&Nk!+9QBVzl6kFe>P?FV$O_Q;
zFKr%$bOWdT+R!nlwP(DZx(2uEo?6lrc&<%OzSKF4#p~vQl|DhpNW_oghL9VjT@)(q
zm7LH0&LB|L_FI#hw|~P2ZS52vbuKdi5x&Jyri6t)FQ*#{>08Olz6N4DJu&A@92BQY
z^5mYk2sO<lRM4b50i`DZ%L*cI9<AZbT|=<rxKn7;_BfaJ>>lJamq`HUJv;;^Lw8O3
z<w0GMp)f9X90KFk{F{R4P|!fDstnaZaHmY*Ee>*c5FJSzTzzv4$Xwq%bCKkJtieG9
z;xdH1iJxs2JZKc9*J``?cQP7zcnuP=O>uIZ07|>soawgQT-=HQYp-|`+}`P%y2NiB
zS6R3ovOBfRZ;c1?qP?n`j$}`@&k%pt-V9P6k$8(qa41`%I;_cS7eq9h!#?R|eZCcJ
zDfM17?n_%;#VAX)YfAiPT<cS-<HJ*1PSw~PLIH)yCGt`msX48Gh?JaVagwo(>nB}C
zg^c2Lgd>f?If2rN)AC6+`9~0^;O#d-D^SqEA8yCadW;fkWvJYTwidqm8`@<X^waO)
z$unFAPhz*K_edT6thKQ}P2MJV3i<oxYmoeFUuWI=hUv8${m%3Uomej_cb1~|w3;o!
z8;pJwIPrMrXBJuARqSFk!SyH>(Umvld@P;(a2FI|{rr4-y?PZ1;8Az}7ZgaJoH*+z
zCaqDK?Zf(WihKgKZdj`iKqI{tybUeb>l3r%c8}d{xiOK^z&xLtkq_1QQ7!zJ^_^|$
zGs$P%_NhKG0XcH%HC9DBYw|(}9?4A2zHqQov*q8DV?ZukX=-g`^H>PefDRN|GdmcK
z0V0q5LAVURkZ%a97ou9Gq9@&1r+<nU_Y}N64ofWH6|=MH+dh562I#>2YwjEk!CYG5
zAjHO}M5qsUqEM^6OE=gvKr%d3FfxqeT75FTrS{x(X$f?~8q|28SbSayxxUZVFU-x(
z%~PjRe9vNoVAUg4Bn>KKFXed(q>b&o$gyYeUYqQJ9S8I8vsj_z8>}Afv;?W3@|%M_
z4y9LD`*zokN!#*SA>Q>LUQ;AZExLkmFTtQJK;co4SmNd!J!MDV=ySrk>EKa&vHrLe
zWu=QaLPERjo-IfY!*W{HPWx^vRSF(V>sm}55S_#@=oEh`^PZ{<(Q6PpHm$~!US$)@
z(_>{5aN`Erv(V~=)9hp(oZH>p-X>h+2VK#KJCG*iPQB!^lXUrU*><iMm-8y^p~VM;
z=ed>O`pt3<DqrSrH#~6Bu)b-OfSf2}?6%&tW*Rbm1j)(7urAk>6tXkUIX4r^PX2OR
z$=3c}eWKwl{X(YSLjUnj59GG5lCQ6?k33>K{OD|&ZLjT-jLf*oD^MPUXk}k@IiO%L
zl4y{Q0H1gY;BKoF?QK|eg$UqY$yW9x_AVky0_SwsK*89v_nfq=bvAQdLcWx837j-+
zlCdScXd5QZ9`S+XvyzyS))&YDf}R4luoS0e+w0j8$3Gubld!wZxh_?;G!-C_z?q$O
z-mTiwjl{eF7o<k1>0y5HE-?p%89q!5;MQXCjD2{kFV{Wg){Lu~)XqLK7i-0#H{!f>
zH*lKj;>ecKJE*R*w+B8d0Jjo<rnQV<Je4o_msLcKUDl1n&0Toc?IaKVNTw=49yHjm
z`3D+%Du23sI-nz*d{&u<RH3`DOCVg*5h+CJu<Q0|Pw`?$)>(OKWd%Rd)vesLkhCQX
zuW!9p9V9lL>Tb(hlC?@n?+@tn{e<zHOHUATp@sdI3uyvWL+o7z0V0!a-q#^ixQUyZ
z87i~0g<f-8Tt~&Hg6EQy?j$ztxtEnSx|y|<2Z<^^kLpGW-FMmi2$`MqIoOveIZ8h5
z-Ci*|{e4Uu0xhrb6V4o*BZg0-Pl<Lf>$zmRaq3%KfjG#r_pDi0)RDc_6$3C?OJ|t^
z0t#^sT8s1o`Sy9H5HdB%<Hze;?1G<1pXb|4pXG|Q+dLtXm1`N42urZo4teb~YNj4L
zu?@RnX3{+Y(%|jpz0rfdx=yEs7!)knO|&Xw6-02qCjjws&zdc^Hg!ah8M=jOu&_B@
zMfr2C<R@!NO@SR1<q-bRPPB=e`6jw*cIN<J_E@BExOiNnUy`ul8Ko{PJb69NKC%SC
zU%=%*G*dkZ)pdEP*G7p_Wi)uUoMu(;i)XmabNUFh?1n1|+!&S7L1wAz;9P+?7oJ4X
z2%Q>028X@I$mi+mO;WxBPTO&uoY=g{)?Dd^JDh0CI9>g=7{aMTsC7>$OI(`?GtxSK
z!qU|T4r)Kn9NE(pv9@bmH^5tmKPs#yqa&TI4PaT07a`;EOp|dJjVBwju-33(CkCzK
z^R6J2Er;i-WZ19cJtcNziH%VNzb%Wq(hI7z#AAPL9cq97;^CYq#P<T<>q&H4Bo*ua
z&7C^w<DW5Cp_AOpqUp>DGfktR1gt3NWDY)P)oXPSH%0Z1934TFoYLlLL=Uexa=f3}
zs?iIFN92kkDrS#+gT!{muxEY8X8Gc&bo#*79*h6UqaVXuehcx*Qtuj&VfEzNN;=`p
zB|0`l5^K9}fK5%6bNe6R;41dyhPJK(yRB*FuP*td%jd#UrFjlh8esC0&kW&c?&38j
za9A~}pnS{Q%J8=8;~$ONx{zavhSFn4CugYlk1wG}0>P6kP`*p3qu%`0>4Tqkou}5I
zW!p(|iN2o+Y{Uk)TmcPBGXxHsEqSsIHl5Bpou!KqlTEA?Uj+@qM$CInEet7rJSJv~
z`Wczh!DiL+AO_*hzALL|r*ZFafekdZDQE2b+W6QbS?ZVbNEMBAW$s+RD(==9+9?I$
zU|@Y&xbO}PH99P*#e({x*=!f|l}w&5j+FBVh6qkMmXM?_4y1+`T^=#pmAthfB)S$8
z9sy{4{fM!!plW<zs~+BbfQgaMY7#ogc-efI7UIe;#oF9wy7GAtXCnW@-)R15t?B1%
zxp$|P^35kM%~jdMK>~TfLb+PjpS72<ACDLJKl-BE+<=ft1&p!d$XkR(mJy@9DJJS*
zE-$gpMK`yl7Blow`%D_&<8GnSVZ~r@nqVT>ZKPZF)>VW;EOT_5Bn9G{R!}>XNH6GJ
zC{~SnCsIBb<KHD0Q(vhzKks9Q{z@)OX4SJ8A^7rJP9z@1owu3di0yo$$EJHz5EN{(
z);T`lJGN@u^ZVK)LoEtSxcC+sQWAe4fJl;vQ|*)HvvPYK67-DT)?v6Xi$L(7jLhf=
zO7xgj^)qKr<UBDpB~(LX&pRY(LuNTk{BthYm-(@8lD=c%Q}g_Oj&BCZwdpN}-j)zy
z`1sBzRm57e_qUzP0M%lG?9Q>!kMWZR+BQ{^D&J*P3<D!HzlpX@%gF;$pZEHN=$MW%
z`#iYn-09Z-Tp-Um#^QKxCaNTcArZVslXrrUK5|&*(|7ZgZy!q==bb6Bb0c0BO}oG8
zAmwMWYKv_BHTqK=L&2uhY#4<T3lmTpPH2B@Ut6VA1%>`&2T1D{P*PevciA4$8yHl-
zI^yE_UQ=aRi~r*@?tTsH7^U0ttJc3vq-^sx2eJ*Rg2@|6cfU0qYCpoDzsVUq^Oime
zEI9$b1LrmgSPPV_N;Gv#_k%V1KA@5!UabD{WO({NjK4)<I7%u@MW7Ex;H7-dbJce0
zI~8YUX}a^Q;V_%O!r{dL7idULStT04TnKnIt$V#;@$7u%g1f}dSoTYH@fTgzh`Lnq
zMZN1oc-Q2rpk8aw<uj*KU5dj_{PX*YpOEF==ji#D3@IF&aXU3cqGW~Nr%+hh)#=H1
z20J^w>}Z^fq(kA4sS|9)>joKir-qE)HeTSQ;WI^JF@yMODsJQEG@|xII8>Nsttu_k
zfBjZhhDwdpi|FOQblKpd#4q8$4aDg+=Kw;6sfg?)sxxRc;t`j!KHe{yYsuCXikHs0
z-JXk4ENQ+e5nFDk7ROc8K{@?0?UNdiiC8I6q*uh?m9>rzKDu}b1u-}yxZSV~9QJL{
z>+4Q>pQ$NR;rj>;<U6RV%o|d_Q8+jf5YoSQyfL_E04e9(hEGgL$9^P){WN`D<=89#
z?sM%n1%uIcx9}TQfA&LFW~aPezE@+|Ilyxl9MREO<3I&y8u<1M;`d(th`%|EHQOR+
z_PTNvW#hxfCN8RQ&(oCwwJKS|f~V1KPlNPpNP&fxevGh^_D9Z&C2M}ITp_@VBfEu6
z5;S`+80H&=dS2EA7{XYL3LiyFdrWfqy}BzNE5`^r>u}hDbFV@ar*6a-qf?V3BOlJB
z?_}e}{}6!B<4Zl4L#TIHJ(t4<oW7Wos#lP9LRnP5=j`?T<!60t!_U19_aV58eJLzl
z#t!=}kB8cEqk~=<b18j#;8M*ZW4-pIWy*A8XQStS=9a6&F>yqZxF&pgVrTS6YUARB
zZjI;z@+XQL1v*y^cJ{K@3yvEqm75wO?UrjRO561Pj2f0k3>d+Dg$UZ)TW-hhQPL8e
zb_HDWa*+-~mx;5jVanvJ%)3cDfV*u(lx-`B09kFlnDkwcnu&_h(!;K`7kAz%No(}$
z*pz9DzHm&`5?5umciMZOjT0|xTPq0VvuCii)-Oqq&K^kd{dwKiVNG*mc$H00QNtJ$
zv-iAaiM!v#Qr?M=ArhA8ZnDvC8T4RM52oP^qsI=_$-Ghs&k7KOLo`<XRURt*@);uP
zmC11{BG$id*)ulDI22{fEdlZ?z1g;Y+qEsO?f>`(joL42mEs5Rne^*L^Fnz|k1VFO
z_g@(oxTGO}g1&m>`Sj?vA3$u`=6Pi%Ze1L4QGJw1rm%ciBv&jZkQN{Dcp1+fdE>_D
zH^cPsTX^UNZ^HdZP1$s;9EVa#+0a}7Gv_Rqo~35PW@+oFhe^N#tn_Af9WXF&`Y$_K
z2)hq7f2wGn6_AK^5;;x>XZR&XZi`npF79Ny<)xjs*0TqoUqYTR36vQ~Zy{!?;w&&c
zkuG}&PdjaS%i8bHJ!<^Oi}&8vv-;>JVG{652G%}Qp1Cti+VFp)d)%1u$KcDradh&i
zPF2IAw4I`jPKmkbi&N5<t(<G^!Mfn%o~W*`5R8h^Fd#1IjfaMjzz%QLn9}{nlIFz8
z55D$Vf7-FM(n=lmgL}2+6UC<<i_C#L3u|DO`F!`twUFiW<=|VyP0d=r@FA?=F#y&6
z7NMl0=(6_-24-Y>tEpbr?NK)PyW6&<?0CifD5081FTZ%{3DB@W)s&%(n^JIDA$_6k
zK<+)^<DbRg08<{YQczU>Dj{eVm8iEP#d#@*-3&jWIHM4ed8G<gz-?mQk%=`p9JR$M
z%xsQrR9}h3cnX$WG>oP5+V}buG}1J6w_BC)rS;?tSSTB>Jq@=hq4O#Am)+UX&E&yC
zG??_atK0aS=?%uoUf7&=$$iRt3yBYzx^N!1@edM|!gdRe*psT0fNpiNj;`PD76g4x
z>0l&!??DA_sxM%p-}Q4Jx*oUyY#QdztLhoqt)JsevN(3spwx_iH`=*dODZ&|z(A(M
z7lpALdps;yqBi$Fs)Jc1@29&^gq=4km<BU{VQ-B7#u>h;`-pI1;k(9O$x1c_G%^IQ
zxFq%$TjQ1~5YsmB%oV752Qqu4&LUo*{q9#*XkyYA=a}*?{ZEEL$7<JD6d&D${B?Fp
zwkmmb!=*2NkI@TFpQmV{3bfU<j7s*+YWg9jQFO|d1)7#oc<0$*;YbwBOX92wb)>$X
ztQ<<>(g<)vU+A{}HMX38e%=t6&o)sxC<AY}3Q2<@a}Kb4br>6Z@MWZRGY?`q!KyN|
z`oT$q@FPM;+(N8M26oKq^(zt4$1)Bnmz9d{r&tXM!n?5j1la3^gh+&eHVp*F^)$+;
zmg=ewrp_@49SbO>(FXvkr~BvyQb9$Qgl8|J3YkVJ(d@46++sv-Xux$0LEwIJtKxX_
zpOMAQ^&ivw>*o}vWiJ8L1<3$$uvvyFFUk7fy8tEXH1$a?l?~sFdVf-W;qi4SJVcL!
zl=UVsiTmKmJnF;u88DBu%5mRc`V#<buRLfhq^2@;zKBA8t?&<mZnZM?E73^1ZMbxM
zmRM5z(-!`5R9N^G&$XZhcQTzGZh>4(znhGG<=G4OWaSF%^w2Qbzbp`x;@?|lnu##|
zr$Mbuu;s5DZ77l`R&5?3Tb8835}$Z%gS(vAteD}Ps1M{&r1p<KI=do?8cjFZ9`Dh8
ze^*5=$KH@gk@~Sq#zr);_zf|Tfa1Fwf)rKBfQq*6;H6>Dx#Op_w%<!K5;&}$(j*Xi
zS5<3imDg;PaWYSZT>2%cnTZC_G7XUkV?XN2`Rc0YvrE<`(n#(6e(_SXe)RBT+q0;B
z*G}k`l3WfKSA;|zbn!X@xz{u#6UJy9H7tIv))ese04ZDhIxb~rhE-n05AKscA}di}
zQyR=m(u#5XilFh3dXCkfja#p+y&bTFyth}^y~~r!8?CzITyD&`r|(~B4K02+vqCRY
zoMB1}ur0WxdF(&9UX)~uSGwQik{rM@UOr2Y8jqMjyFCm2M_h+Marx^}kQ=ffmaz9_
z!bMFpPDrvQhQY<6O%&7H0t!ttSW7y(8^O*){bDv#oj}!%C_PQN$Pw-)YQR!nIdN<V
z_EVFId)aTcPS4OhC{bsv4)A7m6uwF1vGs1N$7Sv=iimhHhZRAIXjr{<;9t_0*zOG)
zI~$%+d6#Q%N1lk`cclkm#V|1zhEl^30~Nc}u5-h%#&7gM7lG%9jJ>nSujxZq=vFsc
z<DF7JJ$VtpqR}0f^hMh*L%x#waS7L|xBg*JWwv_c@#=&;;+hE%Bh`dU2bsx;RA0rZ
z2>#(_u5VYRQB&GsPYS|{YjvOWce~OAM65fHmx?SW54A>$qQNK*>ma>sjA&9Vu4ei-
z*dJH~Pi}2$IkZEcn1<yVKdNq+W#~C^Zzty)_f@^Kne>VW9BsqG&KdQs(jyNx@BDO3
z_X>t<(aidLLzgRxB6_=*E~`raky}#e@s@M#jzPP0$OAWaq$UUx-jL(5`Z7Q{r`zeV
z!tTv>CxxF6{OT(rl|QXJ+dP9P<Vf-q2}cAO8}^pMybT-?kcGg44Xp)LbQ;dG-B7yI
zZokRgci*|-D<!0;J-`#qeDe&){w~yvs3LIlL5#RAa;{}y%P8yvMnbeI3hh;VSVDXW
zGcYJ=hjny13T?BrvyU)+H>SR2^p?maU^nz-cR;1hkkd2C=$#J+-#1CO?!&DqYODQ=
z3_pmx<u76;2|*q}*}E|;9}KD#)5OD23?yIl;)>p!!601$4y;~+H+(8x1&C<ssfvG4
zxr_nVK0NWj?XLU$V}}2^CV&YlewU3G-UF%@c{sf6R&?*G#T%fNi$*qu1glBlU*#}o
z`a%?}?^F8&bP`2k<_qeJM#VpRkglcLKAzLEi`Kla$3{p}^T5P<yhrKl8%T3n=_NT?
zlN-qACIQTlm>e5Ti!24M34z0+Qr0EXL~MyRn~mb>6c?;;A{tAtIXVB^_PX?_Rh$<}
zhXncGR&e3^Rt?Imm)^$7YW2p?>;c46Q`tp88Hd~TB9!5Ki0>3AVM2e4x3EC?6=~mk
zq$#s-dy7LUsQ1@B`^P(d+bSiv$So$V5m`OINlssF$+#G4*`iV3DPI%5?npvOc27}K
zO892w&M|`Cwc1b%UH{9`OEJ6F-Jx0t4PSM55Hu5)KhaWEbMK72KTn+)B@cU^OWV^C
zn`^!6NTwTL$D6;4F|#8Edz&)P0;VA>58^nr;oK#1ebPx@&I<`TF9hv=8FyiLSrYw=
zCmEJ^%qj4PSw7jZM2Gv3rW05Ynhacw^0?TrYjXs3)+|B??x2r*qon1w^{RLnumSA$
zIe=tKDccgVldV6C4qs*XZh0+<>%6CThrq?U9j`x<x(ByuqJ!m_f*D^b>=eMpf`dYg
zJk4^2OVkup53MNuo>}M>FY%L(>-xpY70zt6DT$QqBm%c{MW&Phu+g4{$6F@KO(+q<
zv&~Q2=FnI~w5Hi=_i~twv2*Ykex0V4*jfQpwKfsS?jaTQ6)BJH`<5j}Mj1J3q>L8#
zWxK4e9~MX01Rb{o$Dg4JO}pQh4r=|IRi;*a8`##66Tw(NKwC4d)KukiG+9NJH=x5@
z=m>J#>JF0f1vP5$?HILF+spJv>PvY;5KB_EK7BazE<fsJ7}XTBx<!c{nmVjM0Hfc>
z^Xhj7?4FSIr66OlIP@9KMcaa0*3p&18}<rW=@W|w`xl1R`GzNHH5JELwGzz%Q1aFD
z>Q5TPNgu8k3o-iBt!Sr__7j0uTOhnv<Uw8pJAVFPYW5tou<M;R;ZoHpH!)5kG=XHW
zAG_a4l{Ga-hI|V`9pq_?hWk`a%Xz_=*Kd(oHQCorN@)wn5mFMUEMtWch4km5qXdbs
zrbx3J-1>iyiHu%+u<sGg;boMCR<=_OdzY%7!xX<;pA64Q)QjId=gk#fb<O;SzFxXb
z@N4Va_B3sYyZ-yP?!^w<J9doL4F{Xr#0FM2mq+=wsE=+<aNv|Ze$;Y<mPs~PEroeX
z-|jU{=H$M^+QjZH|Eua1*(#1$@BSRlh5feRhO!;;v*NdEV<#GETs_+F>-EQY<Y7^z
z%qR#4Z&keh#{7n2I#6l5uE<7N{S3*UJQn;bY~s49B;-B+{9dXcjj%QH<<oj?6WyNA
zrb^<KHzUfPst<i>S>F<CLN2{LI|5z!n`8Z*+zM+0*+zjuXP3r0bhF}Qr;3}gef8V7
z*0^KE^_G>_O!KYl-RueqQIDY}Ty7>WvpS%qMMG=d>!Fj)n8b~rM@S|)j+xnTYC&pC
zt33<QK4r-3W1%y;LeqGcF4=9FrB~c4{OYehX=?E57w0Gz%jLvGuQW)oGvzdZ={#Uk
zOw7KM-=TRtYmsGsYcPc!ugPJ^F=ZitP=JSsV%`<;n%e7x7k8N3)@0vWnJdiqpS4;0
z)YG_%2Jpt?UV1zTYS_TImG3yWQ$=SF`mdC-+iFU*#+Gr`;dVk)q1CRF6s!1;8Xxe5
zg@ALyG8^n^JQRKp+)ehEg_h{B8sVKXoLoNmt%eO%19doB;e(~aW}M}p17C>{|7=M4
z07Z<AOr=d|$2C{KJZpOT_c!Qg(lK?0vo(C!Px-e$LyJyCVZg7g0^jA*$~n)w=)JOc
zkyR#!ZY%LCVdd?gz=*4wY0VLqZ<D%T>$^mC^xoegbwB`J6UQt*T&XgNx@Up<9tWxF
z9FV&gfP_uZUMk_%E<%|^zw;M^t88dLJ8s+waJk5q?5SC{%Zo9Y;eOO<dkm#{oHV!0
zeLZI3^MnuJ6uOlSL6>lj^$FsWBa4>8w@7ayRK6ytG7hy84%ak!M-3Z;v%78C@)Gjr
zATH9i{ppk>zvD9Onq8Xj*)g>YOVMtqh^%3ji=?@iHv6Ra_S|Z#?76(9yQ}W-J{(NU
z+|5npkCiCFb`^@XI}~+B^}Z2THf2a~@wrv^o$RD2$THEXlHJ!yjT_!aCG-1K>;!S5
z$}O3eJQPDlO$kyws@<n6gS#2Y!FR0zk#6<bdZ^jYn9CK^2U9X18}eNFC_G92K=Ys@
zb$}yH3g|}s1EqbXNfbxOP+@KQ-k|T7_|<<d>p|Gj1x8`{bTTw7t*I5mUm%Uw?LRle
znLyMdI^Ok_H$F_PAnBPt#h`=Ia(UVxwzj<0p1orwxW~MejHq>y??Q@9W9=ov1@g@2
z4=jlauyMn_#`ywuKPN6*^d@Y?()(Gfe-~y^$ozXAwmgeiGj9n4KA%>quJi!<c9Y`y
zle9)=y36~z2^~FiZ&2xH{c<RqBcuvSSj=Wu2Zc*Dn;UIVg*9!}y|r}nbGjE1(ZjvO
zCj8-gMXt)vhkZm^mrz9i)Q8_%osFD@r@^R)L`30%PRz0=V1u9;=}vHvY-%tIV1X3S
z`D^%Li3t%h#WU}juaD4IWDZ~gT{KQwcEy7=C-(@d#q}JUJ=rj##tocrD=!cHH^LHf
zUR+M``_bguOzEj6Ck*~J{x&>A<odf+uDbfsEdAjkr!Z^h941=`2z7CZXV7tH@Sv{M
zI8wZ(0myk5$k(x@yF4NstGT>f!F?h6r6E;VF<U~SLQ=L%JobYZO#8=!neQ8haV2f*
z0-4+HIlAVZbg^xBikh2T9%_+_TC~s216TOaP%!Aauhc=C6lknir&@$i)vw{h=M!MJ
zdy}?|isbK-meatK`I<V<CdFIeo*%O12)(iXlKXzW!t6Cj_Lx(xDE6q3VB6I4aZ{}9
zWcZ{zwP2)kLwLOKa<7@wY)y^Liiv_Z1(D{)bg)ZQdsDO(tE=UQXD`j-%Bl~-FaM)i
zkf2#KQdKic%87tBTQa<90E?OCZTZ`4ZMP3qHVoNQyBAdlnyI5RcjGF`;$o$nbn^3>
z0hCa<d$;|V`BB5Z;mneRp?y@+X<1+s{dlIeK(#4iuzWBK2{vk^@~|!D))Ril<{EIS
zrBGJYXIapL0$P6%Bqg5U2Me>3EPG7z4L~bW=9=4{$~x1tQWWQot?Ne&L(vjHf|gEH
zF;o`yT26epVc6WJ_aQ7>XT0*-ZeIn1fwr~(;GI3|Wy}M?;=8^DzXj4bNVjtY6=nS#
z=FYk{xbIGCziEK&Gh9R46G<`DMFR)lZfpTH48Yq*XB9vG@=>_;5^=o*s+z~1Y_gK&
zvR3`(`Nq?du;z*2O}ck39Rt<eL>}IZogUL#XiA0EC}k0D&#8CuoVF%K%rc%>x?#F5
zaf=L>%>30lRZ!)^brAIMRDt^UYS`eAef{9=^uiyI;tU5n<b^JbSb?2dElyaos*GKs
z+KZ+UhW({rN*WP+f4oj8^b);6Za*-V9xahSa_{Z>I><YOwJmz-^Qx|~P=r_AuEGE&
z?BjAe_a@%pC4#g@aFXGaGyGi2exhf}Tvc1X(QpPSH0>KTqZVRGv9W<SaxA-e>~>wv
z=7g4SrJltv{s@uk5iw;&z+(;O#9=E=xgK)N!n{XqZq93*nYgWdx~4LI!@sYc{u}9P
zNTE%#)Q3V0742a><WH+^nM-ly7G>6%X_2Wknd7mxkwubMMOw&P9u9bX<xM?b(P_*4
zCj4m+lC%$}J$`qme2Sg>ZQ%DaMZ+1NzBh(LP1#Uq&r?Ju{cwxYrm_)5u=)fWI{ip8
z(e!K37q+NhjlyB#N>-)deBn2CH<sdX_D-r6J<+3v-xpE~)(NJ^iIbA>u}5P8e64W;
zd|Xz?$owxnJLS?B8P8@trGVxTMM#==5o>a_lSh9a<%#XdwH<wH8cGgiyHu$C6cPz&
zqbm%0u&9WHyZ=<6wsu=fZhCK_TtT!`X)G_IJ`@5r3JrTrD{9J8Q^nslAgJM-)I?iJ
zeUtL_v}{)KCf$AhhQmfH@_|Afncd|I>j_fQ^6c_^!{t9;8Z4m20ENomPVNw4!HSip
zc(-un%7kvr>iNF8PIByoca3q65<FCRpcd=sh$q=jf+gb`G#@8gJgp<3gaEf%P|<JH
z7Q%FZaWlHL!%G=$nLUEHN@S-9>ZqMP@DGQ2NEz-+=5KEf7fUGm8cHK28VK6NPhhP>
z&O!UOM)LqFO=X`R9HHIiyC27J@HZ$rTy0Lk_NpNuO~nohY@O9E@^NBx-Vt1*1ys^R
zi;CZ&!k@3MDgIh}rXc$RR)?RoRdl<H^iRdwQ2CkRaE7%#xvatRG*<1!a;Fk}Ld2ev
z27OG4r*Tn9M#xyPns_A1M^$DwVWh~e@uQ3qayARzM-)b#x~kL)MtCaL$lX+;IqX5|
z*ttRGAeMZs*h5C%F}%Y4ct49bCDS{pVo8`N(Rb=Qc%@fG%AW@5YX|9nOeMJ%Ju`~y
z_0)an^frkoj`$xFnz|xmzAMPF-~!>IK8;;OICgX2O9c3nmHT@a8eFK$96b&KB>6|0
zau%XI32GX`dWB!~C>hO>I4Nw5f>g{RChPD9Dc+OQ=$D`q+Q^Y1u~=Cbc~ymEwvt_B
z<6%O{J>t)VP<IfPiLMvk*y84mRV7B=3->ti@C<fYAjUs54*`@;e0BwF$%)@Rr_;sJ
zm{Bx-`lV{(Fz*5Xf|KT1M<(nyX9*|is`iz!d~forhihMB*orZ(8-9x(5J-XT47cJ{
zJfP6igY{!iZOCrzL<K%*9xSuDH0y?jNTgPkz(2qAXhSP`_~chL%-3}t?;7YFRgo??
z5ZKQ~3|(_b`|7}USHal7%%q59Mpz_=8Z~*UQEm==Q2#EiJYhLmy>n1<escZ?5kOiy
z9gVATva-M@H$$8EW>0@!4w^rDEFHKNuRKN53<R8;PNB)GJ&NZk|2fm#`BCGAq3ikQ
zUnx)jId%H}u;tv=xR7`ApIcdCaqj;-<oG{V9<}bBZ{HW5v;Ozd|Ay(mlKAh+`EQo^
zZ$|v@#_``x^1lVaf9t0I)`<UKl+vkNT>eK~r&Nl&Bxz;Odzq_^rwa?G$};Cyul@kK
zwL29CPfx}p$zx&mI)`0IE-hdpd{7Ov9O74ybABH2Jxp-NiA$%EuwItnihz4gssU%e
z9oCNP0+DdfBl0PBrnYUu$8aww7K5F^&)a5&6<X3?R?<P;LAZRS2j6+~XTUIVkj^2N
z+vlR%Gp>pJx3$u+2^9EJ#D!;!JHjZ>vd>JPH$#V$=vS+iD#5w$H0dR8nIrVYn+{)F
zEfp-K&oVD4H%acPsC<R~dl#VAWiu3eN<mz~;BjfQ>0Yg8|ML)U63mo7!P*pJLOfD8
zMvCO?Pp1KvsjV$jJukK#TB$7OEU$CFqf<HmC}-S`ehzVi$Biny6XtZ?u<djji>M#p
zX3!LAjXqp=GWJcfXwNVQT*H=nA`Hy+XgKwi%RXy8!3+MRK^9bzmP9XD{akX|%#zdg
zQZk$r*@?813fgNVsB}JOO6us_n{14B%raER_7$s71g4X#6f*y3+_S;WTEHo4_3vX%
z3*J4X?!6Z)(pu?Ky(BepFjT_IdH2@4LmF?kvSs(d)f&MKVbc8}lTWV(yC>SmiZu;a
zSpRaxk`*w_$(VYMkzKDqI+TqZRmw+Ytl}ph@!Q}D&H^1uq(y}`1W)m`k?8o0-{o>P
z3p9k0&}<UumMYNSYc%yU$;y1og8U-S&mph$I}@2|^Y`}s{>cBpo6Qb|J=g<?$SOR{
zsaSKz=J+|YQ*_9T28OfP+fd(6rh@arE3bOr)y(;05>4-f*Yu}t4KhVwqc&yybP1cC
zcq**%mtR29c*y7cX&d0LyYfGtM304OngtBFu4{>jB#i<pp0Sza+uzgXzKQFY2(>H?
z&nTMGtf@<?YpF?BRw2!(Zs>8>6rUda2h*ZF!{>`aYF<=wG50Ep?s`pIfAkrwRVa$e
zbvDa2ENnZHmy7p%FZ4Mrre4Tb=bO{@<rn;6cXAk71@>vRb-fHMzKC4Dme7MQ`=e(l
z;3*djsl65MqeuDr+l!BUBTrzK&e6ptQFU!O4}eiTmjhDnKD*m)$V=FAZFg_F9YZ|S
zy!{3;hgj_1KA3X}W!~}=9(_&!kBZJd7Qg6v0rcZ=gjO2r(Jec_EGeT;Hw4@{-s0Yl
zQ$Dkau_~05R(Uo;4vf70LqDICx~iJW?sRe)0=-1P@}&J9y{(=>wcgii5zhj6x3xs^
z=coD3_YQJvsUB$IXrEIHcf2m+Ov0-v+Vg)Gy4q8?P#7V<mIb<@=OSekpOwcKr2W5o
zR=Ixg0rAR<Fq#ymQtN)}FY|!01OCq7Jbz|5Eh2H%r3&nJ&t3yHc^O;!Ai!N}lx&ef
zr}e=*W`euW-^))q0<iO>^Q&p>ZL>p%l#y4^r(f^1g!eWocuOX(SwAhZ>=pi&Uq%jC
zzG`s4K_o<8v-v;Nyoh<UP*&@1Sr=PCO}rX5$87gd29>Pqt^h3<xiIhz^d<>JU+%E}
z(;$PXXIb=n&@0sso`iJW(Vv-*F5Zso)Ezq#$a<d(ZSm+W*Ox2G<s%rP8K47+Gf*$J
zM?Z8no9tGv<k?B8%(~n}NMOi+0<7@`j1~4i4F~uBo%t^b_GG2h;_Ur*&UZ%E>Ea~U
z^aZPKHC!Rbu-;9O;VLUG@4;g}nS(I&UP5tG@r*ERgo$!Q;>$T#7Z+an!PKmnPHP|3
zpu_cG@ZP-ReK$_d!l{G4;54^gIjyyaYvrJ=3_&<Hk?}x`JSsPLcv(d4t?)Jcf^jva
zmBopEg;OK0D|jVR=ik)g%%xw9O|+Y9o}>FNT2L3cuB7F%Hmoe)`@Uoqe_UZ8o{j6f
z7w`3Q?&2LMKHH1gZ|)&&4LatfeG-%w%S@jOkH!T2mP+1X{xjIrH*h5{NM&Al`Dre7
zoCS(k4<?6|QTZ;=l=6M|1Xnl`tjD`CcrQI1a32Po%NBg{E09h>cWZ9q*4zIJ&gezj
z7K0~1!rMjguX}}6*Npy93E%v|lB_nM9zaQ=t~s)L|KJtp@7L4S{I6MkmGjyP_YJ0U
z(tqi&#4>Na3pHUdCaz>yQnJ{BFEP{?`wfTWQ6yJS6HDOFR=Z)UW&X~+k8saexn&wI
ze@5kQc8*0X(SMm0KY8{&_%uiG@ZX@&m0LV?ymF&po0@d^G3fIkFTAddJl$|h*Vf7C
zWaJ%vdexl5AM>Lnq)?H{O1f^ZiM0dXzo3ctt;zmF=T%v6hS(E_;nRZ-vZJNoG3s^I
zy89pO>KisG<r3X0`J4SL58g86XylbknWyhuPSzZbuzvdqIT#rGAC*qFLe+7NIeN5D
zOo1Hgk^oG#&j!O-nm~K<>Pp|slvkFmbx!>33lT4nU;KlAgp?%HoQARR{MBvhdTMbe
zY~2tOlV)*mH1&hg^018^qAXA%><&)vBoW6X%oZ_{cx-<E@e1YAAIVh71bdHI<ut8^
zk-)@LvDVwV5^Dd3!1*2w>2A(o{F*|r&)SDd)rEdFu3P*FjI|CEC=UESr+U;7cjsgG
zojvi(Qq5g4g)TB#4h1uvDB>j}2BB42_U<t{4#0bRbDNF&<xT<YCe(qRsqliSk(0x?
zyE*r#D_auG(p+ELFYh#2iaF$VkaG>04iRH55KY_dU3y7T&P^TNJ8S=fq1()el4b%s
zoaT(mMvoq`#lfxLJHX!3T4aGJa;wB9Ypg1?2ce_*Y}S#FW}^YjfWs#-JffmK;fvoy
z4Fq|pvk;{=f4swNw6{!{cUh!O(#A5eH&cH-o>2*)=DQ`jb^pOrCQp$hv7S235H*o^
zOOYRY8<{qB(7*k6!eFWowWQrBrDjSs1+19#=fXjwQA}wCX*(%6Tq!F4U(UwCLXGOi
z+1bK%Nop^~;R-iOF1Fe87!3sjT`%{I4o2{IRIlEZX)Zg<+g*X2gB!1I?_QTa@L6;p
zn69A!krDzr7Kd4CYWWV?4yt03OFgEcXl9i2M_iuBJxyR7=vH?Z&)41nk>vN%485x{
zOQ;H10*v1%RQ6Z<EYrVLf=boZg0U7KJa{|a`E?B4z2~{kt)jU~gpRU#_0pB1EnXA3
zQS&I**DOxYL;)Lc-lf5j1q;Ce(ZW8f=qsjnn#I;RwZ3SN2Fr-oPcoxXyM>KXfx2v>
zS74_tWSWmQAoSma?&mkuF0&c2#yDm|=zVZY*+vFO?>3qg0a5=3f_v5@G(Pl&p4`W9
z87Lf1Gw}A;cfVX`%9jjbw0D}n>dL@<U7+t|^{?^Ebk_LD(5`da@48&az2Lu*74^o-
z#7OY|xGi!^1{-hxh0_wz*0xmMFfogK_xTP_Vq@tM2lKG13O5%>wT58@!WgXM{kY3f
zL1yhG&pKz2yG3-*&3`w#7lNhk40ou7grAVJ2)rs5{FFjbZBq>a@UzONMJm`}t5_f0
z@T@NLy_VgB?nVu%M#7*;%?I|RDhv4~FMUDR9=DE3VYER+#nMO!uWs*ekv;clS3H^b
z67Ze_X;^J~^GCp4;ouJ)w5?Nr1l7Z@vrEx;oAy9MXJm@n%OAKH1iva#HT|Zg5;$T2
zKqCGX@<$i7AJez2E}ZUWX7AlZekw{F+qqY{AjDzB)c%IS(F!)lUUR!4Q?tZVN4eEs
z8mqcnF`*!9F*8Ot{Q|owvMYfbrdQQ>d);WvT%X;~YH;tCzc}CZc)m<yBZ!IG^CmL#
zcWqmA*bH4`JVtGvvVOqU!v3(8zXhe4_J5H%6ysME95J%Idd)ihBdvv1KED@4gLoaq
zTq0M<`BU(Bp5Q*_+e4ZaO(1?~Fu-hm!Ufm-iYusp-KnEXMvSjve~M1Adno$p=WMAo
z<sVv}$nVbU2IQ25En%K;%h|DS&ZcqCr;>2d!D=0e<xSa~Sl%}a<iLi@O{iqnx|Wt$
zCiu>8$baBWMvhR*p}T*-d0$3I4P2Jo647#eGX;oKx}x~AfuXJMLK&Z+2x6dGWrDc_
zW&0R!L$zQ*b?vwb<E1p7W-)4Ac16_uC5$gc!?a#XV0+{3TlLNsS+Upap6FiF*3FSV
z$O-mq=_Rh7yKDD^pock*Tki{43?n9%Am2A=KJfl$SFZXLR4>kK_q+&9eu7`2XP8*O
zotF_Q?#>17?)ci_Ykso}M;Mr?u8;bbqT5G5ByHL2b9dq9CC~ylPGRU0`sa$mt9Ky}
zGs9nenT#OT=0#O{m{#wZn#sO+1@qTX&5RUBr9*vC$p`zf7>vQidas@=7rzoIzE&Hr
zL(WP3Ps0y!)8iFk!G_l#$o*dqX8RaG>GnJ#A-_2I_T<kNMU96KxKdxP&tSpS?}g+j
zfrVGv|K9mh+NuwY_MYjOSN<#eK+U`H9aXvcO))h~+J-)vM0|sSPtwjuKCo!8!SvB|
z>F0*w$QZxsWzNdo!qf#9FWw%a+z7cWHGJ#po>VUPE6iZ9PAY(ICU@?2&{W)i7WL%i
z+z?Z@JAV^q(%*oP#}XUGsz8SFOf({G*z;4}M;1K_Y<eUWuepkdDXWQPe}JGLPb!OZ
zS{?9>y8dLts&|-TWu;7ZgGZu)j%9SL>B{{Oj^|(jR&Q^W{D_gSybL}Lxkc;hqiQ1I
zGl37oFScIz_RDj_VJuT{kBzcRBZ0<)v+dTuX|6n+-!Rl9Y38wkQS=?<rkyGu*-K4V
z3NZ@a_n$v}G+pWO^;9<L10!C)B(Xz7=zg*a!s*wHe}a|t$B(J4${*X`Iu+x$p)z&%
zR&I{$0h&*0zy5^*=tB0KFzxG0aYHm$rtdt*dOlMQueF~5I`I)f0Ta)P0!?JI>^ZnU
zF#`JI-yk>+9sg5OztDWYDWh#6E=%ncd|BZwg-xpOk5z0f>;G%&E8L=No3|eXMOs=y
zVre8?x{(qjq*;)Z?v>7khwcvPUQ)VSx<O)T7U>RYmIXe3-*G(p{ss3O*UX%Ao^#zZ
zS9Z6tufCZsCzbWd<$5AEu1eBur>^xGCdsRdRpO2br>EU!c<(sI=9m@Xg)oF|6H1;*
z%$!p>?{6WLNg$Q6**<<vS~RO9W?Is>B0o<hecryM80O45%l@&~;iZxBslViXZ-d8L
zqQt2CNKIJiF#a5mW+36|zgUUoP~)moa+2JP<UB4;HzzBez@nGn^&y7y*$*zAGVVo5
z*wLcR#2LYyY!<MPndDvlC9u^TEI}}LR}gB|owxt0u&JM3U9m)CBD0EHn9VHZ?aMUV
zm%@n}GNU@zwabihg>5P81mPW>`maD}y&f1%HS-)W-K5_s$$<Z|s)0NJ_5chkP^Eq0
zDz!B1)4pAG$O(levWv=RygKSWZ@SQhU%xaZy@2k6R-H<Czg^kQrn1O=KVW*EAdczA
zCxBoDm|?j@!bhxhu=Uv&lJrmeBmf^rG;49E3LbBO`bBQL_LX)??L>;@Co})7<7~&r
z^eifLb6g8h2asA{qJZxn$^Sc;*z(>|TYtkD5IkYoP!v7G5^muoC;qG}w~7|%a}cni
z>E!_~S?5eMCHL~M5iGl>oEnhMerv1jLU4eOLOr4q5A&ja<i1K5BGd$1e|zT|{H@bK
zS*!FMjVk#Y4q|(kz|e5ApZgT;GyS9^Z@ahU=VYbGm#O@#T+HV^PN#c))DoHRfnoCu
znSYW>_XDZkq@tRK+RL&Tquh2^Y^^d)*_z1@a^+O$nqO{&g}%*)Y#A|U%#>#PHM2q5
zwXn4w4nn%vZGa0lSj5r%rx#P2$|>orQ2%<jMC$x<4{bMS1rUbxsZ!O9s7&HdR^?%r
zs<$(0S3FI-ZLO!#e?<Ek>^Wn9uKiz?477btYvAbD&@tU45db|5zyYv|d_;uAe%yTz
zC^1<RtHWC~0yFtl$54<~WZPR#_v!IxR{s87qvrtcJhM!ycN7q37KyaG$Y^0C4Zx|-
zqpw`b<1>w7Oq_x3rX@NdTNhPi!9!)*GWbra4IV3J(Hj$J6O_ZNvRUFk1S3EFEdsLa
zl~QY57|iK+Ss*D@ua7zlbJqnmI1$EUU?bst$1$PLdSI(%PsrZkpi4xF4A^vq`$uWL
z%e;_w>Q6JpW$U!ujoz8+?qMSPVwvfEt`IHxhdQ2P{{kIuFMN!EGckR4+sT)st1<TW
zjZ^I%`V<Jeq>8(E0)j@jZw&uM>mbP&a|$hbI__Oy+nxtw;&#^7&&XvXGXCj#Lr1mP
zSyrs}lH{P}ZJVOHpNwkW>Be8J?JtSmqL`B_RuBy~`!o4_oy42?v~FZo@61G{RaXs+
zost|0oYy%2-ogk{s0lJq(T~KoW<78)@#P4*Na!EoKVVCK**k3{uj8D`IVGYRM8IK@
zj`8*;zeZ>i86qkCKb2r|U@@o7UhSpSjz|IY`+MnTR2EHV=9XaXJ}_`-<`Og82SjNj
zcgKC3K-(9K1-x|Nc_zb9oj+ie+cZ5wP}|=dqm6}PrRP;{Vzp{{u#H6x?W`t}zwBOw
zoG|5Ywd%Y`L?e_-A8Q~gP<7G-l3yi-Z;?X1wB6q*T6LlNNxcugrT#$L72$?yBOz~4
z#zXQ~vL*XT<~-M1R`64ipF=I%<wea^*#@C<u|O|gD+IFA*9W10P4gnFyNMGF2{dL+
zO2s7*t>J<))U0{3dX8G;H)`0uNxE)|w$c`B`&_PN59e%ZS?>GYdb{tgucW7lo-dcS
z<aCzWpcdMnIvaG2<|A8T=0MXXf`gTGX5|fIfG3jxvqL_`j~XT>VN?DGf|3nbu}X`Y
z1|M08K?IWwmI$%Y<1U6cbNN#37v(4!+M_t7KijTVFI>nKkTa#>lb`cQeNZWJ7&E(f
zHcg|k*!27HB%H3e4EW-xv%8u;uSVB>(6&yXOOUv1lCLKYEz!KzNz}l*?_w%E;rD$U
z!8Qy}KK#6d3+AA3!O4lWrmrYSrU}-XR?JLc4cOoq2_$l@4(}4NH`fQ<31R*<GT^fo
z6PfXzzrd8{pbRffOOOmm755YHd2SZm=|+3u`OxsY`zm)C8N8`@gH>At^rnnhNw9`#
zdPvCk*6o|oei&lB%a$tLM2`f}-}-|e2@u9|w1z3=DL&+iBTe5LjmC5-Sv=k%?aOOL
zgGbNe#_vqBfVOv2_q|?W2hwC~{e!7RPqXSdB2J@i)PF&N7-IQ+1tqa2%;*M+hz&|q
z0*%bx5rjFYI-2cUE$BB%NpMaH<Ggj^zul$|PHBmc{ESHSm=LY{n&nZVdH7CTWq99t
zWn)3-hLWie!2@F}{spgB8fW6e_<%Z6Oq1e$=kDzltA1oU?J1C)<dtFgZ~wVHXZP8b
z^qrG{Lq){J?=!rCG>oY2J>HZ*DG<xvHTs@F#{qwh%(Mctc1j9EzgMGYRxiF!z$r+V
zF^w^XfLMP|YI&;|XT8sWw)Y**R?BnGsDX=?N4dbr^)nD%zAMdW9o<jmvcjHaC^qm>
z^Ei-5z1poWFDl?^;Jdl@T`Dns@zY2HRM~o&?-Opz1gB1QmFHKvwx)FiO{ylq!HUUY
z2H86Qx`|Igwk$Yg)|Bk8Cxe}tW`pe26eYS@@;~7RqXZ>xKO_8<>|??~QHK<4jyNRc
z1&vF5#;7crMX01crX8cki{-1dM5atVCkv{0*=g~PxpX$iOl|pqCnZy!$>gs1i@dd!
z`HEQUiZYTCbhg9Ku!@)}stctnu2ob;>;BFOdt1$|sF^$FZ_*+j9@_S$m-Qj#G$voW
z7)Qd)%-}yzd%0k4yPwYPlvZN%De;zmPDRQc^IX0`Ok)~aZM*9%BM^}*SJPH}a&Q@R
z3md^rCs5CB(K9Z^V?3hV2%4QzRwrqwyVDID+WXF%SX4+L$mw!U&~O;t;T1ID5MRo9
zo)FTBv>KbiclB@F<?o;^0j!zRmgix<N{db%*lGcGOCs*wLvGa2L#MFsKI3?l^MUjc
z=`{aYH|T1lFMha9MPC<?bP;Pj_}tUhhU9i^AP3LSd3FZ=vVZg*6Ia?=Gd1L^ca}Z?
zYrywL;Ty4f*>ke`CCF-!oyTMHIfqrLmVeWtCBbn>uPFl-!4B48{RGQR$DESUicVc0
z3`zB%MyPR0^Ya4MuLFIF*ATEAZYMO>yq*1>G4p#Tm=a7B;r?dqo9_1f2<P7%z#`N0
zqncGoYt%_H*Q8Ne`<Ba45$sG9K2^*o?&gTnEQoGKQ*j!A+n4rEt=6`CW_hr&1G!g*
zuP%(mWj%y*gqQ~&HJRFti`7Wda&yah<k5t<&e)>?VZPCXn%_t@3?CwmYbzI#BH7-V
z7OTRg-=w8n{X$^KWfDogQoXljsE{aGYVHjeEB>XCqO`x1DggyYCQ132R0TZWe`TM<
zOFi)w)IeTZQsT;vH^(-FQ8ve1ogw#*m!I27kHs)MaZz}iyBR<%{C36VCuh=a)DR1P
za~FF?iYSnG%AbfpAp2TR`=rxR_Q*U|t!Qb72-)T;ahWt>{bJsFYA7h4<c?|O#Gd%v
z&ZvhorlZ+8eB0=h)OhN|Nn)$g!k)`KjbJP)dvVI}pFgRPHJKPln7A*aOao3wQyLv>
zjRR}BVLb6vJvsrZ8@xU(xlGDwN|2(p&X-!+7(E@uBRxhImr^ImB8|<_T30+DMQNWm
zZ<O|)N5dS1hFNNPwL7F5&BfL{f&)Y#ORFAB(TkmsS<lDu`b9&MIPR4lXQr}Geg*p@
zND=~#Y*=6L4sG7q$3E1PXu?=cvNF_#&CK()AepMMg0>8U=&{z|GeAD7_+w@8e>`kK
z=qLA=6b1x~pFsSp53zaSu^P!ox!!6NKSZF|PBFk_RQo{NMfY$>3r^))w<VE!cKc^w
z{R<%MX(bUxrfM7o$Ki3OV|mYx%%+7oDR*eUKCWQMZ1D;kXflEx|0+uoh5O<B!jAJ1
z^tRrxt*X`cx&n9gx#K>YxA+RQ7=Z@cPa#SYIZK+5aVn$D5}5%sP_UFRjcgbPgss}I
z5O-UL7H&feD?>{Wdfv-T8UD8>j^Tf77t=%7CeFdc)R}_-`n>bO6Db2zY@GqW^IO>0
z1$d3rJ#E~g#%-+h6%-*`HOAI3hQj1{we}Ptr!Q`gnyo^}j?lK_y(I%5diE=#`z~}g
ztI>t;ql!45+*b5KRf^-1y?QM-XI>y<aW|jqUoKu{YYXZ+zu1b9I}0Q9#d>PxElJ4I
z97$CTmjw~J0FPjv8h5x7qknmzaaRNRFYWE3@<7#JVjIu%qGlAWzks}M%Kj3EhFsJ-
zOlv>#Aesn}vCJuYyh>bM_ePIFlB?7g8Y5py)Uk1H;^!UD2=qIMyCnv~N}zQ_m@L?=
zN*uf0#}99wjOWDn7@H<F?8x4?wM?LP<bW@=u3Wo!rN6Hc37V2oUyx3=LLN=^QQyOo
z=F`V3uMImJ$?cDNXBId<20@CyHg|12hk?W^wF`HIYua!}b2dkMo4>u-Pj+NCbnNIL
zQoa?>Q+p<~S^KZc-Tvi&I^wB0e6c{xIY9VL(k_J00|qT6Vu;6E`$8L}g8RaqCNzJS
zlO}QFDDDjTT7{~e59pGSA^GUk6Ld*m_@F24bM|D<3O|^Xxco=0twWZHf^WS=U1{0I
z0=klIrF{0-RO3gL70<iMl0k8@=dcpkq#<dXlaks>6;1Icx2UN~=3*+Br`*eN&PP88
zUCRGSNFI_ZvuOt}YF-7rCGn+s?G<5Toi>g_kyKsqw>xR@10yh>yvElBGvA{%Fmq5Y
zs!!5prRbU_px`E+LlBmh*-DhA6pHn(bNF3|pE<(d*FYEx+r|MjF`@)?R36MEy-ECy
z1OBinf{eW;8~>PRtZX~q#WN>A<3npdw@GY%CIMV1Yp#yO*{Xd*sL{Au2>>@)LB3w^
z!6wf+=!&aG!Ht9(!ULG4;t2ob=wps39)-)A=GVyp#2QC&uv+2EMpQHJc+TZ~`|ywD
zxnZT=Iq+Yj>F$3Nf~glX0j9b<e6X#KUA{7I%WGj(Xht*aH8jBLcX50H*E`LCZ3Aa&
zpJv%kM9`BK_{3B=o0%dsopjcG-MohMd`$8x8wx|tLn9i+X=f*Ll&H0Md8&VVc4n0h
znC@)vJZ`KKW^!Cj@r|f*i5g0a(F0@$?qxhk_D+#~oF`&u^^eVs<UVjkYN0w<59l|@
z9p;dKAJUOq1oq*R%iU_eI8TG8Z=c))tM8jqwfW(|xr_VO81Ex%@ZZkp#6P$k%R;Rv
zV~Po$_8%c3#7wlubjwb~pCHw`2q@+BiwrSxGC<}8uhmYyjm=v^+quYd>8)yUAuYwV
zQg15yeTwYtqk@^&ib8HakkgGKt)6+-{S*C`%d3#J@nJ|Y$v}-sUMH=wn{v7Z`24Lf
z|Km~i8#iCYUPcKRu5VU~sG)|sO7oBd`;M}VCN8HQa$`ld<El@+Y|SujFdx0ab2ml2
zdP8r*%ma~&?sBrNi?p*C{`kv}+KV@8qux2v-w7w0_?>cG;+cE$630*d^Yo&OzlABX
z2dj~9?%z@q9WUF`q82$_@nJJf^qD~RHz7+@cln$KQ7QZB+1F5S=0f{6E6C}!a%FUf
zg0#WIOgZP>_IidyK9B2+DUrHcP%7aqF}}yfc&)){?ZZD}d<J@&28-jqSz#iEE}v8+
z?%3o2X3__z-Q~V5cY||c_54_+MYy(?j}@mPl^@lP#4mEP($I*p|22>=%aH;VExw_=
zhZeLA;_%n=%m%Mz+!Jm6?Ir0`W_8vlP%JiwEK>%0|0|#Yx_Ult?bOE7g!;@xYQA99
z{V?WHIGp9_V(<xp+JpLc7=SJth+ijJI&UBoY=u6XkF$b>LT|a`%w#_Rp`N6p+o0af
zD3d|koo!MiHr0K#$FnPf_!bb?(?ZwE|9c}Kvmh#p!AIN(K&=)>7ln+I!Ntg4Tf2=|
zori4NJlcVIkrCB*Fu(E#B&KiD99wZeT9SPz)Yi6xXlz(iZ9J)obWcr_AfJMVqQ}9T
zjXLRniU9}i_^MEA4)cYidfhLkWCX#Ncl{%mi?k$EQeS4wCGuKqk8OA?9M8giX^pLS
zewkUgMn4pWE<emT86tA<PP#G=0R|!~?wPARNv&rkyPOe&>3IyW>xT=ArOYqzVINiL
zRg{>+9>5hj?+QO>Tm%}qNDW_l?c*J{uavYHVsjD^5kp-rP6vo-oS1LFAG-38m*$Al
z^g43-DHd|X{bS%4orlC9iuG#Bq2AaULI!jpA?Xlyv)?&|TDajF3WS$1W#3JS<KrO|
zvF2R-vNaTi8P9ZC&pyWr$S4l+U|7cUHh#^1;k|Pqvvp+m6BIsplCo$c<7_A*VfvGu
zirhi;Hsc$zYoXG2`>Iwrgj%zHWdPSr92ak^>GQyYlXGMaK{(4FD`H1#W=yPIB2)Ig
z6p4W@J>zQ;<HwX8+R_GBn@)yjObpXdngX;6^V$@Gq`5Siu|;&nqb!fxj>GfztR+q}
zUK;5i@JYZIFnF&RR5ElD8tFfLwQ*c6LXc;nEVjd7D0+7}(RMhxziZNx+%Ajf_NV}I
zY@#pFIu#W9pn~x?5+w)C1V1UV^S*Zjy1bCT)l+Og4bJSLCIfAGoe6T@%2xm_sv9!u
z;c!6Q7xGGA7>i}jB?@7)1?J~VjIt9*k3}z!!Wl`6Rl5Q`frg3FhA&s`T==jUC82(L
z;gCenEk(z}!U;)SjHu`#a)B<SmD=yDgQ?}LLt#z@&P1f~A0vNB8({=nw5H{)UlJ?g
zn6ubF9ACp4KcajHP*oKDok9IT9e>3X+_)dxf4{+d%pEr;=gRi@Lwk7V>Lr(2t>|4A
zzqkAp<HB~0^K=}-9_T@_d~^~%s2sM~k*1|Uv{0O}jAQtCXow&8h`6ZoM8@^B;~C~Y
z&iLFlWeBxMp8WO8D>Xq5-g+<Ik`nH+{7x5p$SEfA?Qf>6^BzML%f&257Shs$<~(~@
zjbp;;ImJb5xL_EIp53dY*@8TKub!g)GoSaHx!b0&RvB9Y4R+JZRz`$+ID^kK6t<E#
zI}?x%C;o^*UpTea+36Y_H8aPv6q5Bq!sQ>w{oU7sG9UlQ&R1O1jp}C~c0o&M5CZig
zknF1OG~yR7{%sgj*1c5ra9lkW57~UF74lAIbNr=5Nt>bcG0PPrXg-2Um9_|5{+!jm
zwh(e1KBUX7Z$?cJ*ILN9ml-=u(A5UVS-n|S0-VL6>SlV~7@de~W0n??OsS)T<dg;f
z*C8VjKlLl-W=bkB5DU{~`6sOokW+Hv=JVeck3VH0@22^h%u3$8OnpP#ZrFPqSh0OV
zN|v5&NY;LYll|Qj{YWE1V(ju?ICS`!IIa=Frm-oNm!A_4sU;axV^`0RnHQOD27CLo
zE#Ohl@3&Hk&EMG(dVEh%|MvdVo2t4$41#tuttl(MqxPxjTrbzbI~8P(eb$pneNE-x
z6Qh`L)w@mYGVt2#L@Yq^Jd32whu}qd;ADc}ns<8BI)LW&RlCYZY1XRQ;$h{;aIvnz
z*^7GvVy`kY>;oy|+MG03o7TuJfw*k0I43+GpSIgacgwPqyV)-IJxwu(3ltIpQeBk&
z?-K2mWITf)?ArygV0|NbmX}ZaqY&}!-jh4l(U%#b9!IkVTE!&7mPOzYV-prb9tGd*
zur@(*4dOYpw-*w4Z`+S9v(aK0#`HaCsRb&he659!MOm*%Ub`LAxm;_kGadK;48VwF
zbleCqd`;a8rb_Ghs;GjK7vnlqQg-yWCHG1)d241|(s7@tVy3aIhn>{5sCPyjf=nh|
z0kvkOzsF;--Krx=xGSVmXYqzJ<)=LJ((L(^{Dk2cybssw2jX#e^bE<q5gZy@uWg1u
z!s!6uNs%>_NmZ30A4>d3d3+7J9V%q^jnTt>+}_cu(DGeo7o)`1P)W!4O3oufOxC{$
zCb<f>hFzw!nn9j8F$}8}eZ$`k?EPfPecJn343rg~q_dKFZH#N{Q_;=>0Jtmv`}b|o
zSgb_KN6wCi4S}0w2FUW!o9Wu%uh9<8xi!0k4+fLK3gVFqQJO-xl0}Iq@7vpF+jfd7
z5C?C$$K$~ZrVf{;>-U5jcltW3w4p3~GE9HqqeSmW9zt6*Ywf%De<b~Fb+*_48B&@g
zQ3b%=N<2#2O-W%jmS+SqPz+p4K&|w^>`+X{VWHOAX4BQ`d_Lt%xL^bE5_O8F%3h-P
z@Hy1Iq?ldg`WNYd;i|7Gq9p|HTFjdVtJJ5yV`CV>T=+LA_&^8eGc%<L>aD`oJK6Pc
zUzq%nq4?E`_)Ui(XmiWEJgE8GFt1<!bhB%AYR4j~T<MuXZNpcCx`6IvRd#CVkuC+-
zTXfBf^#d_@duvpF%PGld83|<vXa>%v%2$lHyG(y?<b>P;f|25e$mjSTOphslzy8pD
zdplr%+vUrx-&@d<#-TS;Fq@d-e{aIOqRY)!_cI%lWaaH|fT75Q<R=}9JU*!tx{qI4
zzv7GG`^9${5+r!FQM876t4N<{RiidJTK$N&m2TH-P}=g-{<N!JtY71(OMN~p96luj
z^MrQ?VrOgC`sz#;cbKGYK*jGN56b^v%}%&K98NzTN;lrj86ZZGbWfW6EOKqMk6NIi
zGTu+Nqy>e-zo&r!t@~)t*10Fc$gt?ayUltf*&<iqGcIBM>Ia}pXXrADlW$CDhn>lH
ze|ALr!^6e8IHH}ovX;^Ay9j!K8EU;;mC$sk&3$~>GOE(7I5VSL`k-IKfoChL_#Dk;
zy{hWGI7Kay%vb+TTiyLbs_S2KBj^p<=wu^g>#PAQ*&$o)k)6mra9dlp;NPA>*YZ_M
zjFbUWN1{r^mz0+)1ODj1Q(*-^Dt2Q@n}3-$`$b|Bb=q$&{aN=9emMLB+8wGYrVib+
zI?8SaORwe|gLS7=DVz*26<zM;j#t}Mo9hRY`U|#&c@#F(31nm@qIQ<j(}z8$FJ6y|
z9J_o=r9`OtG3o?_rZMm1lw%YzyN&L({!FLt&?F0*ARo<cIOsbR{hZ8F={lCE@*4o*
zFnV1MZLSkR`;&CGI6__+=_0{*s2BK|6+g#6YU{>Uyo^C+*-T2PFjEdLN9&3@Y!;P*
zoq)*(J!a8qcgfp^fPc`A+L`dpyo?>QOP5gyTR^>V_y}#liya5y;}oQiw88|7oA`mT
zGk}Z8U-4Ac*y+3X{OLb**5=ov6GQMB*Y*~DZ`*jE6fl--2)|{j_ORQ+o3h{Ru4GyN
zD%17Xj#Ynem2!Up)YCYH-K4Td{(;QcqaS+Y($8nv2t<&1Djob@$vPjt)Y4r#h)@@h
z4dOo^!^e~?3vdvBHa4mxjIw<U=oX1>;j*2Z+2&cDYsy=N@FkyZp&j$qHV(jYanz{R
zZ_7wtuxdscd<dm2Zr1f$vZ6RPSMM)KRbWBeX@Eqjs<cx_yVpluhULFHK;mQOjkDS%
z<E;ytPbpOkzlIWx+DT~%N<m)S7Ldvs#_Rt<j|IjlLG8iZpLjA9i7I0$T2mrLAkr+_
zcrhJ@<S;<rIre8}9SaVX;?Yli!wyy5aOA2e1!xNk$g96^fbZc2saC<axU`;R#W??%
zOl<8Dke{)iC#w}08??@X_mx(?o+YJlRaW8>CA)ZWesblQu)5wofrIFa`PaVV<~yI5
za)~f~h}Y@AY@eGN9orXAMJo<Dd(e(&3s}E<D)QMCrTkSp=`vXL_&-u5fxqA0ggO#^
ze)-A((o`f2i`FDUrKH7r=v`E$ny+qezHMGXk?mOG>z#4GQ7O<{2<gDsuGvi0G6>kk
zdr#K^vnK5MSBH{tRRV=XpBFM|zFs)hfj6pJ@$q<BaQ5wILXBDe=K;NHB0h!;%D|~v
zfYFPSo>P*Y-IRgtDPzppJsA*U<arg*2zKrR0Y%bZxje#L?*GHYIlikeP6p2&yT{0w
z1sdhL!HjL5$q%gFT}}MNEMzWgDQo1ND3!cd1boW;uzOQJjYhYKd0~Vl=xV#7Y>Lc1
zb$NeP#0sjN%53AUP4&ptM=@zxu*JwiZnpOGmseXq7YF#PkZ+J;iLl)%UL%66K2l-q
z+srOqL-T2l?62(vJ^Qh!hSJR5^eiogi{|vcVc$5`gOia*IcIx+`*4%KyomqteGT;$
zlg4I7s2)LF(Wn$3BRb%!sUi9oBj1M*s<^KN)3u(`8ZYp+Lx(m18y;(p{l7Va#8j6+
z2~5%eMJIaJ7;-*I(p#<9aXNY;g?S+~c3B#=MRflZoLw}9W`^H4gd?Sf9N<vEiStK-
zir%)o(Qt9qk?kFhuNsarU9rr}9{mr>RxQhEE?Iq!tzBFmT30q@Nw%%I7eLS;g#xk=
z42~r45v$SgiksN*T*#MHV<AvB>Z#Jz=9#T&@XwKJSD~O_NT?hOsll4oG@{+PRS?0;
zPyZV-G0x98-_@VvTS~aSO0uY(dFf&D1wiv^nmirL5}QpERTiMi5`3G{77QJ=jyCxU
zglWi9NbwRU826>NDWs*;$O)U#or`?epPouEO@Pj#!I4_q=fHYivD*5;ufH+*b=!RT
zWyyZjRNUPKTa-R+T|2SrY;#~)CI+#;>8UHIGRCc9A35g9v-R-C7=qb<sW<Z`R9WbQ
z6Q})}hwH3zd+5vm&o77)!><K7Us>XVu>zr>F|h560Bn&6B3atfoDa*DMx=K0py4q!
zq#V||w2B-zHa%^0THSE<D%AMoLQR^zy+2n39Pf~3=Eq)Y$}Shk>n6ta{fz)vv&;-K
zfK}+DyGnCkN~Y|ten;7}PVP5guOrkzYIxb`>AI@$ovPXSsLWmNPhfa#Pus?qv{f-c
z$5ZC_7DyG>%|Nzn*AYZ8d5sB+L34x$?V|6*vH&MNsb5a5u_LQGzpK3T#Q37+8M%#S
zbG16pgrnJHybgcZ;5a2$+7uuEZWF-ph3lur=9pDqRhb8mO9mbG5b1T+*%+s-z-Lb{
iBnWiAF#|kO8&DnHjsm2epQZ}_`6%;Ax<b;(|NjAk4J&2<

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/z22.png b/BPASmartClient.CustomResource/Image/弹框/z22.png
new file mode 100644
index 0000000000000000000000000000000000000000..a850d707a1d56787bb20e7f227a8db83ab793bb1
GIT binary patch
literal 16517
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
RkNG@{fi6I&{LcNq{vW|`BLDyZ

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/z4.png b/BPASmartClient.CustomResource/Image/弹框/z4.png
new file mode 100644
index 0000000000000000000000000000000000000000..d66abc7b9fef87c8b7f507ea9a3c6da787074169
GIT binary patch
literal 11940
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
PeQo2qErEprg1`L}5jiVW

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/弹框/弹窗.png b/BPASmartClient.CustomResource/Image/弹框/弹窗.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce73a3c8e5dab4d810e871383e882d0c2de99988
GIT binary patch
literal 38972
zcmeEvcUV)~wlCX)C?E(Zy(uD!6zS3;U6H2rF1>^F5+F)1(nLUdlimqMYLwnXhfoEC
z&_fS_Kwbp*x%=MJ_P%G|``-7y!yoHQX69OJt}(|P<2Qa|%tf%0f(+p`s%tnnIE2rh
zO1{Lwx#Ww3bHNV}7u)h-=ExZbhXLoAq?n3Z()u*;1CxdOED9OscBde}4(@GIEJ9A)
z^ajU~o8lJdYqeXW6FcSPp;F=+r6lv^dXs5j4H*r=ovsOREOgs)Y;bkC{Jlx1)w9Ay
zsSBZZ(tmmWwDf(=bpnwgNBV5DBd!tMxDL-$ksEf#rp79grjo8As+u=vp-yTh(xUPE
z!Y~ogFrt1tK-a4`f~vw0^$|Nj92@~9KS*)%R5|abH^f(dG`#ViD3bf8<S!d|pJ1Z5
zKM?2YS!?r(p-*yl(zho8l2>>MYCo0+ygBQRQ_*{6;*y9nqH^z-0kLbowSJGaD&vm8
zKTg8=vRU^5CwrxmypAdtU7JM^5Gz7pNnKHqXO$1@P5tGp&q2!Qwd7jlGReVstTWJ3
zvpMbgRo8?RE8x1}@p+H#W*32xf?@^Boi~=cldsJ4#M4dieQ)`*>t0BcihwuFW(B-B
zyVNT?Hmz18mpP|$_c_JHSLXMz9kC-S-pdoR)fOFFvY(te>-Xi<$}wL<`PGoi%@?Rj
z8=rLd^!~=n;@!l!x~nUC^1mo09*549*rc9c6vdN#YGQdIv9|rCAfKJYO7@nS9!rJY
z+kWprF<qayP(m-4I}BP*G-tgZMp%9^TB1oLzW{qFugl4U@YYn`0&`$H`-^EY_GchM
z^;{pFoITf@#X+*t4-p*KoD(i2OZ}oSB%59=7L{;<=gV$_Ne#XFX5x~hO?Y+uxe(S<
z-E;gaYdCn*6%$Ldwe&^QMh`wFG!Xc*oAN4+ZRPYj%15kuSkxKjS`nU&<g=SiQ#@b9
zq$h%kApY@O|9B&=IPfO!Mw?}tlo&MQ_3}$~g39>wIb2T-C44J)|L_qnqY^J(0{PUi
z4WBMK(}p%f1-XIJBxjb@;gA!=>M0KbI7azXgyS0wxt@>}`$Q%4nXU}4tA0GqX`#A=
z!+UOe9pL5h42Haw?Rrf->|((FY0$+vSZXA0<xt@~3+*?(f040>GuMiE*yN^?GT!h3
zsur1y^wOI>>-);R2j4HDDYe!p)Ha)Jyn-;G%WK_=;nNM=N=+%Sxm_A|thKn3&VcIT
z9CvW9(Dk#koGKf9G!i*;sn!n@jzgPLErW&*WQ~Bg@HR{-Dkclwvh$)TXEQD%l#yWg
zzKEUL*-53KRdELHdw5zER2`#JCHVdm#l)5qIv#TSd!=R5*L+>>;MES}uuS-?N@P0}
z7LQ4BU;J_2n}#uFJSq^vK~{qoCm)!M;IzR`UKt;20DEUvfEZQ5+x%a8-Aojf$4Pmo
z>`2K}K?n78@ZQU3_dFQOz{x#oc#fx{cT=TWJa<#1y|R%6{jm#}&~?HW!O@xJCkCvc
z%4P3~C%;g6HE8Lw#O{&p?z!0CGz?YP@6{9M9(}gGsifkeL%w;KfTSuR36Vv-a6Qr(
z6Y+ClBd#6i%(dYhyo*=+@#d2egnavipLq6?w{x+3f#2B}zMRIpCTJ)h8c|(Ht5p@N
zVkYL|MUbkBr@P;}EUsEdf~PA-G0cn=OKo<qY%<@R;+T@T9)rq8K`|m5H7R_qG%kwD
zEQ2Ph{Q{-;1H~H2uEi+ggJX<#8^=!GG4EbTuib*bznIQ$prqVCa2L<=n%+dps_N;C
z6C|&A?Hc3IYwH2{PXjR1YD=Z7*L#OI$A83Md_ns$@dJ#ozK3pNj5v@AuaeN0$0x0J
zsHqnB2|4NYO3j!GbCaPA=(#l4ldBSCI3`$Xsc^#(5f9Rpc!{}Ujz?0puLmZqYcf<M
zQa`P}>XTqAk6n9PW;5H_uX4Lr(`t!>p5UF$<l=zo?y`G<&#HKu1BHqRZQ+XAb&sxy
zf&xFRBo@XBE{oeVrPY=i=@Ad#C9nivQR4j;48J5E_EpJYWTcv?7&0egO$NwW3%qnD
zSdY83DMH8Ty)tx1PIt*3%u2KQG7de$N|#z4VaY&NH>uB$a4%xWT~R6CVQchDWQDkF
zj80;t9rk$vwl+>iaYW~`-Frz>RCsE}7a|G}gm_zijhC!q1mq1>5X#3LJr|X*(4+W7
zd8t<$#(mv>0$03v#jT>&Wie{O_2hL$)xk7uKJEEQ>Dhpu*kSF!1}_)Y^a4NsXlOco
zk$&V@HMA-@uNc=dzd&g8KEo;rZYAuFxgIf(9k0?9@io<p8ScOI_mq9z=dXXg-<Igz
zC5Vix^<+4^9uDJlX~Aa40A#+pdUJbHo0?Gb=@7D3Rbr$xXY;Z0W3{3J(XqYHFNRXY
zLTA1i`lMB{`X;F1SJv8PvS>DJgjcs(S%Gq#TFal*BjI#FoxW5-TG3ZG?vRL@UnOet
zx^KgNGhEZ?o?^tTjn>PP?gUVNicZUt!r8s|-X<qL8((d<M}5Cqw&<DR)~6+O|N5-;
zO67}#*J!$dMSfko2t8o$cQeU>URM6;9p%&SCy4z-YIsQPi<LTyj%TaG8?<Dq#ZT2n
zO`&P4S1LFiKYx7Q4W%xXCmv=d$j1lWqH~PXw_oTA<3A}4TY#%xiJV)?P7*~$exgov
zA1BR7o{u1-_qc(6dLJ)g3OPh9^J&xf?zb~N{zk&4qjzH*7KnO~BD`JJ`aYcaz)!IA
zb_TkxQo5YsX(3x9{Qeh#>eA68#|UrkkooaqUFXH`MVZUtmD+ZgZG7Y`lE_40s`#o;
zetM*Zn~vIbpEhUb#OH{kyKs)h!JTXpJhoc4Yd%Xwr}5;M7H8G%8u#}%%e!aI3PrSR
zUScJ=2o*(Z+?o$E&I|Wb6`KP`-A2b3lH?Z>bAjm%@8Z3W_ZPh+ekRK01l)(C3W&hj
zzR-3<3G0^+QBm8nX<MpHp%>b|D&1n}bjwou(9n_UemKA)Ygp&7UfvnuuqkELjzG_a
zks?q04uwm~9K{)xNeSW;rqVoXJe03`=a;OJ;PtAK<Muu;n@G8(<|?b<?5vci`eY>R
zldCW}p;~y+jK?IAv~LXm#>W<-z|%cnqOLZWnK9Om3S548>B+)P@vNcN2RVT;O({DT
zhC)s0t5=P~BF;wqggk4jy=R87;7vBFg@^iDPQbILej)lByGD$cyVS2sF;eVA`E}gx
z!rvVcCqd;PKmxS~n+trJ+SCw>4+MG;7j*G1xq|0Oj+Ia9&I0o;myc9ja!CLHYpH5}
z8E7peuoPq~JaQYzT7V~C7$w8)rJ>gWPCG_h6(2{2WhA<IifgaI(L+SSOqm-zNw~~d
zl(6`rH2#}Rk5f%#o@ZoMvd@yF*x68Dx%$n1ZqM=buTDxLkHuI5rmtdW|FWc%0FRys
znF3L_8Uf6Z@CDx09q!%`C3B|Jm1D)Wu_@<3dsfzk)6AHd>cVO7_Gs#R2#h*!f$x&V
zghO`y>~_YJj^RsU@>Ev0{KcFLeDaaq?Mp?(T4a}ai!Mx1Uea6}wG}!YJ?t2$Mtl^L
zL~};~R-qyX-}{JJ;GskkvYJrik$!<|37%hun9N;Tl@`s^A|4*<oaycpej#v>{Rd^i
z$dZjmE>tAJe$lPjb4vFqx)kqqlceW94QoqRGL~a<`FuAsr_mndIqkT~74^Iga97k}
z52$WevoXBXOypg^c!>+%$iE+Iv#MwHfDtN{%&tc0yJTZ+Y)MrxlixnMNjgk+x-LLR
zFXA%2DqoHEUDs)#ohGd2lTn<-ys=J(a9({YiC%w@Hh5x>!z03IUCWhAbJUY0t_G&b
z)sZDWGqP_IU<F~CMyqsCKS@;VlUCD#`0b^Eq1U+rf#y`#OajY?+RG~?Rz_n%t1TA?
zDqUwStjQu~hjm?0n9n<fi5%7<2OT*=Jz9kR83|PSoo4x(@^L4=mRPID>brFEjW1D(
zKbdQ^LNPLt6mPLQ#%vm$|2>2i@T#yOW1>*U?I>?xh)C4hSfCunJRqcYVKKt1%p|hp
z(vzVrGb$>1fbo3<iLUEo)I>q(4g53dmQu^+wd|>HY^OX~uu0!I{9ZP=xMX8rhO!q>
zDWoaqW(~;LwoJERG0s5Wg~c1gQj2!sy+cR<v94D;Ei9`w1UKV*7b}3t;^^y!@+^AC
z=Q3YtAItj$npSn6)Y>uE8Q}@1DejIw%0l)_39c)LmJB@nc;)Px+I1U;by#&mj1TzI
zhe?~!c_{S(oNF}*zwZ{Bnc=CdV`l?LUJXACO3!*(G<w<G8h+ns1K@G{_L&+lC7w(}
zHYM}s9Snxx&E8_Ix<Z6O%+yzIK8^}wrhXoHQvz0F=t6Z(icj*IyD6D}WCu0G{(#c)
z=<Aitf{0ns4QMezal_^v(dkoQGuVvI^5fGGPa{uA1!y}QVbn-+E&e5E#WGo$e}S)|
z>+zb4XHv}Zt^$5y^-<2+%BvCWTf{ZrSFJYn8Wu-EBzHTz3osPM$LLzX{=Qwu689Qx
z_FeMhyI89+G}I#3n`fA=5Yph!T#{(bY!lL+y*K^=N%OwT(Z=?CNj9P&`rYAAOgyLL
zZoTO^oL9n{#8S3YLY~L4E(J&*4S9U=yBkqXj@=ZLu#s-|)a-jMBeX&XmXJ#Kh}oG&
zrTBdL>-`m}O4OlM$9W?aT)8V1rM0!$B0dQR1eT;1{N*$38cu{3GTUcN-chQE-ivZn
z6c!ac?pV;&AU(j{@h+!g(ZBjVG%cr`Bp1)SNkQ!8sf;0daqK#}tUxW~b(v>OS$wKj
z6iDjQxeajw3#@-+78ueJ(tD)xU1*^l*2I92N4Eq!Qx~(`vYkuf)V_52g^P<uqff5J
zU9wn8lfZ^fb`2AwxN)PgS<Vypfyy5q(CGB-F{W{LLRfvZm}-w_x(%w1Bz}OP=Rr7?
zZSNK-(6a`L*$jS?qL!|n7O1VYG+(+!|JY;y$J+EtWGa~&_-YOW?(KD6G2Wf>5MV3R
zfN|>*eh)3Yhi~s`gU6$HlLyBC)cDxFq``jeCTQ1x9+%v)#_LSvub&V!ZXF|wy$>>p
z$l%fP66v0bjMOfa*FwcI=Jl%ln7XQ|%G=&40QSsj9-Bqzc=fs&Qn$8`VU1V>d(z=i
zpb1aD5aC01FTs(a)~@y?-O}!1KVkXy0^VqNcTTXgh}6S;)C}3)u)k>W=4n?L)C1K;
z2t9g6-3~2wVW&1zh)|ezZNmEPQ3|`0?-ixQM{bCmg154BN@c-H_b*X_kn^}MyUuo?
znS<(v6>WL4v5ooj$mx32z`m;vX;G>ub*jgqXOw`P3;Ba0o@?z{73JnMAB^D%Hc298
z>JhYMwkFOyI%Lxyb-WjoSK^0|AByGl)T-^B5^JlLbP238<SA4X(pQT~)T%GA=#?Is
z$q*Yaxb1gr*UfCO*P&0^Chmag-y%=fC5TY#6`TkezQWV(+l>NjJ;$9hPrN<vKGLtr
z&@h=zTmKfrU##oaeXK89y8`3a`yNPeCgbZ=RvTNf@M&Uz`;Lm!W@nhg9#@^_Hq-3{
zn6Wt)#S1u&7VEmlhedZD@bQJ)*~jU6n|K_p0B9l47wa^M4^-Byn;o+qv^1=o4U~Av
zR%;*RdcY2|8O(P?YF1Y#v4;I5RoeHfm8<9GO50`7Y9nd6`zEEbHHq#upQf27&N(6S
z3Rk;*GGN3k$L~eqF=KZ1DBY6COm(`AowsMU?~MdQNXFa-$LFsidok^q`0%PwvfG$i
z#~3A4F&kfOUrO9VVnI^cnpIiSn$9Zj(HeM*OvLp-GpJ|YlCNd0kA`k<t1yI<qP(C4
zHDI}2uiTQKC^42ySG62su*lg_H0^<A+b+vQ@V6DK!ejT9XZPTA?&9_IyqCnh%XiGm
zkIa@dZd{j_NL$x|^o})d)T~t3@4)0!BXj{^1L?ffy2+P|%|w_>6Ko5sFR3-HyiNwo
zpL@)j<eKnJ(|s%gvVm6)zF1FN#miS;F<sN^wyqW7)JAHV4sE=J)sAr`+7dZhx}qKQ
zkB`x>Mmi@<ScNP(l0-mz)u7d(0Tj1|{o|u~lHD3>(iL;hhr)F9-J4Qn8q}KAwIuqO
zDZ58y&t>h{n)l64TbCs6VRT(g6CRmrOywhGVvZY^fct7QjveY3vTGZHOgA~M`6ejb
z&?dX2+MKp(VZg2@<j}g>TkYM!+)3?%<~`!s&!P7am}JtDl-B&BOn(WreTr2ft#PJH
z34UUx4*4G;>j_`m5@+{cf;NiAM$rq8+9JMp#9@}dPsEAtf2Is>i7LC38u;v{5N4xB
zpu9QCPH?Ow&n5jULwHrSOryL_98x#nw-4Sk+7JtK0=}x+tnA62ya;wK`Hjq!@@+Iw
zTp~0wd{idEVm#hWRFs7+@R>s|D7BvbNjSG(#!y76=*|G>h(6P)JFY1$mjrLI-Sk5G
zygeNrVK{AA38)VYPX6@VZexf$2V}igCbMaQ=aX<D-I7Ix99LB$-I7@4#I`m-Og<;b
zS@R~3=8X!61$mBV#r3Oq+9qg$`yHd)&_k@JHk7u|@&jaAgO{xxmtDk^Rw_8-tvT76
zh4dZvm#iSiS>+DKl}FsW2K=MdQ}m~8V;M4y-c@cz&*nR_n`wpKM9}vNE9h7c&6SP-
zz9|V=ssgQT?rP1BTkZpN{*XvGi;6mZ*4JbC)2qn17S#hH3Tf&rBO4c|Ij{?6y#sf?
z9RWmlAkcfMuyvDYPL^YiYriPb;mTi3gFRshVX8YouilJn9h-4>Epy0a(4JHjMV;XR
zLkVIP-Mhog#Q6bYjm&tK1io!>uyajeeLN{yZ(Wb4w~zz6xLV4}3ZPQ+39AoB@$IRR
z`}Y*#IWF-#ZBQveQoc}jwWFR(VvQYMA<w%L2ipdutMv9q&Flb}{aLM<le&i<^KXYX
zqcKN%z|$U1ofx@ndNptNqg69?@X<ZMouWnC*>Y~V1Z7rPL><B3(1yRgg3@!@y3DFo
zV^^ZA@6dBk?>^SQ_2I+?(JJcb!HPQM@Vb8z?%JS)Td=5H+q2wOXE){6EQA@HxaYlz
z&u2^_T5ooX`@8zb2xfKWRCMV!bPG20K6#Eu@Z?+P;p#&B^OM3e_%Sa-FPG}Qx)%Mc
z2^#s*^mbNai7-b@p_J^bt2Y(?=YX7o^k>uAgClVG1}l%d^%dVSRbK{5TidRcEA&xw
zOD-BHWotZ}`tfy%6hGmaIKEIl;!ExvGR05%X3)jt5w@Sfr<Mk{=Np}%zT0Mi1EqtA
z+e8V>_xu;tQ;Fiz^!HwvIuCqqyu70F2Zi&p&giR*TVL0q>yf=DBkEeJHPnoo<apSK
z8aolItSgB#r=FyBxoBLhCVRGz7Mym6#X!-C$K_d)QZw`S-bQvpZ->fhl+D{5v`cHM
z&)ka3iQ837KG<dmF8;g{`?5g2PzTf;@jRi??y#q(Jw)dd&9yN4<CiIe*oXql0)_F8
zaOSSa8iuCWX%VWp3c}V$n)nn_56tMjGwPv=-fs^*o0mIBnwn<k*HxRFAU-Q=raozN
zY_lG%OVl&lT$**(2VDCLOV#Y3HdAKn`8~dc=Eyg4M5bm(Ekr!s*(*iSXVYRN5~obp
zmN1UC$Ox~ah|D5il^-V7eB_5^)%u}HzG^>AaGL7hX|98SM^0zh7G~#I(<3Xn3xb$m
z1Q9~^+h?RBJU4W9;%6KAPYOWCH6!4lD*de^ILs_%hQf0WNq-d{YLea`{)7bxT^}yB
zj#xmO8J9^mx^+;kK}AkKg&CT0)EU$Yv`UW^PdV)>9!5_hkco+AteU}g8jMU?)>-Ui
zTro*fvJq>dW9T7sEz04|lC+aNqs3R|0oF;PW^L3W5t((ChsrwaqU)IGF)|>oygGi2
zZ(32D7kqnzya9z`4sk`-%Q>w^fj6TeN2<Vsl_Kl?sH@w`E1A?7-!AQ)u+XAUJ9ece
zA7MqGm5Uy~`kgClGMUcBcKi0ORw>tUzOZ6YHolPcjVm|5DphSLk%eWHoWSn8?uC#x
z$JMVCuSU#zEV?!b2!cF@k`K|!FqBEyTO}9To!k!l!rnpVGQ$Q9I~g;2cj55p7P^|F
zgiaxu?d{6RaLjny#e1U5)zwh-3yhDrb8;$cpY^U7;scJW43wrHq}Rd|#2K`!AD9RD
zbvMN+5V3BM^1vtrfql?I;so@)`72ffZHbMT*33l6;!*&;;rkNM=G=11Z0#&TAQk}?
zy2-X-+>Ff*!3&Osm{*gja1C7vo)WctIa#q<mU+KDOe_}K93=~(XBzHkMs8QbW|!I_
z?$Aq5r8qyx5Jg2`(9scX>bfA~wQxJ&Xpgq^iwe{c!W}h%;!X`o6|fhre`enW6Da5)
zj|l2rNR3pvc~znj6ba=g_c;10lkt#Pt7d)Y*_ATj+{A|KX(s;c;Y1*KBbvPMx+N)r
z>cw<_7b6p;>9XRtN@XN0euA)&e8X0#ah6h<fs_5Np{W89Ddo)T_JJ_|#@#H3z5H&=
zItBi~PBT#tMAr#u+bQ9)*qoLz<E4b8adkq_gEFHPqZnD5$F`-tR|M!POo~_<5M0At
z)L=GkHt?g#@{zy(xFH3Ju@ssX$|buJ14^zQT39ezs5fOg9j6EFN!Gf+LLl3H1!mqU
z)J)WNN2ls^Cq=2~50632gay7$@81i1mBCgsANB-?@R+(_(hAGgudSTskrGLd&3FaU
z(j@B)&Ils&D}^?XzWCdDo`5U_bPH=;BUKze!XjQBp+7g&!kOEx6f^VPmAT<pMzJ>3
zjwn6(lM|&IX;aEPy)TD8oi|ON936ReksWZTmwaaD?HJ!>v4bA|u`Bc^@lYxKV|1P;
zh#^(~QQ_0=9sx2cP$Sm~ziEhWuyOh07jc*~7>V<yIR4G6oi*Tg;)(HgClk#zeDSu)
zR%6%~^X2FW%ud`!{JoSsz6UZT!X9%%Gf3HIYU_IhS=$ji(McIk^O}5O=C4fH=YKot
z2RP4vqO`S%nH8cc^n^!YpKB(dA+~`0dx9%B+rgU@`#e@(xkVtBdmb^(4sFUV@M$aX
zHg<S0?lzmYZJAcsLAc&V-H7yWp44~KRt9ee13*1qtNajy!J-%5t(?kelL(2lotJ5y
zUFF-5$k;jKlN0t5ZIztu#%`s*W5fPVb6p{L1eY$_pXOyDO@j64`{aR}vHN~B_qy@w
zKNhj2dajc<e)NVD)oX<7m1%i%fJVT@6NhUEuazhe5^|d7H<i)BB5q5p_KOL^N`lk)
z`D5wNA@LLdn(!3C?I)hoU<6N8qRybGmhN$5<s?D?Y`=2~QU;6X+E5ImRLa~9lyqMY
z?R~a!6jHzK-zp%*%>Q`I^8HNj!;VKoug#tI*<|=;4*TK`yG!ak+kvJ5D=esW#1y#~
zN-+fwc=2Yz+xhvN@ZFSotI!cqE~Ehp6DoCo(Cw`<wN8Rk-QU5|{~1y?&!yPFOD0?2
z#(!?=yY)ewk$Z-j84GCak2F%q-OAQ-s-tI*vp7E4xsQb!mnM9eHF8?eg-#q=fsmK2
zQV(Gqa{M3ovbOF4bPI$0%86O@-x@ZX4x$>xXRcRQ?JBnw*Q|XGo_9mfY)56%Yt(FK
zlWIo*j&gV@yXuv41s&I(<g)*W?c+nSxHFdJCZp1JwIGmhRDi6@>Jy${RqF97b(J1U
zmxGKymk^w>pTkjj`n3ea>#;Mp%iPDVq>rX;ZTrkp-gZ+gl0y61TbDu&hv?9#&OKB>
z+P%(Gx*X_m&toqx`zRY~PeC)AT>ZlCV|Iyu9&nrq$))a!c3v3#3a!hL&kAB!2n66z
zyLJ<*xu9eGo~Nsv#;8xU@djqD#LInw5HpQ0w{Ci?f&k&UO{-nvvDVgQc8WM=?)*S#
zAocm9SCv*rz=%xrciHTmER)KWwgAA%7m0xp*BR47S_p`&sBp^Q9ZIJ;151{vtnN_6
zQ`&#ke-by;lHk2npK!}SsjN6(AXPz@e!OSq39O8Tj~cXJmzp?pQobOc)7VPnjY`}k
z0xdKSj4qjfml1`mCVo)BcQhQF>v-<9!@@l)XFcfj-D=em>qot;W`;HeOp7X4`m2us
zMgkuStI`8QLBBs7QzLqL2}d5{nrJ_z<jsDqGJ3YNo6+avOBNoQHa^<0dP*v*c^0mF
z5D#Y5o*jtSt9SNvwD9YWBFy{iTB_NYqTLV9B4Q~g^rm|o)8YN=<JOgtWsMrNA1>3q
zFS*`DXI-Qp*~<-IpHNj-!!0GZ&)3+O$i??}@sq%&iQIDn;scl`_=O%zJ<ra08>4WA
zmA#iav%5sUW-GvTD9eQ7*II!3e*OJIR(V>$&gO3FXTYgqs>egXtR2lIe_PXoEBRM_
zKJCbN5v^UUeA#hF3g^C%Z>rXy>44gbjPi4~%Hfy4IoQ})Z3xuIpELjuj7taaSjoou
zQ<YFq=~H>XB<FLd)3<EwxGs%a(R;C12@qKf*R?l1e9u3vy3%UhFmKl&pat?^t-(N3
z=@cVnL>b4nP>XBruz*KH4Zdxm28Gj)E1g6a@;6q~CRD}A!Eg7%BkCPIUpU@m+`Af_
z5Z9S!Xi9@i89lR|QNXWvq7Tr2KO#0w6vm!3{SNbO3=u|Ghlw`?F#rgi+P*@W@E$;%
zj;6wgAfKEP3B7M=s|+7wqW_a8|KZpVZd)eOP3)K~+N>Z^D~RK&@q4*$Z|`3S>YR`2
zyzuGu!&8hXDu|}e!DKHfZklV?F_UG&^8{JnW1DpR4mf|hZxQ}Tla>iJBZl(Q*3o=u
z{m|Hy51c}|WLWjhLQuP4<zg~6t<KJ-kGz-<FrT?^jITh-9o=0o&ljGegQsA;a1*o^
zj$Z;i4yE=@lYwmS#n2ze=?Bp@fTj;$j5BGqAyks+)F8KWD-@mGP5QsnzZ>^-wP)oH
z?B=kmKc_sV)saBA{jt4yBr4u_VIL6P&gBJT>bP3q+eV(YbH^UEr+qIY5aCrW81PxF
ze0#|iGNtc5-Q@;MeAz*KEBEOlLGFB?fOY;0*T?SM@DH3rk<~mV0;Hi$X;Q!oyd%{%
zjfWMjA4D0Hj}qVS!Ad@lP}J?3nW)ENLIDDg52y9f`O~$WJ+7Ovo%6-3vMC8fTC&}3
zvH&i{t2X<(37E3;QF;xN5x@ph#1@~J?|fz!8oz-T{~ZZhoLL@jHY?ceTrI1_2b~1!
zu@|(@$AgoY0Xd#!h1-fOsiJ(D8?tHskDpU7a+(iN^Y{a7;_mkXLGgY9G0H8L)G&=%
zI?wqy$hs&pSVk%Ub@v-H$UfUeRcU{4n|EL?gZM1*iu15KK`HkU@q@S+wY3irGknD=
zWrR0^ywPwBYOSIV=crrS!Jj=%fzT+_KPdLm`%V?Dk^9ttorxizkg_&~nGZq04rW=f
z048W??+)f~=^9rtM&0&_FYbRoU&yWuYUKd$1nZ+^_qN7TDfM4lmk$?A=chSrd}g~p
z0*$@!gFSoWTkwcDzwr74Gu+V+88jR&3usPM3kRsv)-HPlYT$%rNo*Tei(D0Fiz|-I
zJaLEjRLZt47OF&t6dzxVe@xjUPEL*6Yn9P$C1+tXYK%yey<WY0nR>0+FmpNi?ZCXM
zSd585A@13|zP-*vE6f`D_xG)*X|R#8lPqm0N7xjf&Xs^h-USG;mm#nZyxgOy7>(pu
zycG@qbl<^T3k5cRp3=w8jCDdsPS48o3*ImvU*^T-%Jk%B=B`W2of|6DzNxY+IfQ>k
z27VFa;UG?U{P~a|Q`mot1mH6J7}*N&C|zo1v7@kARk(?d?<2RMsYJ-Alz8&?mJNGD
zb5;`bs721|QtcqhK?s^^rC@4$YPpnjn-7vq`<UVEssax!tKsqNWEMKKDoGF28h7HL
zy9`GBW7X7vq(OzYEag^aAsNL2m-<qReQ1WNxKM!AE;)Qjc#O|Wi|ksZZmr5hN6ym$
zs;2T5snJ@2g1!R=5^@<n`?6$q^i?1?C3olC`k@Syy-reSoLAWpy>4@>{o10MWhFb8
z?<d`pmwVmT>3^SQ`VFxF{ALE`cD)NFuzq0$mNR%yJH8&W#OH}W@O97rmdGb(bzvf`
zQI7ANj8UMD-q8~a<%=p7(&O$4U(a6gG7E>|`?9O)1`QvQo9-$a*19{nODPVy8?L-&
zauMh%*^O;56bQL1#Mf8_ikgYvR-1`NvY&oxPVXtcW~q0hA~{@(gM2WTRse$d1HtP#
z@S_WdnO<PLT3}yD8SdFZ#;gdNN8R2l%W99RY&_*D8I)yU<)&7ev{y5bST&%Q2(s(|
zoBz^R-;+g!(<^K%C||e|Hc`A|kvw`+-Hw$l+0s5lV_LSj6{{+Zq~}w(PUVf6En~D_
zR4J=swt8cFK=?rat87S?w0wbU7c!BKzld(tn4g0U6#UBz6gYCQJU^Dh!nGb<eXdv@
zS!BH*kk=F9$m9+P-!CO})qM~Ti}#AkTFNjnr4i~SdfStQ`^2P<5|>wV>M)!&m`!O~
zxc0O%ENZrIy7?TxKL{2N+<R58ytn87@;jidN4WAZIk9gvL4EQ*&qOGvc~myBjEhcB
z(KCr@>#5P#vh-&oUyj;YO|y8@f14-QeeN(`w*O9yD~H|fX?ARl(kahKh2G-|ZG-+|
zHr3US(DlNquw#X@`Wze{NqpyH+<2Im?-H993^nCMx>9Q3U^3EwU0(ghTKUV|nCDl0
zU8*VL*XxVkI-MINvbINGGi;0n+pZc6ndjNw7TML?h595^KXyv&$r@QP?0%h~k-j$<
zG;EuzqO9|Hf=li;)!Ev{5n>yc^hkMZ79|g{U?NE-UwZh0LM5kJmhl4J*;Dkl);~-)
zaGkHZ+S2nrtraN4QTtv4b$C}hpEGyCMXUvI*6WpPMMID(^`dToDTLg`Zf!Ai?qEMh
z(fQ~LDY<s^bjXvw))xZItud&3>b3>eGi)%cJ62(p(MFD+1#C~MGu75^b3dIJ;gEv#
z+_L=pZ1rytcA!I*(!7rGt{fx4_#Ugn&N{=f-BEw7K)D6khNqoX*5gA;dct^r6%Oy2
z;qmnoUHOREy9BFDwBaqr)uk&Hl!El(CMywaqAHIT!vc-b_GbEn!~Cfo>Sfr)a7C4>
z@**7BaHZ%6V=PwiV+Hr;|KNu!&Ib4QnkSlt5_x@Fo(a+fd}^B*<gWVs{v+)bskRoi
zdSn<Pagi8|uVkEXL7vE^a;-Zkc7>-bR5#o?D(*e}A@`XSl}26Smi?(#WAB7&Ob~wJ
z;F>$vzj0t_HQ#8@W5FUit(}74^TzdtwlFVt-odC72*WJ{;<F2Uu}y3cguP5Yk)${;
z>EVp9xw+(Y)$@Rt<~G6kgqu4(tLc5Y87TL&ODXmDS2_ftoac&^CiAoC4Tpyf=D}Ef
zNyI7k^LWB~Ea;=54h;;g;o{7vtuv`_$+sE1UKv%{Ho*rXWe?ZZ&(SX$l`@U2D9{h_
zj%OSGL4o~dy8fDD|6%-yHmvzl*`Q={r}vJz+>0tvC&YIstiWi-u<NI_2^T4Gvzntm
zuE*wx+?F5@G=fzgfrD85#7H*3%dSLz<k=tOi=9-EDcThZn|Ql>Jo8V;w!aEgH|COi
z6U62vvWc4*ls&IP!yVI!af5@4wr8qs3@q#uD9%LsB!U?CT;O|nKc)OHG=26Jz+w|7
zu5uE}M~3e@WJxB`jX@vLdM*OT3Dcd=wq=sQF3T-T5#+Dgxh}%B_dluD)y@|_VxEEi
zzI+Z=<Of@QrlBykjP=Gc6uFT5=n~RK!1xY-P!UsKc2TW{-W4tat=Xpyu<@M*&W?^R
z#qbF7K(XLZ>jaNkW&$dvvS|gGQ2d)#U<_=Oze@TTb}rW6_^Ka*{4Z&wpEKQ`*LyKd
z07`Z%P>gxI&o-yIDit<3&-3U^kZ<T1e`?_JjV6YFwaNa9{cua`s4;&hU9i2q@vhPB
zw(<2y<G?UKA8~=$&mCGuMe**%DWOJ_Rre~j$m7KZi@on3nN*$87=L^8zsUuORDfZg
zRl>@gsMPiD@0C~?O1yhj*t-+RBY3!GdEJ=e!*v<Ma_y9ZAOc;Q@Zcb9p%gLhv(M42
zSrUeW!_N~rS-{ER6E`1>Tu+)s{u8V5*EWU-VLeJfLeJ$-j2l1y+|4Bk-=FiToOKwo
z(FXr{=upd<>~K8%{%Xno<E8^)0<DJ4+DaqWsZPlGob+22@K3!8pYm8s0bK%8;p$?J
zAP49*{oRSlOtJDfz^$`ey;{+*>aFDPimzFf;_%+oJE$@<=m($fA`ZL9PGi(DADzRM
zht3Bjmx32xpm%6f0@;9gO==&k?!E?YOW2-bGk2@3DM)k#g_Y|f{4RSHbKSFpr|&}V
zB+`>UYBLRF60&9@BWo(d!YtF&y&lJX9h%81k-U-G4ubbC`_BhB!2Z80d$*CE+`9x`
zjQ8opj0-1I0<3nA8KpbK!?1qg6S!@0JlVAYemFV%$n9GkXii<#`$@0|h0~fgCXrw7
zAjuB3WqVraBtQ~9y;C7$ygdI}PEzjH4Xp5+l6CIWl0;|gP56n$Z#WGXE9JR-LpLJ-
zF0=nv#^yW^0CY10n?@c+-uL6|Ak%LGFX&+HnW3RoJ<>*dxr?r5zshwQ)#rNmp7*I4
zNMS9IVq>Vq7Bq=OhjpjyvH{A~StHNoe7$^xI(0w1ZssI~ewap#ji7dc7E7E7dK_<K
zg1g7gfkZ{M!$zeY@Blc2A+jc`6y+_(k4al9Mqu8$7EU|uUNIY0JGX3UG1wBFSq~((
z<DKo*)nYULy3+tx%r_v&eDP=vP&$b?$5Q?GIv3+G<gO=3z@FmNK<2h>c!QNeWSG(M
zI`WhV^ZND32%uCOaaMDW({Hx9JYWY|n?|6_e6a=aE^9{PF`ONOahJsa2|C^=<VM@i
z5_yK8vC$bfxX|oAq-5H2ch%ODsg49!1nvbwfLvrEypgu`<mZoVD#glL(r|*PKY>Sg
zmwf)tT7{6MAS)^MKDMnVI`6V7<@=R20;|yzS>D1r2efCcX)^5Y76aZ-b*$xGqSpgM
z&n?EB;Q<V*k{@dE+eyeZtqOU$p(Bp=Q%8e`{|x|dZU#nKyJx@J0l?xqt%`aPffQdg
z5*LXqoVLbBXgWAq&Y*|z#tq6^0UFX9(NdC(1n*zpQ<n{F`IHyOXP{&%L|e(KlK<aB
z;WMy8N+wa`Ym5Y3t#MoH0_4{WB0r8(A-pDU#oo&Ki5UJ22lf|d7$g*w$^4JjF_l&C
zpR$gP^_fd5`5^R$myB#;0iOoG>Z?04G^hRFTBaIWNz6ZX$Kc@f-|-VW`+y@N{u4|6
z3r(90;U3m(!S4zsrQcE9DSzL>2jRHQ42h%dYczFrc!|CNFQgSLLoHlR3hnuVQWLQl
zDJ~YUdKZiY|1LWEM}>n(Js4(K6~j_zXMNhLkWz{AqP`C6AT(qR23r)c$Bw-v@EzrU
zX~$QE79il_DqTY@v>GVQ-%iY)slMuq`^>s}XkcEvbz&V<wI5bA;QceN`A?nc58&)%
zxr@Wn$L-&05c#YgJh@W3VOCWkAb(y6^dFe>A3LyLk?B9~H6=#FYhT6-lP{M!L#!Wz
z9`Ok=!3^%CrxAzWWiKDqurf_4fX|OtZ9My*hOD;@%l|WCWhUsd&dGG~m;F})j6gX?
zKe6mXk`!9FI3ocGsrEvH-DK0hf!6;kK<gjrX$x)3i?fiJ3CPse8r2&SOko6;cu&hm
za_!oj#{6w;RBXCb<G~(oGnq1MscVe;tnMglISwZNyHYC${e7mpupPOt-$CUZ(PLVP
zvqX=4%J{nJ2baH<6g-YJP!gmG?zDBExWnaSFTi}8IW$O|f@w~n_`~(!XUZJdG(eAw
zprv}QiqLEC+20lO{uaGr?TaS&Q!EQ4PGKCvF$c3}Cu?GORK`1VT*dZ~O@Z_rmHZj#
z|34xLS7I6YbFUsnfo0|Z%!coJuRn7cf6Bt*XA~S-$UB-44_~bjsImdREO3sZWZGDb
z%g{H)|6SDx6B0s+y=L9qm!mPAjdFTcHr{|1ytavlpr@I>km98$0b*E&jk#{oBBG<e
zb?#%($A`DEe%DW^=A|GLvwTCvRbQ^jm0aEQmm6PDUWngMB%BNNM<CbBu+6B9XApV6
z(a)^CMhVZirDfC&F<DjmKW9Am$F)c(HG|(#Jd!rP8*JmPFDd8EA(Z6RyZQao;hjEB
zAt%G#c6<Ty__w=79)tP1y7r?KqzJQr9_|0+b$(#rR%_N5F0<q4&}3mOLg%9?kD_i-
zBQYCN(|uTi4f~7iKFwHLqwFb+jbDxJwud&SwMg;FH`tNl622d|&B<)_52=J<tk<Zu
zGf&pf#rm7z?Kg#d|0QZ&9$xxIDaq_wXfs2!n_2ac!6elBe=g9soHw*8Pc)8b`7BV5
zdUV6c+U03^v$VJvBh7Oi<D#<B9$|H8Ynjbtv{q4Q4}*m|gzSV%`}dV@(oMjuMYU7z
ze?%)DnCxhsMLC?KrYH$2TC_7SHo}(;yz>agrU;Y_V87lj*<yU-1)eX{RA<Z}<0FgJ
zEP09#Fa?>7YcZBr`Vhe1RjTycfF{tD&k8q~C|(@TS8n^Ruuz{r)`&1ywE<_V{Igmu
z4F5b(^cR3Ne|<hTIJBtK_Pq$n!hFY4yX3nv7-Q#k>Z_OiUq7_R@=#jbyE-D|?Nv64
z{|4{a3HZkx)xW{}zkt;LqLlxE`mx|W;Rj2~47>A)J>1$`u7x6z_WgQkl#&wOZ(~dA
z$%9Y-4X)dTFA*ARc8wVm?G;}?I)U~My78`3^E6WW3P`sXi`ob0p31p&579-Xhc-XD
z@kmn=>vylZI%GLLl}qrjAjLJQ8hTMDp7kfOq%LE0r@z(${F^cTH)DEMJ^%kDWBP9(
z|3`s*6!yIXTB+dkec*3G@66~s;DT8VlspdBA>(1lbGq?K!+<|N#D0@iUk@@IVW!@c
zc6_>sIRJ(8@q=9XXU@4s9I&wfdcITtIEH>YEW$*+iGlL^V$|$uHT{QyW$L<Z?{k#F
z5|re<GX&b3>20T<oCu3B9^;GD!?bz9Q%}Lr#<3us9f!N;J-?&5kzOahIh&~AJ9Yc^
z>#HLzDThS#0Q=Lg(e$Pg7H7TQJg?p#&P#P)=J(!6nMSir+hQ7$&@uW)Ez=11Sq?(%
z1`VL=aRb(-W3!q&9nXGcu$Q`Xb_8Tix$@4z$ONBz%%7fmm>6;9bqr(IIUEj7JqCE&
zR?oVQHK+BQ05D(-dJ|cXL1DSu=e#q3f5<deg~nmM!J4YVzm((r+Z4pzsJX55z|##o
zPYvk}Gu!8P`>1Sek7PjbO#1f&%ZXHobB^}4d9bzU{yogLFFBoXUO5MNVj|mY^JH~p
zC=~-HGQoGR@IGhQz8HYL=cxgxUcljZFD;|Il;wlNb`bJ8Tv2puC;@ODPkt*M_gEda
z6Fn>e?IU^GU(D_=e=k7~%2Y#>PCp(%&s9#KLz<deUl0X4nTMK3l-|>Rm5LtGKed2V
z?(a7oYMyJzm9TfxIrJw;3=}|@0w`&m?o06#TZ!k^j__Ka1xeNes>uQ8Pw?#v@wTGZ
zK?G<%9tiQU<j|S{hc2X^43eh^oS>j5!+Vy9^GgaKD}k89#8fnq{&)dV)5hYx(?i4w
zB-OE<9XLqgIIVZ8bFOzLPIFO#y?M~nPW^QgD_|9u`T8E{DD)nG>fw?eM&rCw7MCz+
zMtHvl8s8uqYN@D>8)lRG*y~w|;*SWp8^C&oJsuu!6<(z`Jk3EH1e`~}RNzBj7yCaO
zd(>4IGkYz?>jF#I5AG7ws{E}`xPwRQKc&R9+8zG~)NXKM_t&IYDd->B>_3_@!%~U=
zj)wn?tN}Ld{qJb_ydvYz2t58B4gVQR`R`QLpPI_r!Bo4#4c;e>BqN}~K|T4a^2Y%O
zS$8X`-VR(4&(-w1B)+Wm>f%MZo(H%WtF~U1iWs@ELn+?H*EH(%gnxM@Z2E|cj*0P-
z7S2__TTB%Nm5h0HQGQji!_$?<#%;jVppK4r??O7><>ptj7VI3m*XDEGQ8Z179yyW0
zr0~x${H!gZV4QhLQ@K?0U@q<|f^u6&Cex@b$lR^NFR-=cvdwl`0z5Y)e@{3T>Zr>$
z8C|Ibjq)hcIZ?tEYTC1bVc31q`PhBYKQ>Q${GG4tlQ5nHwk|TJBU0}*VRhbG+IGAQ
zswJXE@ZQ+S!%of)yQ+77`Y$Go<c1s<jM^x!-pRmb)3(E&KA`2AKYn|k6xW~1yFe#B
zYoeC?p$AcwWqhygA3DY%tRL)a5u07Jr(oK!+s=H(P8KL8trNq5*Hy*&7h3q0->>TZ
z4qM)I4j*p(N?34WnY*(l9O++cn!e!u%BfRelS}76-ucyEzVdT>Za=I_$}7|J@s9Mn
zphrf$>Y0;m6v4Lsfz61yupkS}qm-P9y?4^cD_g=ct9nZL_p~b)j8Z~^>ONv?h4!^f
z!PqEK6}!i}?jL;BZ3J5Ys~+8}XQT2O>dT~>9zBc{)SFgS-W}!`Y2DI#Z_s~m9}t-r
z&v4bZW!M?$1bR)OvP-jn!oWg`J7QJLhaUYV9$GmEsM=8GE^1x>irszrd#3cqgs%@v
z{}M@!ec@g+L*C^SKC~$eYHj{&4cI>s&L5TZcI<pEFI4p^M9vKw1Q(>D<(8IgmS7fs
z$jojY8Zja)qpFexFY`=UvxKD-j(CI*TP>~zVv`o3RzGy5M-97keI2{6f8_6cb%FI|
z4_Lp*W*A7_(uUXM4{QiX6OV9$wvw|T#iq{!#Js^KOz4n7I-`UXYI^RrrxZ7^Y1v>q
z$(JjUH)e_C;yGD{x3m|pv5ky2ycz(OVt22){Gnr=r<rozn2&&RP&0!CD3o5_AsxE}
z=JPL!DOLHW|Aip_je7l23H}XTZP5<N92Hi-i{_dWxs$SH?$kqZgODhGtMudNG&WJS
zT^iLFF)8gk?!^Trz;d;<$1h7_3g~~7Di;4^rTqEpgo#k1G*~L$M-tRzmkiIBu3n%J
zQ)xzjb&bWAD&D2UMfJu;ZL!J%-&uIrdiGG<F_6SAOXkKK&$1+>Jpr61O=(Kab}_6K
zD%waNDa5&I{*mLxPO^NK9{#)><8|LpCv4t4o&NKj9YF;om&9PV0{&9t@tf5?F9%t>
zgKj(zfTSh!M0|Zti1xJtX&R(Y0zAfa8^a*yuYJUMu53WTvzt2Onx<LVT_>5$ExG@3
z>$cw9_L8IG413XNiL=K};EZ!zGGYceNd^I)o0BX9HHu+@V_H^U5#({MKp#-b_@P;d
z>U=GAPuB=FI<9faw|7Brr?U)nJO$Z4J`d?AyhW&=LhJV>u3QEpFwgCiFj~Zy_Fqm<
zua_U+Gn?5-SB%#^$o)%i+hk7jrC$2+q2YFpn^8vjF4k>r`a{^8f;hqp?slC&Tj^6l
zgUEOdl<JMghQ&4?%eKL0ddGeIJE7-@i$ZT8MQjM}d8m5ZVe}1qb@f_%=(QeOAc#R=
zD~Mh&5m8y2=hW+{+QdQHP~cXaIq=9xvZ?af9CSJ2nJf88o_lzHt}N6DC0vb`y=PUK
za%W$w<|rMTlb!#aW~~Zr!K3}*{?omC=u!7#ODCc58<M;|^q%c2nD@`$jHPTsZdFlT
znsuoXJwomyl9ANlNxjOpZp>?6m`OxL@PaV#z$~}mggoissH_+1-MqB?e|H7nY|{h=
zb>!6$;(pC(ha7FY4ntgL8V1(2>8-+&F|Djt>UxKkSGD-zBCUlp`+IjWdFTG*q4Hc;
z8Yx))rWJ6wZa)DdWM_>`(Pq|`p-0ZWn!U)8w4bJ~ZKqav;N(CJGW&Us1ubeSrWbDG
zR`yPw#z@DtGDw(BY%5a1_82zq3VH21P#0j(|FtH9!qMM#dU5EoSky2F`e+|J-);rD
zo3ZX4gx4QiDk8)6Mfy0X&#w8(0L3A?7CCCLh7q^i=f-O7@qD%@^AO^wV`I?r)a%5j
z1k~=1o=Z_)O3Emek#za6?8Jpgv!Bj_B$Aw6;Y(z^`$B5+kl?C2AWG|`(p^lc%fr3_
zWKn;R)NMNBv^leKrKx`@Zz?BOG-viRcJ$-AD#%`7kJmR_wae#9`;csGBpz@Y8j(0s
z=gm~#@8PfRRfb)D9A+~|>AvqT8c=+wyW#XXuD?fH^zeO#x+N`eFg2j4$AiIK<kMso
z-=WDl{qgW!{1^m2ZR*)d4L>xzl6Z7@ncMF4%QcHYG1rie?0Q*lzU|(43>u!ZN26Uc
z5%0cxWyY$lZ8jQ7lblkUFneBk{-w!0WiRAT&+7CH07@=2DpyFLep8D2DfOcz;TI>9
zNlhX>AtQhUZ}_aveX%v>8<gbjBC0fIHUq3eiHH++h}D@~-uMq_0oQ?!(7uq3$ZQP#
zgryBnah<dd0z)$5e7O>?06BqpF%$SoQgf$1GFq6!N5m=T&I@n^H{$lk=RL>jjhnWR
z@p+m07vW1l1f=O*i2yJ1rq8!q$QkWfonzQ#?WP_UVMCY6H9IpsV4r@-nimtCl61b-
zE?7LV%nn^*mJLO12}$iYi9S;XiEZV&PT!=Tri6S;fam+^5BLwfJ73{V%d#1%1F3s4
zL-R(w&=)sVSKJ?_!fUmv{?rw22G@Ji;EsN-$8vi=DUf*@XzQ)L(G^N3OFvu`ad`o=
z7Ys=hg*VHDtb!8uAC3$OvAVTEcFO4GQ+MZFLs!XJOV%GPy+Cdz&TiV)ZwEidzToEY
zzxWxd<bzwO=v&i4LhIT83!dhdpJv(77xXV??76z`1F=n=%+(<5i{(Uw2uL1R-0P#l
zbhS4!7mdc>-g&wbpk0($udnayvXLLUSuQAYzIJl+A~urw%lN2W5006pfOZX;-_lP^
zi)^ScIgq+0m=p97Nrfo;?TDL=mc&zeih%8zZ96n{7HNB^iP}2fq=2*dF)d0P?pB8c
zdar$H4yCjEo^o9cGf-U}+JP}I^6I;naIbOw5_jXy^!#$vhKL9AUA&Y?hVkslRBxq(
z-ofV;XG6hJO6ijW7^^|q`S;7z6M|z>`}1gP;6?Ggz$D!*W}<`X{f-8B?9w<tz$-cT
zb4K6xyr2Fi?zUw~)X_M7qG}yY(@#e8%XPCMk+G%5(gm7nx9L>0`-}v42?(mS?NGve
zt9F7KfUrY3pRaoYMnpiW$hhZbCo*`AHf5vlUCH6vN;PKxMqhM<ci-_o)Xu6{$hP{`
ztZ(1@qwzo~CJav*!=XZDLBRP1UgbEXc&=N0)jRfjh!km<So3K>f^-*R+{v#eF6M8S
zc%$zLA?FXzpD_2+sjnTH-r|VAcURd;me`ZCUhLPcAw6j6Z_`^~$Gdn--n_0xGl0{P
z2z`!U!GANfZZR&xty=e3`l`<{D<5?+o(JYoUG$*!`<M4q+~y;ay*Id*g06D7*!5`i
zjx1L_lFrbco7<{;#tyWb0KJ3f@rh*K_ALoQxQ7onOtDsMR7`9?Qf$VrV>A63@BC9F
z`vd2`%2AsHhdrLN!4k+WblCf}1rBeo7AGX+c;|(ar?_sIB<{Ov>rGF+9u4d{Y)O>*
z#P?0!mJFL-I2;4G%R|j-o}NIv|2N}?o@>arVM0?^_`F*HsCUpyfyF}I@8px%i-Gk)
zg~U-?t`!pR+~p*_3xrbK+sCU<x4&A`>-;Q*d=;Fh>($xpuzz<hPd_#F%-)7O$^rLB
zsb1*bxg8j)t{u&P6Nr1R3cmq+|3YZj%wxH$DO0pfS9@$>aoKClGNpjTJANzW2Gp5H
z(DYqUK%ktPhMZ3SE&77LK%udb@&@gKeVV+nt`VXiySDyG)ciB1-Y8F&&xB>jiDdxh
zs{0&OGbioeG2|PZeiM3*&1CociE+!MRE!Pp>H|L^C&MC&>(Q*$NPIuEY4_8^n^_`l
zJR<y}rthLSZ-+E9kj@5u8f3iFNdJ+`Kq+^wy6dJ^ei86%2J#hl!xmO={=m@%)tCLU
z<g$G>aiG}X=`BFQcX4d(QH$zTpHqB|SfBJDFqKs*M26y$f2zao8|UM7H`L?ypoI?#
z=%03^FC$Ql`wD%X=?<zycQR~JGT}<$r0Y%vX2<#h<5{0K{*}2o!M*D>kadC8mJ{Wi
z1!o>2jq2I&E1+`ohV$usC=+@M*I%r^DpTP@Jp;=PTyaC6LHNaUf0zc5dMsZkM?Bmb
z|Fggb-y{cn*JHZ!Y-{3A(NH<d0@%d;u%DXoCYcHs#UTQ0KFCxMNYf$S+Z*l*1$gPg
zo_{&V4X;X*tIQ%ntMv7soez&750uyBL`5p+15@i}+>Zt<j+1|0C_K5Gs{^p%%wa>@
zcnXPg2bk@|uf)W8o=U@4W^ZVRv|(SEc>X^EE}fn6=B~-oAvaNq_W<?ibw}u^IxZ>)
zGG|gG5q=aD^x4;PQmkKoE+ozSUf{@&Xe}h<r$e4U$!`APkPBMcEmJb7l5_YD_qd_X
z&k=eyMWc?N^jOsaKkB1&egvbhs#Ys|OtJ5@E5N?f?r(nWcHs*%4duEVd}{6yZ8Wm%
zLUSj`@+06-VOuaRp0rQ!ll@dd3T+^1KIvEzCb3)uA*a@y*2X&PX8F2*A|m#hPj*VY
z9%_MOYF&7D{L9UM7Ba&cg0Q5{UbYmU<(gjUvdB1gw_x2LI%2txykRS`r28!fN>J5a
z-v5a1Hd%X<4vzzQ!$BjC@8SHT$qsIZpMtF*$S1HA*IQNwN(=A!lW)<uwamuq+~5JP
z4suNALxuUk6!brVl+NV>q{fKwx8;jNV((kt_8Z)mzE^y5>f5|Gr*+krs>H4N{@1rM
zp7lLzLduh9)wpEWy4@ZlZXN#f>g<QSU)g~OwP6RN=>Uo5EGgDv%;}N=Ww$JaF&2d#
za+Pc-D0bx+H10F7`kbly7l#oI*Dgk?V&dAljM?kWK|&jYJDLW>72QSZ!Pc{@@Kl@g
z{BWsoPvPY2*A;>Nga9}5vMX92I9UjMMyFh21h}Kc&)=7e6U${I*Zc9PWjyVM>FEDy
z@4LgA>bATs^e#mZP(Tqv?^Rk*kS4uXk=~_COQ@oB={*6ZH>FCAf{OGG(xrC-1PCSs
zzP#Xj=gyt`-I+Tx&&)rQKhATWlXLdjXYaMwTKl(}i#UMWqHd#7A*cSt-~MK-tOuBy
z;F3_ey?2+g?s(<~uD=$v`lH>S%Qrf!OncwZ-v12^8j6N~D*yPC3A7>gYcR=1F;nu?
zkBgmL%5kWW{r4^D>^XBortY7MD&2Df?VU0VGNn%FG9-U~SNQdV@Hb?3Gq``-zVh^Q
zQI%)Cj43C@l>2v-0v5B}aeRi*LYSuP^@Q_1`{H>!HtyEF`~?=OJ2$ClYrp<M)SRWm
z2t%0x?>gtKaYyOLn{^&X53!L=U;iCi{!Qu4&UPdA^#GlOb&Zn>gy~<=^trdl0#RNH
zZ4k=fLBAyO%hLwC9m(Rb5)4_&)HjCix@NglYr17I6UFu_z>YxSM&rJKRZRE|Ek?YI
z6Ghe(vRnI@PsxN~@}w}m%0X?HS>l_m_$C*f`e%+kzM?7qJg<Zz#7Pp58%~B;X|YWD
zUZn~JNgJ<!t^E4pzzo0NYGY@E&$Qc9=GvOSfNR&H^$E-lCM}vxm_YtNWK7zbFS#ml
zyPW-EH@Ma6udb;I+o#IZx!C<30O()9%72I^wG@au{;}DwT3>Wll$sb?PZzjLe@Ae^
zQXsL--z2bnRiZSXQ}CqQ_5a|vKc?Y73KjnWzg1=yOFa9=DDdo2%&oFU`dQI$N?u%2
zj39EiM{4N!eW|fRJK-kT;57+tWT>|EWa(`tgzlr6uiO7V=>DhrfW^T6zsex*%ZWsi
zuzHPOA!>a%%5<!SmD6w0VI5E`;t$6MX7CrAd)6&9;L#eFlb(NYfn+-TvwEl~QSb~v
zhmH|XnP;zdL97R4`|vNpnEz26{U4I%UqJa+4b+b-{3=yWY}y0<HI2Fh|0GfA_!Wey
zLC>-Ee@Qxq&r1&I#kzJ1gciU26$a<Vc#EhCk{o35+*>e6KBgNvoH<DsP;7q%APZ9q
zyqBmF8FK=9+8qwedpXZ(U|&+diyJ)`hK+}>nf_;vQ!5X$R9bI-$&kkmCfelGK9LxU
zK;JO9PY_zoL-LnMfxl~s_&XygSjGRn+%U-a{kbL8X~d;CFr;5?5G>XQyI`fG*&^iZ
z<@^%zGC?x`=_)ugeTi{ga=92`ceaiJyXx;O?mxJcNp$8b?NI%#i3KCeAWqX7k3L9$
z%bE1~c;IJ;NW`BQrh0+?K@1p^1j+dI7CCRJUw+n7ylY{&J{IR7vlcO*^6l`6Xwk(4
z(tOqVs|nQdvhhDCJ2C9@)K#bh*N@%l#L5DV|4v!ZKMcERurbo~t?kzaMA+gvDmt?>
zdk^*nVLo4_ySc<?n0|clzl&7s7l`*X9}gFOgB`#2-KwvEQ(NVl9*kTnr7`IeSRep>
zY{$3f+PZ2pe8{)Ncd3PZ8Wvcinr(67L(iVTPCHDFGT6_JV=|U~FAL~kC$(WqYedXy
z{?`o5zroD6P#D9|Ez`#x)|YxIO;Yo5m2Fy_K&L<d*mA`mZm^%R%)E8b#PrVL@26eX
zV|jXm`v>LioLuKv%=FrTC;ViL;XVP%mDem_Qwub4*$!g#1k)gEz-R~Itg8OG<}?P{
z?`Zbw9HBifb1#~Fb_q~Ctu&6TG!ejz!%pqr4_uX{d?Q`j5@WZbBUWg$@*4<HG+h#b
z2Rgi81A*B~J*Of&)qiiygK@_sSHq?MfH2(Df=;(7s~+617>{eg$4YVCO9cb@TWNkI
zY@9*;_Y{o(R-%e_kMQao`{p#akN<fWeOgz%EBSsd9kNkhbmq1F0MaT8U-;iPfZTk9
z_(;n%Ds}uWUMXlB_rAGXnXv5{`o}MeQ@h!HHOseu25s_N_kK~Sa$n7w{{urb%a;^=
z->knC=!=jB>op%X$A1r|;r|l?dHC*E=*WcF#BHR3b{UhvdoC-{jrs~EdUXF9?~OOw
zJ*j^(?3cllE^wOIk+VG)+X-n4hFxl5=-X6b+x{}MfJye5STWbKVd+0pblgRVWqWIH
zy|S8T&uy6aq#io%(%+FKV+cC|&l~!PXwv_A<1?+49ro5unhG<dWXmIbohHnN#uy*!
zTblQ@j*#b0`tR`nr*CkM+zB_S!orwg`=0QA2AOT_TQNf%&k%CIDeAp_?KuPfXZ^MP
zNLi!vGua@wHWtm$Kc6SqSgwz5DFYwM&Z6Ogfh^7Uerv;YY<;V4*lQ<`c8ca<k}VB`
zIXqqb#sAv4{-vy}9Wum}<gb6BJ1y+0T}US1PsSCz|0QF|<F~hSk{<tyeO+ih3O;5(
zLc27UxK?}E^%$lDJ8WLt5YpH+928SAO0-OvcfLgk%dhQBFI@Z986!Zc_z1g;Uu1Zr
zD{1`&d0mH%gh=F6zfoSb&YREh@QyP!P4DbKb>y9&)ZMIO?x$YlFSaB9E3@VbS0fS*
zU5OTD(4h0qeeTwVI^TC~LsjyluwCo=`DX$Qh1vsywDV7}wKzA`5eQ;svCQyC-IGhU
zQv7B1Y?RCaMclkxO#WK~4*s7r*f;i^PXC`ihMkJPJLdmu`q-h70hKiP1iR|~N8L)W
zrAHFEi-Tr<TbKPUoL`abI6RYl$8?z!hfbhSSMh_jM~o#=*eWWoPeAOh(<RuDO0v&k
z<;;AkX(i;9w1)XpD@ft4blCrT3FJP#)Xm=J9h$2MKC+}3y1dVjRhe6WKNpZ?LE_yn
zpvx6j8l;_ZWbj4#Vrf8YS(VnCiwm`<5=_I|(7I-?5S^SAC=RQ<4k)fYKjs!s9@Xx}
zou7vFY8N~+tlQ~!O0q37Ej?WM?3slj{D7)PKcyh;g@{x1nj9_+nz(S|#$|G`^)zy7
zS^fKZ0F$h=GVYTo=$E~0www2#kLzE%aemQeaH9?fEuWVLWwhJZvX|X}nsr;?wYzRC
z=GMTCpF<Z=>8+)3Na>p7z5rFwclA>u#h9+ZIJUsbw|OVhDA=2|rh<p8{~1Q;Q{zp=
zFyJZNO)VI$t2>Q8|00`RJnlW}8#O*=&&lNo*{5z*EI8uuBn;q`wWDi?ZWj&Dwm1I_
zl!i?TQi2p5;syGQp+g_At`|GYovd#(Ps`UqUSHhs3f1VS9ZxETnMz~-(>_S^&dPMw
zwYz?7-PGFbTnftSwK0#9n%SB*#MuZ!^V6IomB&S6c!dH=c!Hu9xt-PuRyKE!gd)ky
zw{?cyENhX!>4;R~jojI@<jH6Q-2(%ZHG*l!RHa<yFrn|6+9ntLBwKG%$X>Hac;HIO
zS_3o@HRGXzK2MC2+0D=Sd`U{SYXk)ayj+lOVa_T_&L)3DY&y@(5L5)vlQdARHn5a?
zY`5s$&Wb?+#H7i?5^@<@kP1C4Wll0%Niwre^m}J*D}dHpr6<rUsqp%W6yyrS<B`pr
zxWD@3xC36fxzXH{*pG@>;ThTVtb$%@cifLL{W9I#w8_i3Y)vM-;_KNzM{AtCN<5Rj
zjyWvZ)`UOcP7m9)rKMVYe_2`y$!z6FI^LEQ{#l`7F?C7t+zyipfa^jbp_owASdnPF
zx|y<CkHT%6hE=141bbe~L3wuVS#sSZ@=8n|4ai)g=i@MpdgRHGzr~|~EwAy*M&6hA
zN-}VGvU{Qo=98N7R`D|@rJ7WJzE9u^L+!E)&!+(W_)G;@yC(t0Xz-y{+tTuxC_Xm-
zT*IXg`}@FU1^kj7N824>l4q1*BF+7@I6j$sB_>%ize=_pY%!iGEeQbl3)sX?x)Yr+
z#A$AAXq3ad3*Vx}CSmJiew?kxyC^hXodylp53WBd$X>a^ZKD7jEN6Ur+@9#1`m@&a
zuAT_j#HgoCGV8=EFUmY;4=tq{u8{6>l1xO(+=%5Ml>Lx6STJ7iW2Rwt>5;isIofgs
z^t3N&K*n(NhMt{I`*@9;=4+j=wn&{eY$;mok3SrR3k=i8wP8h{7r#A2B_Ula=bvkS
zZkgSCoK*f0e@7%)-zzg+x5pZ<>gIupaDE2b&n+RS=0LbDKix;nJ5DAjX`6u>2Y6g(
zjL%pX>DfIQyKiB>2NeMRY$_EQ5YhT*qec<$l>L$R?E*u(k4Y}W9UmRDO#WJ-nr6|(
zM%NAN@5U8tO0D{pAOJR<)W?79iuLEeX`{|l6)v(J=~!6boMyREJ)Ps7{$Z^FaRjo1
zfJI8EORH!<fDf#{)L3*U6P?<p$hAiOA+anpzchbLPVgyHp2RI`yn=Z{odz3VD6~?X
zLuf}&T1%8VLR=6ui`>ojAIi#2GP}B5C2c8N<FXYKFrsnCam;i{ER6r;^)m?nDIs`d
zI4)#yzFFCS#K*;S!a;(Mg3<xY1cWAw|FcGujo$HCGWx!E<6oTA{S9z3ta(&wXwq$k
zl&)o*Jg=R3^!Di9Vrjj)I3jozr9;*q@EG}eUPi)wtU=UA{YJF9mE#(t@;3p)Img_V
zV1Qel=1Q=ATL2!7h*74Gwpib+STSheC_Wa0iex~TSN&=kAtM{V0}D6=KIlS7@)dnG
zpi$kjHkBZ55VyJ5A_f=ab(dIXoWqOWhViRDuf?o5Ad+Rp%lQfX56>POm>!mFdD}i#
zZ3@8s+NkMUvr)YuuX*>%CQ0fqiS-xpzf7NSyV+<4nv`wd8l8-7evVC;o&|0x@R{I)
zLojN3=gT$mhsXzkbziawy2|@9Bw>R_@C-!Sr)B4zN6Z(FMxXYEjeweg#)k9EO3f>o
z710``p3*M4sBia79_M}p&#mu1^p$Nn$OpFoF&p}fXSImfW$F)yd7rz>uW=gR(lx?5
z-Z7x4XRBH`0XN+Wt(($(qEmJ2sA{c+>~l`OHo*7mXZ8oni<)z5c9tiYY>sE#T7n`z
zRF{QCUC)~-i_s%QT&$5`vzmv{6IV$b&Ko#Kymz(SO&>evqN-kOHI3&DOp3YTz(1Ra
zR<xW5iK+C6?Jp){y#+bDb|3De#lNPhXlylR8qN{1aD0f@JpLe$O{6|_@D`M(Szj-;
z!;Kp?P_`wl$DLE!71h(`k%c}fWVda#44Oe`fVcc>94Gu+KIrUkLO+LSict$ja77SA
zUi9dPU-daHA5lomu~g--neg4#BIhGK;0`t=Vd$oJCwT0^1U_~#8qB?@3#fv*Ek3qr
zl9+mHs8bYPV1TQf==OcP47xVd2Gksq&jwCD(O>h!h$g5<;fa{7n%1{bb!K5>eW--A
z7;myWSTb8pl^DO+H7dJR{&AUDZ1)61-ok8HGm)9groSt=3)!#tJ|c#_DC<>wZ9nJ;
z52)DZ1N8bF9OG`bl+_n)xN_3KImY@B!)d)@B}KlVRMN=ezb@BsQN3YGf~R(!L(F(D
z*y|y5lKdD4*cF=0Pe9M)i!sPSY(K5K?%NlzHFev-g%O)C+_y|pUF<NUjuRlEz`gv3
zv6A~X4(XJv{oq+&kj8zk0Fe)e(WFz2O`9dpcJzRjdsd6_JVY+T1~gmcjM_PqbH?sN
zvgQp-B20mKMjv{*b60(4?drfNlekK=gRut%8%~EqbxF{Z(r1oS89DWQY^g*oi*z5T
zhzh2++8+AUX?b++!PEby?1ZtS%V_2?_(yDaIZqVg8q``uJ^N~}D<2h(12s;G(T8rt
zfYh2{4I1QBJwQ0$3PKb##F`<Pkly`{!@G+qqovI3*bnlbdBxGJFksqNUG>HntgnvU
zVyVcqY)2Zl=sJAD8wOU)wI-Q5_l0YyxKvvwvi7kybdZMRw|vhC?6z?4qOF8TZDH86
zP>)*I>X6c2$W_(3=O2+tZnIpJIFz+~ELAyj06zmNSdlVviZr6B_5MhP4ESMPtAyU`
z_?ntGdL>iGoyMDx?23QjuKgQ1{?iedch~uP|Mv|Ed;s`<!r@D~oaU}5<{E!*Mx34M
zwbB;0PLTJ|lOqPudybh*#Rou*>bu{SLs=dtp|La5wG#q)$n~PMl^&o}LBwf%n-#Z{
z^~lgd&j3%kpJ8Pd?zCz2_*KKwty=+JN$(8sA~uY?cnuhbzc5*Q6{fQ?0DZ6BMRxHd
zQ5l?$cqbLX&=HINt|&}9X)YE%656ek{lOha^$21yxKWlvmYFZ7)C6{rRDOo$GbrqR
zM^16|-=t5ks54H<uCS=xQ{QxGWzn>|t;C2^=QHWqD|-|lFH+`{m40MRg=1v^0YAiy
zbAhJG0uobX)x}Pg<Bqa<Z(>V#ltQto&HJQR$`Lo?nyvhM!qRNobAUxL%0N*a&Im3B
zyp;;F%_Jq#kF_nO&L#n-UNy(dZmdS6)NopAOk(!Bh`&C*L$xHJKO*K;!>@ijHqhA)
zLy`F@MB}^b_tC&(4*ad-BHQd~@P2Xe2qkHvYSaC)_^B#4e~;Y7r^RcwoXnfO$qh_e
zpHKb3A?WecvdXij4s3?TUQy?|-fzww`v3N{9x83WTE8l-c{sc=p&luhhy%18!01bP
zqNX8MZ2Iwi{vpsYdf0(QRhdf*%GZ5wX*uW4s#krTGH(ox8IW7*s!H~Tm3b5L@B?2@
zt8h@e`0jCUDYQBOUpeIpprX4Q>c!0Z6{y*zI2AHjs&6$vwUZ{z4CGQe#*a$dIxHuP
zs!vouCUXQA56y>8%}z*78P`p_#4cF`Ij@p_0iTsk#A&!8TJc@MDlrbq6vebV`^ypw
zf>i*6D9Ige?`S(`UwBglxWQKXXXC;!UzO=K+A%VMUdg&j9Yi-Kv$S=WADcV%9|a)%
z)xV#IfPN1>cGK1*_7jtw38>kw?guzJ&4=l$!%lfRGe6KA8S#xCWKkIeV$$Y<#H8Mk
z1xw}`!Z$3t3Wsu@0$Oh40tcjbf)lwQ2kJL^h$E~&apq}HsvV1EnEe{TNChxyoM#`s
z+`T<<u8KHG%VvoSu%Fk`vq2BB$5v2!D(%$w?9vLfm5MLCel|G<gr$A1xpIYeMEMa=
zSBp`2OWQ^3)!QYpv*$V=vwLJWm+$$T&%1k}k|%DPO`rAh^xq@jCP?#*h{Wh~k%c5G
z$SI#%`F|75uM{-_!t@?WpW2pr(Hqp)PZGt%PTa;8Z~G^043;@OgkWvIXyyK;{VX8r
z9PO?^hf{Zrkj%9Co9t2FKq~5_JX{r%@$IC*qHSv0Yg%XLQ|FL61$E9D4TSe*gzSPN
z%j>wW=<5oEFNNyP?psoLJ<VWNGU<y{*`-NF-j@i`G~TsRcwlU2!3+m2r1_5U-8lvw
zjfkn19ew&)(jm7VVReQYA*1o0UG9jjVlPzpATm1r%+~BtBzyAFcF}HrX5FRDs;7Jc
zx#^0i6{`|!-WIvp`ZCEhgIl7mtkuXH?fgN#Ke_1*x5<bw#~Ho&rK{%mG5GnkQO<dt
zZ$FEw*^H_rn!M8}n8D^6B_nEk_H<;<-`SNySV%(1ec!GslLklGw+edvZLmuQX!&MD
zLR#&%oqy2ByX%KxDis6=49L;SletI_b*i2RHrx!<%44melwCjB;G;z`+ojALFA(nq
zj<8VH4S~;0VjAK{;OMP8Gsu(<Ir~}SPW{)6=FOPlfVwfku9UCs<iqLAXDPO#NpS<r
z#EE+H{ZUNdU#Yk4&cD8J8n}*BgSFhU&_fQqK%=H`Auxs0jZ|@-H*#UeD#A%qlO}IR
zI<<ooEDAA({>yV3WoyF+Vb}7G=Vz}n`D(b7EK0Qeu`n2FNG~c0z5k<<(BGW$1d?}c
zGW9)}@f@w4xRx;r?#r<jc=h)4)Y{Gh<REhE%aJWl+)#;25*00Ym3G%E%cqwpRG284
zamVy_dDfGHsym{sX9Z|AY2;y84<7KS=NuE%zlyFWGo(o-4Q?9gcc<DYHK0<(m!F)T
zwC3D%ZCte!Sgq)zvN#(^xt2E#3ar8@3}89g-FT*+J#N27UA@=g3Ugov3K?Q&0$jIL
z2ln%L?;kHB9a}XQq<~0qGckZIm-#AvEbn!Y7|O8A5!=WX8gKr{jk%!+E)awbs%yS8
z-b|bIi&v?;A6;?b(Uk7;!!aXv@?}Np<lmn5DUxT7$a`!W9Go8?M&v9`?@P!HO`2}v
zbhbR_JIA%VeZPO3G}OCOXIkI%5G!IT$Tf~k+1dhD_+9XUJ38&P0pGOIPN?*>ZK0!p
zf-q>nRvP5o4m$$5<?lI*=N+Df_3v#;$N)&XWsK0_a?)I3iRihC2^m(!x$(fW9+<fx
z1--?6k4JO_8Tvi(qDf?Y5=?e-^ziQ6IN!pVKqva@P)hNfc}#EIcvQ4(z-(O2`J#et
zpx%JZLZ~$P4;z$?oAK7!2?U<_d|#_}En%pC6ACcjjB(Dlv2F!VOoN9!kYt=_u^`^M
zf^!<9i|8JK>Ayz_7gw`l?<9`N_<bJOHc;v3OgcW_${F`GuXaO(3y}?&zm{6YI`)iE
z(FShP_8+q|%>HDj!jXs@VZbS9sMWHw4Wh$ot(K=agew3wVR}FXV8ZfDYG|esj2{3W
z{m|0)8ZSbAbJl04gL8G~452}MJueIe0&K{wk2B3%U0Z7KU3G=<7VgvYu~QJX&nqwz
zM63nf4`7xUkQz7KU*fY6^IL`FI=A@qU=I2)@iQYW>mspJW3*ECq0b*~>~Y#C>Oh`U
zHzvR4WgjO6H8JIO{o3)bTn+lvSUM)T*jS*#^AF;G{@ir_4i@tHXuE~6Xgoe8c$@it
zeouZm?rq<adVoGcg0HXjQ%cRz0=t3f$@!T!dxJ;-9}{1f`9pPE1x>V8QL9_RdanQ<
zSs3)83LX$S#&?eN%;`hE1ZtM$<kYH^layAg*fZar-y7<UobWV32TF8h_?Aq&uKElZ
zY^75jBQ+#3PK*BdWZS)TM&4^<BXbpLb3DMB5=%<!b{e4NUF&OvQw>SzLeF_6bP@Om
z!Uy6%ISt{{3ca+&Qh45(Km8F!EbCn%T4>yrD?8iM$)2S!Koly8t^Tznv`}K%nd5H1
z!Mt9Ln1?$z!uOw7s64<?0olSr)eNn*WqVA$)le08JX*snG8xxt@sw9Tv~(h_y~{=S
zTaiE6>>Z`~d=}ZJ#%Pz;#*|npd@MDH$eyBK`+$Z}62|!WMo0M)caO3UnR$GfMeV&q
zjU@G5pV%>RNuj^k)fiUJJl+kk{u*&U@4cy!1vqr~N1nf~dM2|q`d*FVa51PbE<kUR
zdHoD!vj*A1cJFns3KWQ~eQxS1QvoN+6SPcN#*qqhtd5tMm0Mr9Eh+MA<Y#b4yIiqd
z(wfntT=7kOdGhcO%|TD?ry9)3U*vY=igQRB<LAy}N}kjjqZym*=8>1MYfo;&N<R-5
z?^$mw{Uf`V_lsWIghE+yRNyy+A<XN|Ymz1)9Z>>7iK5plE)z*20P4*d^+;eM)uIw4
zMP{-Sk((9-VkD40+k2<}<cwAP=lir&vhdpaZ+?d%>>UGl#VDfs8Mkrdci!$loJ);0
z2{S`75c^D5ojbB#jKq6qKji%3&o2cQO$uT5KutG-<u3*VBmE$`%qB-eq~TZQ^$?WJ
zd=U5n0g;C~?p6amz|CzHTc>KclzD>+uPZpXsJPJHX0TlEp%$}n<5E$<^}N=68u?~w
zJb5<16<30Hvo+sp>o-<Av(UF2zm-n~tw6~yO}5;8bpe&FZeLd{VA3*K#XoD`_isYB
zSC(?@<CinM8ICg~&w4q5n*Iu!qE|R;1d9Q5-JFuST&*FshlC)M3u}c0gYpB3ER}&N
zO-Yg!V{9l2_xZ8`$jB5P95VYdOJ#mPngc$r3a1=#E_w4Qoq0~!cq&WzF@tingB$nk
zFNek0f+r24ShN*e@LZZ(hHiET^lHd*WaN=MxIp&B#pv+M^%wkX_V<a~aAld1(JRIj
z1;zdv-9H@IwOOtUA~HmO6sL#NjuOV%#>v>gOP2bjbWwH5dkp0DV$mRO8k`lEo40G@
zk;Jd?cCcFxpw>cE9w;q!Ac@w;{&QAQnt%gJ8&Oh~+PwcQ@=<RyCTZYg_>&x<W&2cs
zFVoPbS8L8CZO-N$%{hpbC^%8%@o?jv7A-0>|G8IMv1oy*Hrhx@Hkn4XrRcA|kW`|`
ze3(>8FaTpRfTIv}o_IlC!4ezUcZ9cKv&!QmL4iJ3lEW1;&q|c{MlczTUV-e49`ui4
z_PoHsrTgl{sunEe_9B|F*0Ab^=tHSFJ`%wU4T&JxfCpwt!ki^gKoEF5t$BZf{IwDt
zK?GO$F?<?CM^GVa^DIS)k^q+;UvB>{be)#YRhY+7*!1dhZ5ZT5M8da*SV9eM;tt6A
zYpv2G9BH;QVyt)U)E&<95#7C{m>IGt4_WD(gcq2wrV;38exq-lCkMyQ9d-S)<r!DL
z>)pg5Q&+Xn^;9{ScRMt|q|O|_=OxU=8?uJ5(|JTFG{2{lHbPFJ=#?^LOctY$d-VM!
zaPkTO{!uwX${};aG{H~G&0CX_K$=@|ZU+W1X3>?QXu=FPcL;r5r1h9mebK(x|A;tn
zswYUTSvo1ufpPCkQG5ggnL^nsHA>{+JIA5!ymiHc7x2f{2Z>C-d&=*YiDcS#9USpw
zmA$fAeoaL>l`JfOkX^#1SJ|;$Ivh(65`>|6=j^g1p;&&I1;0&=LrN5amxCv|?)5%o
z)dP#vL@{?M7ayq8CWXG|SezR(XVK-MkQ5{g&$lQd93Uoc|H1YOY{WJQ_(Iq~Nc8ab
z4vzf(HI^sU`MUh0WbytTc_()2B;$n97lay2+G-^4MmNfUQ->tiR))xr6N2)ivm4@l
zA42<cfkRVy_TGbsTI_HU@0qe5d|(<FKHwP&Z3zmFilf~j76vdUUR@Y0?|r68Hwqtp
zza9Ce<;CC}zhpvSmm`#!kIoTa9=>nk^^LY0Uw-vFc4IYf6$+)X1#-qYKrl8<@D+PB
z^#^8kuS88HkFdNK8XL#v@`*&R@@W(zm^kt-D_jt>w<>$7`13*gW4%u9mGtFLAMHSk
z?O@Cs*_3QM)&P=-!gwi%0V3dFA%I}Y3uz@$7Mxk~v&ddgGeZvG^w|K9CWkW>d15M-
ztUjT_$sFa{?2AD)j9tqkr7C+gG42Z6&VAt$PuNrz-hL!AWG=rm@~OSID2V1mKL|M0
znrOI|%r`P8pwwiSQP5AInmdSjhZlJK^3pO8d}m4wY@byJ08BC(`(tZz(VQtc7HA$Q
z`HZZe2qKilt#z|A>ezP#yibi*!k}Dd_eetT^p&4<Rg!d@kdC^!L4ifDm0u?m7Z;8?
zJi{ClcTYb6WT_vSuq69FIDN`WLlC583O5RRuw6-EY|^}R5YSO4>;8i(ysSCYK1d^w
z(s1w$O`()cimObJO!RW`r()7`CBbH3)?p=ZV=2gl8!>Si0(XcZ_r`WivV5a4J5W1~
zFjzYPx6aL1pWtf|k%W+w1qB`uKZPVzbOLn11oyquvNe=_r8tA?Y&nNFwZYO0_8g$K
zdiY*m4@r_3`W%3MVeW~oRud(k9|xe&4r%}&aKUtWDW>>87%vmR<G6OIsLWmG2=k9*
zOMxG&G?MWZGc+HdhK}_*7F+YC4Q@tjTvs&{mNB|XJr8#!PyUtA7<g$PB6ic~e_MhJ
z+!*;TIgz9>t9lJP%_+iMID$jwKp`iMsi4gh0|Ua)es899ET62n#wn@Ln=CF}zAXdv
zBVxi99j|85&{`jXdkJ(+%6{iC<k4*@IsC=|=Hdh|!uC=M^a)&|ujh5NJ^&vu#8&b%
zRZ<B$CO&!Fp=Y6(q}tc18mty51&Xz=fdY6`j>$HAX>lKyICUYNdHaShYy1oss{1Y7
z=#wTluHk2j+BofeP-o>OtAOj*SyyLUwLc6T)POPJ0byAkC6<_DLQc=p^yQg;nN(lc
z<CGMjo(64?=pa1#0|>s+<U99K;hhSzmkJ%h?bX>|N$9uIp^IhVUyEKV6vZo)ffo&x
znyzXFOspT{4JnI{&fWo-Ggvoa>xaw48ojMixiC%fAB2ttsNpnkxB5>8lDShHV$&-5
zo>ej*cA3x!Lnr_YSYZNaWoA$+vMBFX999U?^x$5v5wvGU_A`h@uQy|8+ZKBk{n1Ai
z2JD34WJjWBhgS*nxB4T?f`rX?sNk$FO$>@zCn^W~yYjP1U(|e&_DQA++>I@UC`^;X
zjSDWKgo*cSv`3jZ$~N;8hIVI@>9Y~2;LBrpSuCg}lcmSsb{DK5c2(I3x*xc36Na#g
zn8H*C?C>{Fz2GgD(Zwx2vKusOdIaHQ``EXC7DvAh%{g8j>Kgl6TXXk&@kX1Smtx+C
z^e7eOQQQwR$z+7@%=@$p-thF%ts1FzC_h2dK|8V$)+im|Xb6KK2tz3`*YYHAfz`nb
zN^3cysg(njWc1VoG-SJT?hjvd8y3hFx4|tRzhqDua2PhK%JB3e{3^`_@*Ih2UfS4%
zT<RG#C1P#Qy1=$r6kv>eZf(vNeNTc5Tw0D(N{K^id`ozZS!wmT!><-A?3l{yEX3;)
zgja{LGKFu=xp&xVt(lz>tDjeY+zplvXLQ*13r_Mse<Qm8{kn)ty&}fyV%)ZIN>xu`
zi+!u9Qv-aUssMNeHmp?Z%BTviRE6$OA!=ZPE`btWtCp6hUq^a2In?4=s_*Oi)ByBR
zR?8Nz>|^7K$WoF^XE}b&nqSjXe7t8=*!bG^nY_vVdzmHEeg>31c#02cag@J~3F=+T
zYq<hIivTFPNkfL2ntZ40vRb$Jz(uvj<Oa7d<HDH@${GufqodEG1CV{>wBd3JS2ZV9
zzw;SWuzLOwD(>d668xEnNR-gyZXVDSE$&9kU4xH1iA8TtXR&9aMBHc30tkTgA=&I2
zGH1+?OB+c&)+7CR@7uS|?bauv`GYM_3tG>seB#S|m?rjywWbcnW&x!Ydm`D9Og|Q#
zo9vt-5{m3Kpe@+9I#RF_zYp<(b(Z1CXHLoj+^%o3GIsAuTep~0PO|2^Ipv;ISG^W`
zN}hLPExLK=bob5lV~pqTp@jul%fJNy+uvnms)SNo&P*mrrWOkUSLmCt^G1hv-)#z>
zh|s&v(p65@P5iQ&DK|-Gb@rg=$>K*hr#t71;G2;&@)3+hw`}Au8swH%xSBwX!#N4P
z-$j3*K1pAj^W@lY2-DIUQVnmk2PX91BT<<PYzxtx+jt5roa-93ar2cig%?6(0i|vZ
zcN!KLaO80ri?E2)AMF_~MqNuPEek{8%G<cE<q(ZyC4mBYsCBNT=J1z5th}xuP>Gb8
z)ae{93mfJN6%Lq2AL)_5B0K|#Ki~0Gh>3ClD-4LLql*;dy_;fO?ck~!eS!<lZE%@O
zPohtP+SJ9p_enTww2SA7pg@+ve0(6w9~(DZznny*$ePcwz!O}cU&BZ|4TkaXG#}YN
z*WX{i-Oh6HwW-Cw%E=N#KNUIybVaUo6NepuZ0$CDo%>gt1p%|k71H4c?fHjJ;u#YY
z+0#I*zXir015#Oazj*k)I0}~y(+)k{spblg3WaiB9UR2Lu0_iPL!xlXN&e1v`e<vn
zwFs<L7l#HHI63WinI-U3zn&;b_Zc^lU6g!I^@2u%e=GE-H2NsDbr$}kg$G-LN7(#6
z1t-GT&qAGzS;cWA4Z`Q&Mk4-1P37g~Bt6|<!R55kC(H=FQsm69Yl}NLhzop%t-28v
zqIqm*q)-%OV^Ont2WW#Nx=VMV=stBPAyThyz{i!JMEkKMymKWd0!7X7!R_kjL7g{a
zV)>P{EqkG8?Aieq1(6zG6$V@>rN4|n3I3YWcLP<?#6d+uDj8dD5j3}TjLz7png4)m
z!$p#)`$A|Plp$BVURSz{uj}1muYVaW#h;BGlKg3fqBuRmi0*9c%-d*d!7y<=;#rmn
zhlK9c$R08$!4P$G0PFo-RUrQ;+-Gj-VqBlPb3dYEMGyq8Hqis%pdkS+=SZM7#T8|?
z!8f{qQMZ%?Tbb|qng9m+6w=UYq|vS4Hp=Q-1T?d|$Qcm)&4dBWYJ59}U&#Z@46HmQ
z%(w%3sd3~GvrMljF2qUjf-u1J7WHWF8kUhxBKw;yyn0J>Xz;oiud!@Uk<sjkCHt!3
zh07A(x^{#9Liv8rze<^yY{a4K<veIEtJe;x&Kpq2QZhTXZ!8pvltr(P0x<b{ikS#W
z8zk=C^^1p|p6HUAqble*srHgd)4PvrMs~LOl~6eHf&-fNGFYBN1H`$UQj++5Ih(-^
zBRzc*8tHMk&k&kSvQ39uk&YENM002#Yo|<^7zoJOW*gU=i+p<d4LMaRqWo!Sy)Z~=
z$Ur_Gu=<r{0trF*JNa}W0CzVr=s+F{s(J&GLO1;$SCT1}!d@#Iu|VFMTV5$hGvVl4
zc*+ntCC-=fdh=Y(lmPUUA3Q7Ql1Gw2I9d9jRyNn6zohC%czozsuZw!@V)aY)olPWa
z5(z;2XY*d9z6cH?cK7}u7;iurd~<O>#}(_b^Jr2NP*u3OVNU#d?Dq#2MG%B_%ee81
zL_bS!hkk)-DiO6qK=B6H^zpxAjbG}F@z~s~uIzT=&9o#5qtpw{04`{1%|a(wDK4pa
z!|)aJw{IKv4{g#rptaSO8qWs#@|?eSa6G;ELT<ij8amS00!lm^nxOS?smssK<L)_q
tTJjR8P<omuj(cfQ9}=1(e)MSh9RGoZBhPld*hL-(Wd-#|mGVzR{~!OYr3wH5

literal 0
HcmV?d00001

diff --git a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
index a647fa61..2ecbb29d 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
@@ -68,9 +68,10 @@
     <Border
         Name="br"
         BorderBrush="#0CADF5"
-        BorderThickness="2">
+        BorderThickness="0">
         <Border.Background>
-            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" />
+            <!--<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" />-->
+            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹框/z4.png" />
             <!--<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹窗2.png" />-->
         </Border.Background>
         <Grid Margin="10">
@@ -78,9 +79,17 @@
                 <RowDefinition Height="40" />
                 <RowDefinition Height="40" />
                 <RowDefinition Height="40" />
+                <RowDefinition Height="40" />
                 <RowDefinition />
             </Grid.RowDefinitions>
-            <Grid Grid.Row="0">
+
+            <TextBlock
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Foreground="DeepSkyBlue"
+                Text="配方编辑" />
+
+            <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition />
                     <ColumnDefinition />
@@ -120,7 +129,7 @@
                         Text="{Binding RecipeCode}" />
                 </WrapPanel>
             </Grid>
-            <Grid Grid.Row="1">
+            <Grid Grid.Row="2">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*" />
                     <ColumnDefinition Width="1*" />
@@ -181,7 +190,7 @@
 
             <!--#region 表格标题栏设置-->
             <Grid
-                Grid.Row="2"
+                Grid.Row="3"
                 Margin="0,10,0,0"
                 Background="#ff0C255F">
 
@@ -287,7 +296,7 @@
                 </Grid>
                 <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,0" />-->
             </Grid>
-            <Grid Grid.Row="3">
+            <Grid Grid.Row="4">
                 <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
                     <ItemsControl ItemsSource="{Binding AllRawMaterial}">
                         <ItemsControl.ItemTemplate>

From 2abc5f1a2f164e172c672737705a0ed1697ab726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Fri, 26 May 2023 19:03:21 +0800
Subject: [PATCH 74/96] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/HK_PLC/HKDeviceStatus.cs            | 128 ++++++++++--------
 1 file changed, 75 insertions(+), 53 deletions(-)

diff --git a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
index a9e99d61..7dccace3 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/HK_PLC/HKDeviceStatus.cs
@@ -17,7 +17,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
         public SiemensHelper HK_PLC_S7 = new SiemensHelper();
         public bool IsConnected => HK_PLC_S7.IsConnected;
         public DB_Read PlcRead = new DB_Read();
-        public DL_DataColl_DB DataColl =new DL_DataColl_DB();
+        public DL_DataColl_DB DataColl = new DL_DataColl_DB();
         public void Init()
         {
             try
@@ -25,7 +25,8 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
                 DB_Write PlcWrite = new DB_Write();
                 HK_PLC_S7.WriteClass<DB_Write>(PlcWrite, 99);
             }
-            catch (Exception ex) {
+            catch (Exception ex)
+            {
                 MessageNotify.GetInstance.ShowRunLog("DB99块初始化值 失败");
             }
             ThreadManage.GetInstance().StartLong(new Action(() =>
@@ -55,7 +56,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
                     }
                 }
                 Thread.Sleep(10);
-            }),"海科数据交互",true);
+            }), "海科数据交互", true);
         }
         /// <summary>
         /// 往plc下发配方数据
@@ -64,9 +65,9 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
         {
             if (IsConnected)
             {
-                if (recipe != null) 
+                if (recipe != null)
                 {
-                    HK_PLC_S7.Write("DB99.DBW2.0",Convert.ToInt16(recipe.TrayCode));
+                    HK_PLC_S7.Write("DB99.DBW2.0", Convert.ToInt16(recipe.TrayCode));
                     HK_PLC_S7.Write("DB99.DBW4.0", Convert.ToInt16(recipe.TrayCode));
                     MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号DB99.DBW2.0：{recipe.TrayCode}，下发完成");
                     for (int barrel = 1; barrel < 6; barrel++)
@@ -76,59 +77,80 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
                             for (int loc = 1; loc < 15; loc++)
                             {
                                 int index = Array.FindIndex(recipe.RawMaterial.ToArray(), p => p.RawMaterialBarrelNum == barrel && p.RawMaterialLocation == loc);
+
+                                #region 新版本
+                                int x = 0;
+                                if (barrel < 3) x = (barrel - 1) * 56 + 6;
+                                else if (barrel > 3) x = (barrel - 2) * 56 + 6;
+                                string address = "DB99.DBD" + (x + 4 * (loc - 1));
+
                                 if (index == -1)
                                 {
-                                    switch (barrel)
-                                    {
-                                        case 1:
-                                            string address = "DB99.DBD" + (6 + 4 * (loc - 1));
-                                             HK_PLC_S7.Write(address, 0);
-                                            break;
-                                        case 2:
-                                            string address1 = "DB99.DBD" + (62 + 4 * (loc - 1));
-                                            HK_PLC_S7.Write(address1, 0);
-                                            break;
-                                        case 4:
-                                            string address2 = "DB99.DBD" + (118 + 4 * (loc - 1));
-                                            HK_PLC_S7.Write(address2, 0);
-                                            break;
-                                        case 5:
-                                            string address3 = "DB99.DBD" + (174 + 4 * (loc - 1));
-                                            HK_PLC_S7.Write(address3, 0);
-                                            break;
-                                        default:
-                                            break;
-
-                                    }
+                                    HK_PLC_S7.Write(address, 0);
                                 }
                                 else
                                 {
-                                    switch (barrel)
-                                    {
-                                        case 1:
-                                            string address = "DB99.DBD" + (6 + 4 * (loc - 1));
-                                            HK_PLC_S7.Write(address, recipe.RawMaterial.ElementAt(index).RawMaterialWeight);
-                                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
-                                            break;
-                                        case 2:
-                                            string address1 = "DB99.DBD" + (62 + 4 * (loc - 1));
-                                            HK_PLC_S7.Write(address1, recipe.RawMaterial.ElementAt(index).RawMaterialWeight);
-                                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
-                                            break;
-                                        case 4:
-                                            string address2 = "DB99.DBD" + (118 + 4 * (loc - 1));
-                                            HK_PLC_S7.Write(address2, recipe.RawMaterial.ElementAt(index).RawMaterialWeight);
-                                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
-                                            break;
-                                        case 5:
-                                            string address3 = "DB99.DBD" + (174 + 4 * (loc - 1));
-                                            HK_PLC_S7.Write(address3, recipe.RawMaterial.ElementAt(index).RawMaterialWeight);
-                                            MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
-                                            break;
-                                        default:
-                                            break;
-                                    }
+                                    HK_PLC_S7.Write(address, recipe.RawMaterial.ElementAt(index).RawMaterialWeight);
+                                    MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
                                 }
+                                #endregion
+
+                                #region 旧版本
+                                //if (index == -1)
+                                //{
+                                //    switch (barrel)
+                                //    {
+                                //        case 1:
+                                //            string address = "DB99.DBD" + (6 + 4 * (loc - 1));
+                                //            HK_PLC_S7.Write(address, 0);
+                                //            break;
+                                //        case 2:
+                                //            string address1 = "DB99.DBD" + (62 + 4 * (loc - 1));
+                                //            HK_PLC_S7.Write(address1, 0);
+                                //            break;
+                                //        case 4:
+                                //            string address2 = "DB99.DBD" + (118 + 4 * (loc - 1));
+                                //            HK_PLC_S7.Write(address2, 0);
+                                //            break;
+                                //        case 5:
+                                //            string address3 = "DB99.DBD" + (174 + 4 * (loc - 1));
+                                //            HK_PLC_S7.Write(address3, 0);
+                                //            break;
+                                //        default:
+                                //            break;
+
+                                //    }
+                                //}
+                                //else
+                                //{
+                                //    switch (barrel)
+                                //    {
+                                //        case 1:
+                                //            string address = "DB99.DBD" + (6 + 4 * (loc - 1));
+                                //            HK_PLC_S7.Write(address, recipe.RawMaterial.ElementAt(index).RawMaterialWeight);
+                                //            MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
+                                //            break;
+                                //        case 2:
+                                //            string address1 = "DB99.DBD" + (62 + 4 * (loc - 1));
+                                //            HK_PLC_S7.Write(address1, recipe.RawMaterial.ElementAt(index).RawMaterialWeight);
+                                //            MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
+                                //            break;
+                                //        case 4:
+                                //            string address2 = "DB99.DBD" + (118 + 4 * (loc - 1));
+                                //            HK_PLC_S7.Write(address2, recipe.RawMaterial.ElementAt(index).RawMaterialWeight);
+                                //            MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
+                                //            break;
+                                //        case 5:
+                                //            string address3 = "DB99.DBD" + (174 + 4 * (loc - 1));
+                                //            HK_PLC_S7.Write(address3, recipe.RawMaterial.ElementAt(index).RawMaterialWeight);
+                                //            MessageNotify.GetInstance.ShowRunLog($"配方编号：{recipe.RecipeCode}，托盘编号：{recipe.TrayCode}，桶号:{barrel}，位置：{loc}，重量：{recipe.RawMaterial.ElementAt(index).RawMaterialWeight}");
+                                //            break;
+                                //        default:
+                                //            break;
+                                //    }
+                                //}
+                                #endregion
+
                             }
                         }
                     }
@@ -244,4 +266,4 @@ namespace BPASmartClient.JXJFoodBigStation.Model.HK_PLC
             return false;
         }
     }
-}   
+}

From 80aa83113210843de9fb4782286fb4928557b5d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Mon, 29 May 2023 14:29:15 +0800
Subject: [PATCH 75/96] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.JXJFoodBigStation/App.xaml     |   9 +-
 BPASmartClient.JXJFoodBigStation/App.xaml.cs  |   3 +-
 .../Model/ProcessControl.cs                   |  37 +-
 .../App.xaml.cs                               |   1 +
 .../Model/Siemens/NewRemoteRecipeModel.cs     |  61 ++
 .../View/NewLocalRecipeView.xaml              | 564 +++++++++---------
 .../ViewModel/NewLocalRecipeViewModel.cs      |  43 +-
 7 files changed, 401 insertions(+), 317 deletions(-)
 create mode 100644 BPASmartClient.JXJFoodSmallStation/Model/Siemens/NewRemoteRecipeModel.cs

diff --git a/BPASmartClient.JXJFoodBigStation/App.xaml b/BPASmartClient.JXJFoodBigStation/App.xaml
index 07a8c441..5d64b9c2 100644
--- a/BPASmartClient.JXJFoodBigStation/App.xaml
+++ b/BPASmartClient.JXJFoodBigStation/App.xaml
@@ -1,7 +1,8 @@
-<Application x:Class="BPASmartClient.JXJFoodBigStation.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:con="clr-namespace:BPASmartClient.CustomResource.Converters;assembly=BPASmartClient.CustomResource"
+<Application
+    x:Class="BPASmartClient.JXJFoodBigStation.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:con="clr-namespace:BPASmartClient.CustomResource.Converters;assembly=BPASmartClient.CustomResource"
     xmlns:local="clr-namespace:BPASmartClient.JXJFoodBigStation">
     <Application.Resources>
         <ResourceDictionary>
diff --git a/BPASmartClient.JXJFoodBigStation/App.xaml.cs b/BPASmartClient.JXJFoodBigStation/App.xaml.cs
index 354b9dc1..4dac73f7 100644
--- a/BPASmartClient.JXJFoodBigStation/App.xaml.cs
+++ b/BPASmartClient.JXJFoodBigStation/App.xaml.cs
@@ -39,6 +39,7 @@ namespace BPASmartClient.JXJFoodBigStation
             MenuInit();
             DataInit();
             MainView mv = new MainView();
+            mv.TitleName = "自动化产线-大料站上位机控制系统";
             ProcessControl.GetInstance.Init();
             LoginView lv = new LoginView();
             var res = lv.ShowDialog();
@@ -186,7 +187,7 @@ namespace BPASmartClient.JXJFoodBigStation
                 AssemblyName = "BPASmartClient.JXJFoodBigStation",
                 ToggleWindowPath = "View.ManualFlowView"
             });
-            
+
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
             {
                 MainMenuIcon = "&#xe603;",
diff --git a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
index fc3a26b2..e4bec208 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
@@ -35,7 +35,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// <summary>
         /// 配方等待执行
         /// </summary>
-        public ObservableCollection<RecipeData> RecipeWaitExecute { get; set; } = new ObservableCollection<RecipeData>();   
+        public ObservableCollection<RecipeData> RecipeWaitExecute { get; set; } = new ObservableCollection<RecipeData>();
         /// <summary>
         /// 配方正在执行
         /// </summary>
@@ -91,11 +91,11 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         RawMaterials.Clear();
                         for (int i = 0; i < GVL_BigStation.Max_DosingSotckBinNum; i++)
                         {
-                            if (string.IsNullOrEmpty(recipe.Material[i].Material_Name)) 
+                            if (string.IsNullOrEmpty(recipe.Material[i].Material_Name))
                             {
 
                             }
-                            else 
+                            else
                             {
                                 int index = RawMaterialsNamePos.Values.ToList().IndexOf(recipe.Material[i].Material_Name);
                                 if (index >= 0)
@@ -829,7 +829,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             {
                                 item.Laying_Off_Weight = HKDevice.PlcRead.StockBin14ActualWeight;
                             }
-                        }      
+                        }
                         HKDevice.HK_PLC_S7.Write<bool>("DB98.DBX1.3", false);
                         LocalRecipeQueue4.TryDequeue(out code);
                         LocalRecipes.RemoveAt(index);
@@ -994,7 +994,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             }
                         }
                     }
-                    else 
+                    else
                     {
                         if (SiemensRecipeQueue1.Count == 0 && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue3.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe1 && data.TrayCode == 1)
                         {
@@ -1006,7 +1006,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             SiemensRecipeQueue2.Enqueue(data.RecipeCode);
                             MessageNotify.GetInstance.ShowRunLog($"本地配方，配方：{data.RecipeCode}，加入队列2");
                         }
-                        else if(SiemensRecipeQueue3.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe3 && data.TrayCode == 3)
+                        else if (SiemensRecipeQueue3.Count == 0 && !SiemensRecipeQueue1.Contains(data.RecipeCode) && !SiemensRecipeQueue2.Contains(data.RecipeCode) && !SiemensRecipeQueue4.Contains(data.RecipeCode) && HKDevice.PlcRead.IsAllowIssueRecipe3 && data.TrayCode == 3)
                         {
                             SiemensRecipeQueue3.Enqueue(data.RecipeCode);
                             MessageNotify.GetInstance.ShowRunLog($"本地配方，配方：{data.RecipeCode}，加入队列3");
@@ -1362,7 +1362,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
                                 FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
                                 FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
-                                MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
+                                MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight}kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe1Time).TotalSeconds;
@@ -1475,7 +1475,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
                                 FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
                                 FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
-                                MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
+                                MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight}kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe2Time).TotalSeconds;
@@ -1589,7 +1589,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
                                 FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
                                 FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
-                                MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
+                                MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight}kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe3Time).TotalSeconds;
@@ -1702,7 +1702,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
                                 FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
                                 FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
-                                MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
+                                MessageNotify.GetInstance.ShowRunLog($"配方4，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight}kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe4Time).TotalSeconds;
@@ -1804,7 +1804,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     HardWareRawMaterialInfo.ElementAt(index).RawMaterialChineseName = "";
                 }
             }
-            
+
             RawMaterialsInfo = HardWareRawMaterialInfo;
         }
         /// <summary>
@@ -1938,6 +1938,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                 }
                 Thread.Sleep(10);
             }), "西门子和海科PLC重新连接", true);
+
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
                 GVL_BigStation.HeartBeatToPlc = !GVL_BigStation.HeartBeatToPlc;
@@ -2026,9 +2027,9 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                     }
                     else
                     {*/
-                        ReceviceData();
-                        RecipeInfoToHKPLC();
-                   /* }*/
+                    ReceviceData();
+                    RecipeInfoToHKPLC();
+                    /* }*/
                 }
                 Thread.Sleep(10);
             }), "配方数据执行流程", true);
@@ -2074,7 +2075,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                 {
                     foreach (var item in SiemensRecipeQueue)
                     {
-                        if (item.Value.Count == 0 && item.Key == data.TrayCode && GVL_BigStation.AllowIssueRecipe[item.Key-1])
+                        if (item.Value.Count == 0 && item.Key == data.TrayCode && GVL_BigStation.AllowIssueRecipe[item.Key - 1])
                         {
                             if (SiemensDevice.DL_Status is DL_Status_DB status)
                             {
@@ -2145,7 +2146,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 GVL_BigStation.Order_CancelStep = 20;
                                 foreach (var item in SiemensRecipeQueue)
                                 {
-                                    if (item.Value.Contains(code)) 
+                                    if (item.Value.Contains(code))
                                     {
                                         GVL_BigStation.Order_CancelStep = 30;
                                     }
@@ -2198,7 +2199,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             {
                                 if (item.Value.Contains(code))
                                 {
-                                    if (GVL_BigStation.RecipeDosingStatus[item.Key-1] != 0)
+                                    if (GVL_BigStation.RecipeDosingStatus[item.Key - 1] != 0)
                                     {
                                         HKDevice.HK_PLC_S7.Write("DB99.DBX230.0", true);
                                         HKDevice.HK_PLC_S7.Write("DB99.DBW232", (short)TrayCode);
@@ -2305,7 +2306,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 FinishData.Material[i].Material_Name = SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialName;
                                 FinishData.Material[i].Material_BarrelNum = (short)SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).RawMaterialBarrelNum;
                                 FinishData.Material[i].Material_Laying_Off_Weight = Math.Abs(SiemensRecipes.ElementAt(index).RawMaterial.ElementAt(i).Laying_Off_Weight);
-                                MessageNotify.GetInstance.ShowRunLog($"配方{data.Key}，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight }kg");
+                                MessageNotify.GetInstance.ShowRunLog($"配方{data.Key}，配方编号:{code},托盘编号:{trayCode},原料名称:{FinishData.Material[i].Material_Name},原料桶号:{FinishData.Material[i].Material_BarrelNum},配料重量:{FinishData.Material[i].Material_Laying_Off_Weight}kg");
                             }
                             FinishData.Ask_For_Finish = true;
                             double a = DateTime.Now.Subtract(GVL_BigStation.RecipeDosingTime[data.Key]).TotalSeconds;
diff --git a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
index f047bd73..e113200a 100644
--- a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
@@ -42,6 +42,7 @@ namespace BPASmartClient.JXJFoodSmallStation
             DataInit();
             Init();
             MainView mv = new MainView();
+            mv.TitleName = "自动化产线-小料站上位机控制系统";
             LoginView lv = new LoginView();
             var res = lv.ShowDialog();
             if (res != null && res == true)
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/NewRemoteRecipeModel.cs b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/NewRemoteRecipeModel.cs
new file mode 100644
index 00000000..041e009a
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/NewRemoteRecipeModel.cs
@@ -0,0 +1,61 @@
+using BPA.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.Model
+{
+    public class NewRemoteRecipeModel : ObservableObject
+    {
+        /// <summary>
+        /// 原料名称
+        /// </summary>
+        public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } }
+        private string _mRawMaterialName;
+
+        /// <summary>
+        /// 原料对应的桶号
+        /// </summary>
+        public short RawMaterialBarrelNum { get { return _mRawMaterialBarrelNum; } set { _mRawMaterialBarrelNum = value; OnPropertyChanged(); } }
+        private short _mRawMaterialBarrelNum;
+
+        /// <summary>
+        /// 原料类型
+        /// </summary>
+        public string RawMaterialType { get { return _mRawMaterialType; } set { _mRawMaterialType = value; OnPropertyChanged(); } }
+        private string _mRawMaterialType;
+
+        /// <summary>
+        /// 需要原料重量
+        /// </summary>
+        public float RawMaterialWeight { get { return _mRawMaterialWeight; } set { _mRawMaterialWeight = value; OnPropertyChanged(); } }
+        private float _mRawMaterialWeight;
+
+        /// <summary>
+        /// 原料对应料仓的位置
+        /// </summary>
+        public int RawMaterialLocation
+        {
+            get { return _mRawMaterialLocation; }
+            set
+            {
+                _mRawMaterialLocation = value;
+                if (RawMaterialType == "小料")
+                {
+                    //Json<DevicePar>.Data.BomMaterial
+                }
+                else if (RawMaterialType == "粉料")
+                {
+
+                }
+                OnPropertyChanged();
+            }
+        }
+        private int _mRawMaterialLocation;
+
+
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
index 2ecbb29d..3bcbb335 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
@@ -8,7 +8,7 @@
     xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
     Title="NewRemoteRecipeView"
     Width="900"
-    Height="645"
+    Height="700"
     AllowsTransparency="True"
     Background="{x:Null}"
     Topmost="True"
@@ -74,12 +74,11 @@
             <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹框/z4.png" />
             <!--<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹窗2.png" />-->
         </Border.Background>
-        <Grid Margin="10">
+        <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="40" />
-                <RowDefinition Height="40" />
-                <RowDefinition Height="40" />
-                <RowDefinition Height="40" />
+                <RowDefinition Height="50" />
+                <RowDefinition Height="150" />
+                <RowDefinition Height="10" />
                 <RowDefinition />
             </Grid.RowDefinitions>
 
@@ -89,317 +88,326 @@
                 Foreground="DeepSkyBlue"
                 Text="配方编辑" />
 
+            <Button
+                Name="Close"
+                Width="50"
+                HorizontalAlignment="Right"
+                Content="&#xe679;"
+                FontSize="25"
+                Foreground="Red"
+                Style="{StaticResource TitleBarStyle}" />
+
+
+            <!--#region 信息录入-->
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition />
                     <ColumnDefinition />
                 </Grid.ColumnDefinitions>
-                <StackPanel
-                    Grid.Column="0"
-                    VerticalAlignment="Center"
-                    Orientation="Horizontal">
+
+                <Grid Grid.Column="0" Margin="5,0">
+                    <Grid.Background>
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹框/ch.png" />
+                    </Grid.Background>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
                     <TextBlock
-                        Width="100"
-                        Margin="10,0,10,0"
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        HorizontalAlignment="Right"
                         Background="Transparent"
-                        FontSize="20"
-                        Foreground="#FF2AB2E7"
+                        FontSize="18"
+                        Foreground="DeepSkyBlue"
                         Text="配方名称：" />
                     <TextBox
-                        Width="120"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Grid.ColumnSpan="3"
                         Height="30"
+                        Margin="0,0,11,0"
                         FontSize="16"
+                        Foreground="DeepSkyBlue"
                         Text="{Binding RecipeName}" />
-                </StackPanel>
-                <WrapPanel
-                    Grid.Column="1"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center">
+
                     <TextBlock
-                        Width="100"
-                        Margin="2,0,10,0"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        HorizontalAlignment="Right"
                         Background="Transparent"
-                        FontSize="20"
-                        Foreground="#FF2AB2E7"
-                        Text="配方编码：" />
+                        FontSize="18"
+                        Foreground="DeepSkyBlue"
+                        Text="托盘编号：" />
                     <TextBox
-                        Width="120"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Width="100"
                         Height="30"
+                        HorizontalAlignment="Left"
                         FontSize="16"
-                        Text="{Binding RecipeCode}" />
-                </WrapPanel>
-            </Grid>
-            <Grid Grid.Row="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                </Grid.ColumnDefinitions>
-                <WrapPanel Grid.Column="0" VerticalAlignment="Center">
+                        Foreground="DeepSkyBlue"
+                        Text="{Binding TrayNum}" />
+
                     <TextBlock
-                        Width="100"
-                        Margin="10,0,10,0"
+                        Grid.Row="1"
+                        Grid.Column="2"
+                        HorizontalAlignment="Right"
                         Background="Transparent"
-                        FontSize="20"
-                        Foreground="#FF2AB2E7"
-                        Text="托盘编号：" />
+                        FontSize="18"
+                        Foreground="DeepSkyBlue"
+                        Text="配方编码：" />
                     <TextBox
-                        Width="120"
+                        Grid.Row="1"
+                        Grid.Column="3"
+                        Width="100"
                         Height="30"
+                        HorizontalAlignment="Left"
                         FontSize="16"
-                        Text="{Binding TrayNum}" />
-                </WrapPanel>
-                <WrapPanel
-                    Grid.Column="1"
-                    HorizontalAlignment="Left"
-                    Orientation="Horizontal">
+                        Foreground="DeepSkyBlue"
+                        Text="{Binding RecipeCode}" />
+
+                </Grid>
+
+                <Grid Grid.Column="1" Margin="5,0">
+                    <Grid.Background>
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹框/ch.png" />
+                    </Grid.Background>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+
+                    <Button
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Height="35"
+                        Margin="20,0"
+                        Command="{Binding SaveCommand}"
+                        Content="保存配方"
+                        FontSize="16"
+                        Style="{StaticResource ImageButtonStyle}" />
+
                     <Button
-                        Width="80"
-                        Height="40"
-                        Margin="2,0,2,0"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Height="35"
+                        Margin="20,0"
                         Command="{Binding AddCommand}"
                         Content="添加小料"
                         FontSize="16"
                         Style="{StaticResource ImageButtonStyle}" />
                     <Button
-                        Width="80"
-                        Height="40"
-                        Margin="2,0,2,0"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Height="35"
+                        Margin="20,0"
                         Command="{Binding AddFLCommand}"
                         Content="添加粉料"
                         FontSize="16"
                         Style="{StaticResource ImageButtonStyle}" />
-                    <Button
-                        Width="80"
-                        Height="40"
-                        Margin="2,0,2,0"
-                        Command="{Binding SaveCommand}"
-                        Content="保存配方"
-                        FontSize="16"
-                        Style="{StaticResource ImageButtonStyle}" />
-                    <Button
-                        Name="Close"
-                        Width="80"
-                        Height="40"
-                        Margin="2,0,2,0"
-                        Content="取消"
-                        FontSize="16"
-                        Style="{StaticResource ImageButtonStyle}" />
-                </WrapPanel>
-            </Grid>
 
+                </Grid>
+
+            </Grid>
+            <!--#endregion-->
 
-            <!--#region 表格标题栏设置-->
+            <!--#region 表格显示-->
             <Grid
                 Grid.Row="3"
-                Margin="0,10,0,0"
-                Background="#ff0C255F">
-
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                </Grid.ColumnDefinitions>
+                Grid.RowSpan="2"
+                Margin="5">
+                <Grid.Background>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹框/bh.png" Stretch="Fill" />
+                </Grid.Background>
+
+                <Grid Margin="15,35,15,10">
+
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="40" />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+
+                    <!--#region 表格标题栏设置-->
+                    <Grid
+                        Grid.Row="0"
+                        Margin="0,10,0,0"
+                        Background="#ff0C255F">
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*" />
+                            <ColumnDefinition Width="1*" />
+                            <ColumnDefinition Width="1*" />
+                            <ColumnDefinition Width="1*" />
+                            <ColumnDefinition Width="1*" />
+                            <ColumnDefinition Width="1*" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            FontSize="16"
+                            Text="原料名称" />
+
+                        <TextBlock
+                            Grid.Column="1"
+                            HorizontalAlignment="Center"
+                            FontSize="16"
+                            Text="原料类型" />
+
+                        <TextBlock
+                            Grid.Column="2"
+                            HorizontalAlignment="Center"
+                            FontSize="16"
+                            Text="原料位置" />
+
+                        <TextBlock
+                            Grid.Column="3"
+                            HorizontalAlignment="Center"
+                            FontSize="16"
+                            Text="原料桶号" />
+
+                        <TextBlock
+                            Grid.Column="4"
+                            HorizontalAlignment="Center"
+                            FontSize="16"
+                            Text="原料重量(kg)" />
+
+                        <TextBlock
+                            Grid.Column="5"
+                            HorizontalAlignment="Center"
+                            FontSize="16"
+                            Text="功能操作" />
+
+                        <Border
+                            Grid.ColumnSpan="6"
+                            BorderBrush="#8800bfff"
+                            BorderThickness="1" />
+                        <Border
+                            Grid.Column="1"
+                            BorderBrush="#8800bfff"
+                            BorderThickness="1,0,1,0" />
+                        <Border
+                            Grid.Column="3"
+                            BorderBrush="#8800bfff"
+                            BorderThickness="1,0,1,0" />
+                        <Border
+                            Grid.Column="5"
+                            BorderBrush="#8800bfff"
+                            BorderThickness="1,0,1,0" />
+                    </Grid>
+
+                    <!--  表格信息显示  -->
+                    <Grid Grid.Row="1">
+                        <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                            <ItemsControl ItemsSource="{Binding AllRawMaterial}">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid Name="gr">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition />
+                                                <ColumnDefinition />
+                                                <ColumnDefinition />
+                                                <ColumnDefinition />
+                                                <ColumnDefinition />
+                                                <ColumnDefinition />
+                                            </Grid.ColumnDefinitions>
+
+
+                                            <TextBlock
+                                                Margin="5,0,0,0"
+                                                FontFamily="楷体"
+                                                FontSize="18"
+                                                Foreground="DeepSkyBlue"
+                                                Text="{Binding RawMaterialName}" />
+
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                Margin="5,0,0,0"
+                                                FontFamily="楷体"
+                                                FontSize="18"
+                                                Foreground="DeepSkyBlue"
+                                                Text="{Binding RawMaterialType}" />
+
+                                            <TextBox
+                                                Grid.Column="2"
+                                                Style="{StaticResource tbStyle}"
+                                                Text="{Binding RawMaterialLocation}" />
+
+                                            <TextBox
+                                                Grid.Column="3"
+                                                Style="{StaticResource tbStyle}"
+                                                Text="{Binding RawMaterialBarrelNum}" />
+
+                                            <TextBox
+                                                Grid.Column="4"
+                                                Style="{StaticResource tbStyle}"
+                                                Text="{Binding RawMaterialWeight}" />
+
+                                            <Button
+                                                Grid.Column="5"
+                                                Height="25"
+                                                Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                                CommandParameter="{Binding RawMaterialLocation}"
+                                                Content="删除"
+                                                FontSize="16"
+                                                Style="{StaticResource ControlButtonStyle}" />
+
+                                            <!--<Button
+                                                Grid.Column="5"
+                                                Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                                CommandParameter="{Binding RawMaterialLocation}"
+                                                Content="删除"
+                                                FontSize="16" />-->
+
+                                            <Border
+                                                Grid.ColumnSpan="6"
+                                                BorderBrush="#8800bfff"
+                                                BorderThickness="1,0,1,1" />
+
+                                            <Border
+                                                Grid.Column="1"
+                                                BorderBrush="#8800bfff"
+                                                BorderThickness="1,0,1,0" />
+
+                                            <Border
+                                                Grid.Column="3"
+                                                BorderBrush="#8800bfff"
+                                                BorderThickness="1,0,1,0" />
+
+                                            <Border
+                                                Grid.Column="5"
+                                                BorderBrush="#8800bfff"
+                                                BorderThickness="1,0,1,0" />
+
+                                        </Grid>
+                                        <DataTemplate.Triggers>
+                                            <Trigger Property="IsMouseOver" Value="true">
+                                                <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                            </Trigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </ScrollViewer>
+                    </Grid>
 
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    FontSize="16"
-                    Text="原料名称" />
-
-                <TextBlock
-                    Grid.Column="1"
-                    HorizontalAlignment="Center"
-                    FontSize="16"
-                    Text="原料类型" />
-
-                <TextBlock
-                    Grid.Column="2"
-                    HorizontalAlignment="Center"
-                    FontSize="16"
-                    Text="原料位置" />
-
-                <TextBlock
-                    Grid.Column="3"
-                    HorizontalAlignment="Center"
-                    FontSize="16"
-                    Text="原料桶号" />
-
-                <TextBlock
-                    Grid.Column="4"
-                    HorizontalAlignment="Center"
-                    FontSize="16"
-                    Text="原料重量(kg)" />
-
-                <TextBlock
-                    Grid.Column="5"
-                    HorizontalAlignment="Center"
-                    FontSize="16"
-                    Text="功能操作" />
-
-                <Border
-                    Grid.ColumnSpan="6"
-                    BorderBrush="#8800bfff"
-                    BorderThickness="1" />
-                <Border
-                    Grid.Column="1"
-                    BorderBrush="#8800bfff"
-                    BorderThickness="1,0,1,0" />
-                <Border
-                    Grid.Column="3"
-                    BorderBrush="#8800bfff"
-                    BorderThickness="1,0,1,0" />
-                <Border
-                    Grid.Column="5"
-                    BorderBrush="#8800bfff"
-                    BorderThickness="1,0,1,0" />
-
-
-                <!--<Grid Grid.Column="0">
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        FontSize="16"
-                        Text="原料名称" />
-                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
-                </Grid>
-                <Grid Grid.Column="1">
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        FontSize="16"
-                        Text="原料类型" />
-                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
-                </Grid>
-                <TextBlock
-                    Grid.Column="2"
-                    HorizontalAlignment="Center"
-                    FontSize="16"
-                    Text="原料位置" />
-                <Grid Grid.Column="3">
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        FontSize="16"
-                        Text="原料桶号" />
-                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                 </Grid>
-                <TextBlock
-                    Grid.Column="4"
-                    HorizontalAlignment="Center"
-                    FontSize="16"
-                    Text="原料重量(kg)" />
-                <Grid Grid.Column="5">
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        FontSize="16"
-                        Text="功能操作" />
-                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
-                </Grid>
-                <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,0" />-->
-            </Grid>
-            <Grid Grid.Row="4">
-                <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
-                    <ItemsControl ItemsSource="{Binding AllRawMaterial}">
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <Grid Name="gr">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition />
-                                        <ColumnDefinition />
-                                        <ColumnDefinition />
-                                        <ColumnDefinition />
-                                        <ColumnDefinition />
-                                        <ColumnDefinition />
-                                    </Grid.ColumnDefinitions>
-
-
-                                    <TextBox Style="{StaticResource tbStyle}" Text="{Binding RawMaterialName}" />
-
-                                    <TextBox
-                                        Grid.Column="1"
-                                        Style="{StaticResource tbStyle}"
-                                        Text="{Binding RawMaterialType}" />
-
-                                    <TextBox
-                                        Grid.Column="2"
-                                        Style="{StaticResource tbStyle}"
-                                        Text="{Binding RawMaterialLocation}" />
-
-                                    <TextBox
-                                        Grid.Column="3"
-                                        Style="{StaticResource tbStyle}"
-                                        Text="{Binding RawMaterialBarrelNum}" />
-
-                                    <TextBox
-                                        Grid.Column="4"
-                                        Style="{StaticResource tbStyle}"
-                                        Text="{Binding RawMaterialWeight}" />
-
-                                    <Button
-                                        Grid.Column="5"
-                                        Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                        CommandParameter="{Binding RawMaterialLocation}"
-                                        Content="删除"
-                                        FontSize="16" />
-
-                                    <Border
-                                        Grid.ColumnSpan="6"
-                                        BorderBrush="#8800bfff"
-                                        BorderThickness="1,0,1,1" />
-
-                                    <Border
-                                        Grid.Column="1"
-                                        BorderBrush="#8800bfff"
-                                        BorderThickness="1,0,1,0" />
-
-                                    <Border
-                                        Grid.Column="3"
-                                        BorderBrush="#8800bfff"
-                                        BorderThickness="1,0,1,0" />
-
-                                    <Border
-                                        Grid.Column="5"
-                                        BorderBrush="#8800bfff"
-                                        BorderThickness="1,0,1,0" />
-
-                                    <!--<Grid Grid.Column="0">
-                                        <TextBox Text="{Binding RawMaterialName}" />
-                                        <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
-                                    </Grid>
-                                    <Grid Grid.Column="1">
-                                        <TextBox Text="{Binding RawMaterialType}" />
-                                        <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
-                                    </Grid>
-                                    <TextBox Grid.Column="2" Text="{Binding RawMaterialLocation}" />
-
-                                    <Grid Grid.Column="3">
-                                        <TextBox Text="{Binding RawMaterialBarrelNum}" />
-                                        <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
-                                    </Grid>
-
-                                    <TextBox Grid.Column="4" Text="{Binding RawMaterialWeight}" />
-
-                                    <Grid Grid.Column="5">
-                                        <Button
-                                            Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                            CommandParameter="{Binding RawMaterialLocation}"
-                                            Content="删除"
-                                            FontSize="16" />
-                                        <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
-                                    </Grid>
-
-                                    <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,1" />-->
-
-                                </Grid>
-                                <DataTemplate.Triggers>
-                                    <Trigger Property="IsMouseOver" Value="true">
-                                        <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
-                                    </Trigger>
-                                </DataTemplate.Triggers>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                </ScrollViewer>
+
             </Grid>
+            <!--#endregion-->
+
+
         </Grid>
     </Border>
 </Window>
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
index a1a8e8e6..e7ef7ead 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
@@ -19,7 +19,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
     {
         public NewLocalRecipeViewModel()
         {
-            ActionManage.GetInstance.CancelRegister("LocalRecipeEdit");
+            //ActionManage.GetInstance.CancelRegister("LocalRecipeEdit");
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
                 if (o != null && o is RemoteRecipeData rm)
@@ -29,11 +29,19 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     TrayNum = rm.TrayCode;
                     foreach (var item in rm.RawMaterial)
                     {
-                        AllRawMaterial.Add(item);
+                        AllRawMaterial.Add(new NewRemoteRecipeModel()
+                        {
+                            RawMaterialType = item.RawMaterialType,
+                            RawMaterialName = item.RawMaterialName,
+                            RawMaterialWeight = item.RawMaterialWeight,
+                            RawMaterialLocation = item.RawMaterialLocation,
+                            RawMaterialBarrelNum = item.RawMaterialBarrelNum,
+                        });
+                        //AllRawMaterial.Add(item);
                     }
                     foreach (var item1 in rm.WindSend)
                     {
-                        AllRawMaterial.Add(new RemoteRecipeRawMaterial()
+                        AllRawMaterial.Add(new NewRemoteRecipeModel()
                         {
                             RawMaterialType = item1.RawMaterialType,
                             RawMaterialName = item1.RawMaterialName,
@@ -43,7 +51,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                         });
                     }
                 }
-            }), "LocalRecipeEdit");
+            }), "LocalRecipeEdit", true);
             RemoveCommand = new RelayCommand<object>((o) =>
             {
                 var res = AllRawMaterial.FirstOrDefault(p => p.RawMaterialLocation == (int)o);
@@ -57,20 +65,20 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 var res = AllRawMaterial.Where(p => p.RawMaterialType == "小料").ToList();
                 if (res.Count < MaxRawMaterial)
                 {
-                    AllRawMaterial.Add(new RemoteRecipeRawMaterial()
+                    AllRawMaterial.Add(new NewRemoteRecipeModel()
                     {
                         RawMaterialType = "小料",
                         RawMaterialName = "小料" + (res.Count + 1),
                         RawMaterialLocation = res.Count + 1,
-                        RawMaterialBarrelNum = (short)new Random().Next(6,9),
-                        RawMaterialWeight = (float)(new Random().Next(100, 300)*0.001),
+                        RawMaterialBarrelNum = (short)new Random().Next(6, 9),
+                        RawMaterialWeight = (float)(new Random().Next(100, 300) * 0.001),
                     });
                 }
                 else
                 {
                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"原料最多添加{MaxRawMaterial}种");
                 }
-                
+
             });
             AddFLCommand = new RelayCommand(() =>
             {
@@ -78,7 +86,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 var res = AllRawMaterial.Where(p => p.RawMaterialType == "粉料").ToList();
                 if (res.Count < MaxRawMaterial)
                 {
-                    AllRawMaterial.Add(new RemoteRecipeRawMaterial()
+                    AllRawMaterial.Add(new NewRemoteRecipeModel()
                     {
                         RawMaterialType = "粉料",
                         RawMaterialName = "粉料" + (res.Count + 1),
@@ -94,7 +102,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             });
             SaveCommand = new RelayCommand(() =>
             {
-                if (RecipeName.Length < 0 || RecipeName == null|| RecipeName==String.Empty || RecipeName == "") 
+                if (RecipeName.Length < 0 || RecipeName == null || RecipeName == String.Empty || RecipeName == "")
                 {
                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"配方名称不能为空");
                     return;
@@ -104,7 +112,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"配方编号不能为空");
                     return;
                 }
-                if (TrayNum != 1 && TrayNum!=2) 
+                if (TrayNum != 1 && TrayNum != 2)
                 {
                     TrayNum = 1;
                 }
@@ -156,19 +164,19 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                                 RawMaterialName = item.RawMaterialName,
                                 RawMaterialWeight = item.RawMaterialWeight,
                                 Location = item.RawMaterialLocation,
-                                RawMaterialType =item.RawMaterialType,
-                                RawMaterialBarrelNum=item.RawMaterialBarrelNum,
+                                RawMaterialType = item.RawMaterialType,
+                                RawMaterialBarrelNum = item.RawMaterialBarrelNum,
                             });
                         }
                     }
-                    Json<LocalRecipeDataColl>.Data.Recipes.ElementAt(index).RecipeName= RecipeName;
+                    Json<LocalRecipeDataColl>.Data.Recipes.ElementAt(index).RecipeName = RecipeName;
                     Json<LocalRecipeDataColl>.Data.Recipes.ElementAt(index).TrayCode = TrayNum;
                     Json<LocalRecipeDataColl>.Data.Recipes.ElementAt(index).RecipeCode = RecipeCode;
                     Json<LocalRecipeDataColl>.Data.Recipes.ElementAt(index).RawMaterial = RawMaterials;
                     Json<LocalRecipeDataColl>.Data.Recipes.ElementAt(index).WindSend = WindSendRawMaterials;
                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"修改配方完成!");
                 }
-                else 
+                else
                 {
                     foreach (var item in AllRawMaterial)
                     {
@@ -220,7 +228,10 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
         private string _mErrorInfo;
 
-        public ObservableCollection<RemoteRecipeRawMaterial> AllRawMaterial { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>();
+        //public ObservableCollection<RemoteRecipeRawMaterial> AllRawMaterial { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>();
+        public ObservableCollection<NewRemoteRecipeModel> AllRawMaterial { get; set; } = new ObservableCollection<NewRemoteRecipeModel>();
+
+
 
         public RelayCommand<object> RemoveCommand { get; set; }
 

From a1c3bd29e9f123722222afd0ec52e61aaed3887c Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Tue, 30 May 2023 18:47:09 +0800
Subject: [PATCH 76/96] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9D=A1=E7=9B=AE=E6=9F=A5=E6=89=BE=E7=94=B1=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=8E=9F=E6=96=99=E4=BD=8D=E7=BD=AE=E6=9F=A5=E6=89=BE=E5=8F=98?=
 =?UTF-8?q?=E4=B8=BA=E6=A0=B9=E6=8D=AE=E5=8E=9F=E6=96=99=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=9F=A5=E6=89=BE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml | 2 +-
 .../ViewModel/NewLocalRecipeViewModel.cs                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
index 3bcbb335..d66b1d55 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
@@ -358,7 +358,7 @@
                                                 Grid.Column="5"
                                                 Height="25"
                                                 Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                                CommandParameter="{Binding RawMaterialLocation}"
+                                                CommandParameter="{Binding RawMaterialName}"
                                                 Content="删除"
                                                 FontSize="16"
                                                 Style="{StaticResource ControlButtonStyle}" />
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
index e7ef7ead..f29ec619 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
@@ -54,7 +54,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             }), "LocalRecipeEdit", true);
             RemoveCommand = new RelayCommand<object>((o) =>
             {
-                var res = AllRawMaterial.FirstOrDefault(p => p.RawMaterialLocation == (int)o);
+                var res = AllRawMaterial.FirstOrDefault(p => p.RawMaterialName == o.ToString());
                 if (res != null) AllRawMaterial.Remove(res);
                 //NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{o.ToString()}：原料删除成功!");
             });

From fd75af861505c73d5a20b93dc421309eb228ecc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Tue, 30 May 2023 21:55:50 +0800
Subject: [PATCH 77/96] =?UTF-8?q?=E9=85=8D=E6=96=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/Siemens/NewRemoteRecipeModel.cs     | 121 ++++++++++--------
 .../View/NewLocalRecipeView.xaml              |  27 ++--
 .../View/NewLocalRecipeView.xaml.cs           |   6 +-
 .../ViewModel/NewLocalRecipeViewModel.cs      | 102 +++++++++++++--
 .../ViewModel/RecipeReceiveViewModel.cs       |  30 ++---
 5 files changed, 187 insertions(+), 99 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/NewRemoteRecipeModel.cs b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/NewRemoteRecipeModel.cs
index 041e009a..568471d7 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/NewRemoteRecipeModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/NewRemoteRecipeModel.cs
@@ -1,61 +1,74 @@
-using BPA.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+//using BPA.Helper;
+//using Microsoft.Toolkit.Mvvm.ComponentModel;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
 
-namespace BPASmartClient.JXJFoodSmallStation.Model
-{
-    public class NewRemoteRecipeModel : ObservableObject
-    {
-        /// <summary>
-        /// 原料名称
-        /// </summary>
-        public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } }
-        private string _mRawMaterialName;
+//namespace BPASmartClient.JXJFoodSmallStation.Model
+//{
+//    public class NewRemoteRecipeModel : ObservableObject
+//    {
+//        /// <summary>
+//        /// 原料名称
+//        /// </summary>
+//        public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } }
+//        private string _mRawMaterialName;
 
-        /// <summary>
-        /// 原料对应的桶号
-        /// </summary>
-        public short RawMaterialBarrelNum { get { return _mRawMaterialBarrelNum; } set { _mRawMaterialBarrelNum = value; OnPropertyChanged(); } }
-        private short _mRawMaterialBarrelNum;
+//        /// <summary>
+//        /// 原料对应的桶号
+//        /// </summary>
+//        public short RawMaterialBarrelNum { get { return _mRawMaterialBarrelNum; } set { _mRawMaterialBarrelNum = value; OnPropertyChanged(); } }
+//        private short _mRawMaterialBarrelNum;
 
-        /// <summary>
-        /// 原料类型
-        /// </summary>
-        public string RawMaterialType { get { return _mRawMaterialType; } set { _mRawMaterialType = value; OnPropertyChanged(); } }
-        private string _mRawMaterialType;
+//        /// <summary>
+//        /// 原料类型
+//        /// </summary>
+//        public string RawMaterialType { get { return _mRawMaterialType; } set { _mRawMaterialType = value; OnPropertyChanged(); } }
+//        private string _mRawMaterialType;
 
-        /// <summary>
-        /// 需要原料重量
-        /// </summary>
-        public float RawMaterialWeight { get { return _mRawMaterialWeight; } set { _mRawMaterialWeight = value; OnPropertyChanged(); } }
-        private float _mRawMaterialWeight;
+//        /// <summary>
+//        /// 需要原料重量
+//        /// </summary>
+//        public float RawMaterialWeight { get { return _mRawMaterialWeight; } set { _mRawMaterialWeight = value; OnPropertyChanged(); } }
+//        private float _mRawMaterialWeight;
 
-        /// <summary>
-        /// 原料对应料仓的位置
-        /// </summary>
-        public int RawMaterialLocation
-        {
-            get { return _mRawMaterialLocation; }
-            set
-            {
-                _mRawMaterialLocation = value;
-                if (RawMaterialType == "小料")
-                {
-                    //Json<DevicePar>.Data.BomMaterial
-                }
-                else if (RawMaterialType == "粉料")
-                {
+//        /// <summary>
+//        /// 原料对应料仓的位置
+//        /// </summary>
+//        public int RawMaterialLocation
+//        {
+//            get { return _mRawMaterialLocation; }
+//            set
+//            {
+//                _mRawMaterialLocation = value;
+//                //if (RawMaterialType == "小料")
+//                //{
+//                //    var res = Json<DevicePar>.Data.rawMaterialStockBin.FirstOrDefault(p => p.RawMaterialLocation == value);
+//                //    if (res != null && !string.IsNullOrEmpty(res.RawMaterialName))
+//                //    {
+//                //        var temp = Json<DevicePar>.Data.BomMaterial.FirstOrDefault(p => p.MaterialCode == res.RawMaterialName);
+//                //        if (temp != null && !string.IsNullOrEmpty(temp.MaterialName))
+//                //        {
+//                //            RawMaterialName = temp.MaterialName;
+//                //        }
+//                //    }
+//                //}
+//                //else if (RawMaterialType == "粉料")
+//                //{
+//                //    var res = Json<DevicePar>.Data.windSendRawMaterial.FirstOrDefault(p => p.Location == value);
+//                //    if (res != null)
+//                //    {
+//                //        RawMaterialName = res.RawMaterialName;
+//                //    }
+//                //}
+//                ActionManage.GetInstance.Send("ChangeNotify", this);
+//                OnPropertyChanged();
+//            }
+//        }
+//        private int _mRawMaterialLocation;
 
-                }
-                OnPropertyChanged();
-            }
-        }
-        private int _mRawMaterialLocation;
 
-
-    }
-}
+//    }
+//}
diff --git a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
index 3bcbb335..425e7e73 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
@@ -246,12 +246,12 @@
                         Background="#ff0C255F">
 
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="1*" />
+                            <ColumnDefinition  />
+                            <ColumnDefinition Width="0.4*" />
+                            <ColumnDefinition Width="0.4*" />
+                            <ColumnDefinition Width="0.4*" />
+                            <ColumnDefinition Width="0.4*" />
+                            <ColumnDefinition Width="0.4*" />
                         </Grid.ColumnDefinitions>
 
                         <TextBlock
@@ -281,7 +281,7 @@
                             Grid.Column="4"
                             HorizontalAlignment="Center"
                             FontSize="16"
-                            Text="原料重量(kg)" />
+                            Text="重量(kg)" />
 
                         <TextBlock
                             Grid.Column="5"
@@ -315,15 +315,14 @@
                                     <DataTemplate>
                                         <Grid Name="gr">
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition />
-                                                <ColumnDefinition />
-                                                <ColumnDefinition />
-                                                <ColumnDefinition />
-                                                <ColumnDefinition />
-                                                <ColumnDefinition />
+                                                <ColumnDefinition  />
+                                                <ColumnDefinition Width="0.4*" />
+                                                <ColumnDefinition Width="0.4*" />
+                                                <ColumnDefinition Width="0.4*" />
+                                                <ColumnDefinition Width="0.4*" />
+                                                <ColumnDefinition Width="0.4*" />
                                             </Grid.ColumnDefinitions>
 
-
                                             <TextBlock
                                                 Margin="5,0,0,0"
                                                 FontFamily="楷体"
diff --git a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml.cs
index 53b6b11f..cfb6b902 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml.cs
@@ -26,10 +26,10 @@ namespace BPASmartClient.JXJFoodSmallStation.View
             InitializeComponent();
             this.Close.Click += (o, e) => { this.Close(); };
             this.br.MouseLeftButtonDown += (o, e) => { if (e.LeftButton == MouseButtonState.Pressed) this.DragMove(); };
-            ActionManage.GetInstance.CancelRegister("CloseNewRemoteRecipeView");
-            ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "CloseNewRemoteRecipeView");
+            //ActionManage.GetInstance.CancelRegister("CloseNewRemoteRecipeView");
+            ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "CloseNewRemoteRecipeView", true);
         }
 
-     
+
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
index e7ef7ead..6536e92c 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
@@ -12,6 +12,8 @@ using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.CustomResource.UserControls;
 using System.Diagnostics;
 using BPASmartClient.JXJFoodSmallStation.Model.Siemens;
+using Google.Protobuf.WellKnownTypes;
+using Newtonsoft.Json.Linq;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -20,6 +22,39 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public NewLocalRecipeViewModel()
         {
             //ActionManage.GetInstance.CancelRegister("LocalRecipeEdit");
+
+            //ActionManage.GetInstance.Register(new Action<object>((o) =>
+            //{
+            //    if (o is NewRemoteRecipeModel nrr)
+            //    {
+            //        var res1 = AllRawMaterial.FirstOrDefault(p => p.Equals(nrr));
+            //        if (res1 != null)
+            //        {
+            //            if (res1.RawMaterialType == "小料")
+            //            {
+            //                var res = Json<DevicePar>.Data.rawMaterialStockBin.FirstOrDefault(p => p.RawMaterialLocation == res1.RawMaterialLocation);
+            //                if (res != null && !string.IsNullOrEmpty(res.RawMaterialName))
+            //                {
+            //                    var temp = Json<DevicePar>.Data.BomMaterial.FirstOrDefault(p => p.MaterialCode == res.RawMaterialName);
+            //                    if (temp != null && !string.IsNullOrEmpty(temp.MaterialName))
+            //                    {
+            //                        res1.RawMaterialName = temp.MaterialName;
+            //                    }
+            //                }
+            //            }
+            //            else if (res1.RawMaterialType == "粉料")
+            //            {
+            //                var res = Json<DevicePar>.Data.windSendRawMaterial.FirstOrDefault(p => p.Location == res1.RawMaterialLocation);
+            //                if (res != null)
+            //                {
+            //                    res1.RawMaterialName = res.RawMaterialName;
+            //                }
+            //            }
+            //        }
+            //    }
+
+            //}), "ChangeNotify", true);
+
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
                 if (o != null && o is RemoteRecipeData rm)
@@ -29,19 +64,58 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     TrayNum = rm.TrayCode;
                     foreach (var item in rm.RawMaterial)
                     {
-                        AllRawMaterial.Add(new NewRemoteRecipeModel()
+                        //AllRawMaterial.Add(new RemoteRecipeRawMaterial()
+                        //{
+                        //    RawMaterialType = item.RawMaterialType,
+                        //    RawMaterialName = item.RawMaterialName,
+                        //    RawMaterialWeight = item.RawMaterialWeight,
+                        //    RawMaterialLocation = item.RawMaterialLocation,
+                        //    RawMaterialBarrelNum = item.RawMaterialBarrelNum,
+                        //});
+
+                        var res = Json<DevicePar>.Data.rawMaterialStockBin.FirstOrDefault(p => p.RawMaterialLocation == item.RawMaterialLocation);
+                        if (res != null && !string.IsNullOrEmpty(res.RawMaterialName))
                         {
-                            RawMaterialType = item.RawMaterialType,
-                            RawMaterialName = item.RawMaterialName,
-                            RawMaterialWeight = item.RawMaterialWeight,
-                            RawMaterialLocation = item.RawMaterialLocation,
-                            RawMaterialBarrelNum = item.RawMaterialBarrelNum,
-                        });
-                        //AllRawMaterial.Add(item);
+                            var temp = Json<DevicePar>.Data.BomMaterial.FirstOrDefault(p => p.MaterialCode == res.RawMaterialName);
+                            if (temp != null && !string.IsNullOrEmpty(temp.MaterialName))
+                            {
+                                item.RawMaterialName = temp.MaterialName;
+                            }
+                        }
+                        //if (item.RawMaterialType == "小料")
+                        //{
+                        //    var res = Json<DevicePar>.Data.rawMaterialStockBin.FirstOrDefault(p => p.RawMaterialLocation == item.RawMaterialLocation);
+                        //    if (res != null && !string.IsNullOrEmpty(res.RawMaterialName))
+                        //    {
+                        //        var temp = Json<DevicePar>.Data.BomMaterial.FirstOrDefault(p => p.MaterialCode == res.RawMaterialName);
+                        //        if (temp != null && !string.IsNullOrEmpty(temp.MaterialName))
+                        //        {
+                        //            item.RawMaterialName = temp.MaterialName;
+                        //        }
+                        //    }
+                        //}
+                        //else if (item.RawMaterialType == "粉料")
+                        //{
+                        //    var res = Json<DevicePar>.Data.windSendRawMaterial.FirstOrDefault(p => p.Location == item.RawMaterialLocation);
+                        //    if (res != null)
+                        //    {
+                        //        item.RawMaterialName = res.RawMaterialName;
+                        //    }
+                        //}
+
+
+                        AllRawMaterial.Add(item);
                     }
                     foreach (var item1 in rm.WindSend)
                     {
-                        AllRawMaterial.Add(new NewRemoteRecipeModel()
+
+                        var res = Json<DevicePar>.Data.windSendRawMaterial.FirstOrDefault(p => p.Location == item1.Location);
+                        if (res != null)
+                        {
+                            item1.RawMaterialName = res.RawMaterialName;
+                        }
+
+                        AllRawMaterial.Add(new RemoteRecipeRawMaterial()
                         {
                             RawMaterialType = item1.RawMaterialType,
                             RawMaterialName = item1.RawMaterialName,
@@ -52,6 +126,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     }
                 }
             }), "LocalRecipeEdit", true);
+
+
             RemoveCommand = new RelayCommand<object>((o) =>
             {
                 var res = AllRawMaterial.FirstOrDefault(p => p.RawMaterialLocation == (int)o);
@@ -65,7 +141,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 var res = AllRawMaterial.Where(p => p.RawMaterialType == "小料").ToList();
                 if (res.Count < MaxRawMaterial)
                 {
-                    AllRawMaterial.Add(new NewRemoteRecipeModel()
+                    AllRawMaterial.Add(new RemoteRecipeRawMaterial()
                     {
                         RawMaterialType = "小料",
                         RawMaterialName = "小料" + (res.Count + 1),
@@ -86,7 +162,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 var res = AllRawMaterial.Where(p => p.RawMaterialType == "粉料").ToList();
                 if (res.Count < MaxRawMaterial)
                 {
-                    AllRawMaterial.Add(new NewRemoteRecipeModel()
+                    AllRawMaterial.Add(new RemoteRecipeRawMaterial()
                     {
                         RawMaterialType = "粉料",
                         RawMaterialName = "粉料" + (res.Count + 1),
@@ -228,8 +304,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
         private string _mErrorInfo;
 
-        //public ObservableCollection<RemoteRecipeRawMaterial> AllRawMaterial { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>();
-        public ObservableCollection<NewRemoteRecipeModel> AllRawMaterial { get; set; } = new ObservableCollection<NewRemoteRecipeModel>();
+        public ObservableCollection<RemoteRecipeRawMaterial> AllRawMaterial { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>();
+        //public ObservableCollection<NewRemoteRecipeModel> AllRawMaterial { get; set; } = new ObservableCollection<NewRemoteRecipeModel>();
 
 
 
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
index 04c7f34e..58f497a6 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
@@ -31,7 +31,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             IsUseLocalRecipe = GVL_SmallStation.GetInstance.IsUseLocalRecipe;
             IsUseWindSendDosing = GVL_SmallStation.GetInstance.IsUseWindSend;
             Recipes = Json<LocalRecipeDataColl>.Data.Recipes;
-            
+
             NewRecipe = new RelayCommand(() =>
             {
                 NewLocalRecipeView NewLocalRecipe = new NewLocalRecipeView();
@@ -53,13 +53,13 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             {
                 if (o != null && o is string cnt)
                 {
-                    ActionManage.GetInstance.Send("CloseNewRemoteRecipeView");
+                    //ActionManage.GetInstance.Send("CloseNewRemoteRecipeView");
                     NewLocalRecipeView nrv = new NewLocalRecipeView();
                     var res = Json<LocalRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
                     if (res != null)
                     {
                         ActionManage.GetInstance.Send("LocalRecipeEdit", res);
-                        nrv.Show();
+                        nrv.ShowDialog();
                         MessageNotify.GetInstance.ShowUserLog($"编辑配方——{res.RecipeName}");
                     }
                 }
@@ -77,12 +77,12 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     {
                         var res = Json<LocalRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
                         var res1 = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
-                        if (res1 != null) 
+                        if (res1 != null)
                         {
                             NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"远程已经存在该配方!");
                             return;
                         }
-                        if (res != null && res1 ==null)
+                        if (res != null && res1 == null)
                         {
                             ActionManage.GetInstance.Send("LocalSimulationRecipeIssue", res);
                             NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{res.RecipeName}配方下发成功!");
@@ -93,7 +93,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             });
             NewSimulateRecipe = new RelayCommand(() =>
             {
-                ObservableCollection<RemoteRecipeRawMaterial> RawMaterials  = new ObservableCollection<RemoteRecipeRawMaterial>();
+                ObservableCollection<RemoteRecipeRawMaterial> RawMaterials = new ObservableCollection<RemoteRecipeRawMaterial>();
                 string recipeName = "配方" + (Json<LocalRecipeDataColl>.Data.Recipes.Count + 1) + "";
             go:
                 string recipeCode = new Random().Next(1000, 9999).ToString();
@@ -110,8 +110,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     RawMaterials.Add(new RemoteRecipeRawMaterial()
                     {
                         RawMaterialName = "原料" + i,
-                        RawMaterialType = "小料", 
-                        RawMaterialWeight = (float)Math.Round(new Random().Next(200, 300) * 0.001 ,3),
+                        RawMaterialType = "小料",
+                        RawMaterialWeight = (float)Math.Round(new Random().Next(200, 300) * 0.001, 3),
                         RawMaterialBarrelNum = (short)new Random().Next(6, 9),
                         RawMaterialLocation = i,
                     });
@@ -126,7 +126,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                             RawMaterialType = "粉料",
                             RawMaterialWeight = new Random().Next(1, 6),
                             RawMaterialLocation = i,
-                            RawMaterialBarrelNum = 3 
+                            RawMaterialBarrelNum = 3
                         });
                     }
                 }
@@ -143,7 +143,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 }
 
             });
-            ClearAllRecipe = new RelayCommand(() =>  
+            ClearAllRecipe = new RelayCommand(() =>
             {
                 Json<LocalRecipeDataColl>.Data.Recipes.Clear();
             });
@@ -152,16 +152,16 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public bool NotUseSmallDosing { get { return _mNotUseSmallDosing; } set { _mNotUseSmallDosing = value; OnPropertyChanged(); } }
         private bool _mNotUseSmallDosing;
 
-        public bool IsUseLocalRecipe { get { return _mIsUseLocalRecipe; }set { _mIsUseLocalRecipe = value; OnPropertyChanged(); } }
-        private bool _mIsUseLocalRecipe ;
+        public bool IsUseLocalRecipe { get { return _mIsUseLocalRecipe; } set { _mIsUseLocalRecipe = value; OnPropertyChanged(); } }
+        private bool _mIsUseLocalRecipe;
 
-        public bool IsUseWindSendDosing { get { return _mIsUseWindSendDosing; } set { _mIsUseWindSendDosing = value;OnPropertyChanged(); } }
-        private bool _mIsUseWindSendDosing ;
+        public bool IsUseWindSendDosing { get { return _mIsUseWindSendDosing; } set { _mIsUseWindSendDosing = value; OnPropertyChanged(); } }
+        private bool _mIsUseWindSendDosing;
 
         public RelayCommand<object> DetailsCommand { get; set; }
         public RelayCommand<object> IssueRecipe { get; set; }
         public RelayCommand<object> RemoveRecipe { get; set; }
-        public RelayCommand NewSimulateRecipe { get;set; }
+        public RelayCommand NewSimulateRecipe { get; set; }
         public RelayCommand ClearAllRecipe { get; set; }
         public RelayCommand NewRecipe { get; set; }
         public ObservableCollection<RemoteRecipeData> Recipes { get; set; }

From 4aae58c745c22166e60aa6a4b883bd1478386765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Wed, 31 May 2023 20:34:48 +0800
Subject: [PATCH 78/96] =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModel/NewLocalRecipeViewModel.cs      | 63 -------------------
 1 file changed, 63 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
index 6536e92c..939a5a9e 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
@@ -23,38 +23,6 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         {
             //ActionManage.GetInstance.CancelRegister("LocalRecipeEdit");
 
-            //ActionManage.GetInstance.Register(new Action<object>((o) =>
-            //{
-            //    if (o is NewRemoteRecipeModel nrr)
-            //    {
-            //        var res1 = AllRawMaterial.FirstOrDefault(p => p.Equals(nrr));
-            //        if (res1 != null)
-            //        {
-            //            if (res1.RawMaterialType == "小料")
-            //            {
-            //                var res = Json<DevicePar>.Data.rawMaterialStockBin.FirstOrDefault(p => p.RawMaterialLocation == res1.RawMaterialLocation);
-            //                if (res != null && !string.IsNullOrEmpty(res.RawMaterialName))
-            //                {
-            //                    var temp = Json<DevicePar>.Data.BomMaterial.FirstOrDefault(p => p.MaterialCode == res.RawMaterialName);
-            //                    if (temp != null && !string.IsNullOrEmpty(temp.MaterialName))
-            //                    {
-            //                        res1.RawMaterialName = temp.MaterialName;
-            //                    }
-            //                }
-            //            }
-            //            else if (res1.RawMaterialType == "粉料")
-            //            {
-            //                var res = Json<DevicePar>.Data.windSendRawMaterial.FirstOrDefault(p => p.Location == res1.RawMaterialLocation);
-            //                if (res != null)
-            //                {
-            //                    res1.RawMaterialName = res.RawMaterialName;
-            //                }
-            //            }
-            //        }
-            //    }
-
-            //}), "ChangeNotify", true);
-
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
                 if (o != null && o is RemoteRecipeData rm)
@@ -64,15 +32,6 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     TrayNum = rm.TrayCode;
                     foreach (var item in rm.RawMaterial)
                     {
-                        //AllRawMaterial.Add(new RemoteRecipeRawMaterial()
-                        //{
-                        //    RawMaterialType = item.RawMaterialType,
-                        //    RawMaterialName = item.RawMaterialName,
-                        //    RawMaterialWeight = item.RawMaterialWeight,
-                        //    RawMaterialLocation = item.RawMaterialLocation,
-                        //    RawMaterialBarrelNum = item.RawMaterialBarrelNum,
-                        //});
-
                         var res = Json<DevicePar>.Data.rawMaterialStockBin.FirstOrDefault(p => p.RawMaterialLocation == item.RawMaterialLocation);
                         if (res != null && !string.IsNullOrEmpty(res.RawMaterialName))
                         {
@@ -82,28 +41,6 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                                 item.RawMaterialName = temp.MaterialName;
                             }
                         }
-                        //if (item.RawMaterialType == "小料")
-                        //{
-                        //    var res = Json<DevicePar>.Data.rawMaterialStockBin.FirstOrDefault(p => p.RawMaterialLocation == item.RawMaterialLocation);
-                        //    if (res != null && !string.IsNullOrEmpty(res.RawMaterialName))
-                        //    {
-                        //        var temp = Json<DevicePar>.Data.BomMaterial.FirstOrDefault(p => p.MaterialCode == res.RawMaterialName);
-                        //        if (temp != null && !string.IsNullOrEmpty(temp.MaterialName))
-                        //        {
-                        //            item.RawMaterialName = temp.MaterialName;
-                        //        }
-                        //    }
-                        //}
-                        //else if (item.RawMaterialType == "粉料")
-                        //{
-                        //    var res = Json<DevicePar>.Data.windSendRawMaterial.FirstOrDefault(p => p.Location == item.RawMaterialLocation);
-                        //    if (res != null)
-                        //    {
-                        //        item.RawMaterialName = res.RawMaterialName;
-                        //    }
-                        //}
-
-
                         AllRawMaterial.Add(item);
                     }
                     foreach (var item1 in rm.WindSend)

From 8b7a380c4d51976cae6352a5d57075b57bb88582 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Thu, 1 Jun 2023 11:24:29 +0800
Subject: [PATCH 79/96] =?UTF-8?q?1.=20=E5=AF=B9=E4=BA=8E=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E8=AE=A2=E5=8D=95=E7=BC=96=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E4=B8=8B=E5=8F=91=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=8C=E6=AC=A1=E7=A1=AE=E8=AE=A4=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E6=A1=86=E3=80=82=202.=20=E6=B7=BB=E5=8A=A0=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/ManualFlowView.xaml                  | 22 +++++++++
 .../ViewModel/ManualFlowViewModel.cs          | 23 +++++++++
 .../ViewModel/RecipeReceiveViewModel.cs       | 49 +++++++++++--------
 .../SiemensRecipeReceiveViewModel.cs          |  6 ++-
 4 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
index 9fcc8066..e0a63ea4 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
@@ -108,6 +108,28 @@
                     Content="PLC配方清零"
                     FontSize="20"
                     Style="{StaticResource ImageButtonStyle}" />
+                <WrapPanel Margin="400,0">
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="订单号：" />
+                    <TextBox
+                        Width="300"
+                        Margin="5"
+                        VerticalAlignment="Center"
+                        FontSize="24"
+                        Text="{Binding CancelRecipeCode}" />
+                    <Button
+                        Width="120"
+                        Height="40"
+                        Margin="5"
+                        Command="{Binding CancelRecipeCommand}"
+                        Content="取消订单"
+                        FontSize="20"
+                        Style="{StaticResource ImageButtonStyle}" />
+                </WrapPanel>
             </StackPanel>
 
 
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
index b429ef1a..9f7b4425 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
@@ -147,6 +147,24 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 //MessageNotify.GetInstance.ShowUserLog($"手动点击按钮，清除所有手动配料完成信号");
                 //NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"清除所有手动配料完成信号");
             });
+            CancelRecipeCommand = new RelayCommand(() => {
+                string cancelRecipeCode = CancelRecipeCode.Trim();
+                if (!String.IsNullOrEmpty(cancelRecipeCode) &&MessageNotify.GetInstance.ShowDialog($"请确认，是否进行删除订单【{cancelRecipeCode}】操作？")) {
+                    if (Json<RemoteRecipeDataColl>.Data.Recipes != null) {
+                        int index = Array.FindIndex(Json<RemoteRecipeDataColl>.Data.Recipes.ToArray(), p => p.RecipeCode == cancelRecipeCode);
+                        if (index >= 0) {
+                            GVL_SmallStation.GetInstance.Order_Cancel = true;
+                            GVL_SmallStation.GetInstance.Order_CancelRecipeCode = cancelRecipeCode;
+                            MessageNotify.GetInstance.ShowUserLog($"手动删除订单【{cancelRecipeCode}】。");
+                            NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"删除订单【{cancelRecipeCode}】成功！");
+                            return;
+                        }
+                        NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "提示", $"删除订单【{cancelRecipeCode}】失败，未找到该订单。");
+
+                    }
+                }
+                
+            });
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
                 RecipeDosingCompleNum = GVL_SmallStation.GetInstance.RecipeDosingCompleNum;
@@ -323,6 +341,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 
         public RelayCommand StockbinDosingComple { get; set; }
         public RelayCommand StockbinDosingCompleClear { get; set; }
+        public RelayCommand CancelRecipeCommand { get; set; }
         private static int _StockbinDosingCompleNum { get; set; }
         public static int StockbinDosingCompleNum { get { return _StockbinDosingCompleNum; } set { _StockbinDosingCompleNum = value; OnStaticPropertyChanged(); } }
 
@@ -335,6 +354,10 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public static Visibility VisibilityBtn2 { get { return _VisibilityBtn2; } set { _VisibilityBtn2 = value; OnStaticPropertyChanged(); } }
         private static Visibility _VisibilityBtn2 = Visibility.Hidden;
         public static Visibility VisibilityBtn3 { get { return _VisibilityBtn3; } set { _VisibilityBtn3 = value; OnStaticPropertyChanged(); } }
+
+        public string CancelRecipeCode { get { return _CancelRecipeCode; } set { _CancelRecipeCode = value; OnPropertyChanged(); } }
+        public string _CancelRecipeCode { get; set; }
+
         private static Visibility _VisibilityBtn3 = Visibility.Hidden;
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
index 58f497a6..0663f2f8 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
@@ -41,11 +41,14 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             {
                 if (o != null && o is string cnt)
                 {
-                    var res = Json<LocalRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
-                    if (res != null)
+                    if (MessageNotify.GetInstance.ShowDialog($"请确认，是否删除订单【{cnt}】？"))
                     {
-                        Json<LocalRecipeDataColl>.Data.Recipes.Remove(res);
-                        MessageNotify.GetInstance.ShowUserLog($"删除配方——{res.RecipeName}");
+                        var res = Json<LocalRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
+                        if (res != null)
+                        {
+                            Json<LocalRecipeDataColl>.Data.Recipes.Remove(res);
+                            MessageNotify.GetInstance.ShowUserLog($"删除配方——{res.RecipeName}");
+                        }
                     }
                 }
             });
@@ -53,14 +56,17 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             {
                 if (o != null && o is string cnt)
                 {
-                    //ActionManage.GetInstance.Send("CloseNewRemoteRecipeView");
-                    NewLocalRecipeView nrv = new NewLocalRecipeView();
-                    var res = Json<LocalRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
-                    if (res != null)
+                    if (MessageNotify.GetInstance.ShowDialog($"请确认，是否进行编辑订单【{cnt}】操作？"))
                     {
-                        ActionManage.GetInstance.Send("LocalRecipeEdit", res);
-                        nrv.ShowDialog();
-                        MessageNotify.GetInstance.ShowUserLog($"编辑配方——{res.RecipeName}");
+                        //ActionManage.GetInstance.Send("CloseNewRemoteRecipeView");
+                        NewLocalRecipeView nrv = new NewLocalRecipeView();
+                        var res = Json<LocalRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
+                        if (res != null)
+                        {
+                            ActionManage.GetInstance.Send("LocalRecipeEdit", res);
+                            nrv.ShowDialog();
+                            MessageNotify.GetInstance.ShowUserLog($"编辑配方——{res.RecipeName}");
+                        }
                     }
                 }
             });
@@ -77,16 +83,19 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     {
                         var res = Json<LocalRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
                         var res1 = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
-                        if (res1 != null)
-                        {
-                            NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"远程已经存在该配方!");
-                            return;
-                        }
-                        if (res != null && res1 == null)
+                        if (MessageNotify.GetInstance.ShowDialog($"请确认，是否进行下发订单【{cnt}】操作？"))
                         {
-                            ActionManage.GetInstance.Send("LocalSimulationRecipeIssue", res);
-                            NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{res.RecipeName}配方下发成功!");
-                            MessageNotify.GetInstance.ShowUserLog($"下发本地模拟配方——{res.RecipeName}");
+                            if (res1 != null)
+                            {
+                                NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"远程已经存在该配方!");
+                                return;
+                            }
+                            if (res != null && res1 == null)
+                            {
+                                ActionManage.GetInstance.Send("LocalSimulationRecipeIssue", res);
+                                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{res.RecipeName}配方下发成功!");
+                                MessageNotify.GetInstance.ShowUserLog($"下发本地模拟配方——{res.RecipeName}");
+                            }
                         }
                     }
                 }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/SiemensRecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/SiemensRecipeReceiveViewModel.cs
index a6b30e26..f2eaae4a 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/SiemensRecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/SiemensRecipeReceiveViewModel.cs
@@ -46,7 +46,11 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             });
             ClearAllRecipe = new RelayCommand(() =>
             {
-                Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
+                if (MessageNotify.GetInstance.ShowDialog($"请确认，是否删除所有配方订单？"))
+                {
+                    Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
+                    MessageNotify.GetInstance.ShowUserLog($"手动清除所有配方。");
+                }
             });
         } 
         public RelayCommand<object> DetailsCommand { get; set; }

From 2b4dba317c0752cf68d001bd8d9998ab3245edad Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Thu, 1 Jun 2023 17:06:45 +0800
Subject: [PATCH 80/96] =?UTF-8?q?1.=20ProcessControl=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E6=89=93=E5=8D=B0=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E3=80=822.=20xaml=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=97=A0=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/ProcessControl.cs                   |   8 +-
 .../View/ManualFlowView.xaml                  | 354 ++++++++++++++----
 .../View/RecipeReceiveView.xaml               | 298 ++++++++-------
 .../View/RecipeSendDownView.xaml              | 200 +++++-----
 .../View/SiemensRecipeSendDownView.xaml       | 103 ++---
 .../View/StockBinRawMaterialView.xaml         | 113 +++---
 .../View/NewLocalRecipeView.xaml              |   4 +-
 .../View/RecipeControlView.xaml               |   8 +-
 8 files changed, 661 insertions(+), 427 deletions(-)

diff --git a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
index e4bec208..2dc6d616 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
@@ -1368,7 +1368,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe1Time).TotalSeconds;
                             FinishData.ProcessTime = Convert.ToInt16(a);
                             SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361);
-                            MessageNotify.GetInstance.ShowRunLog($"配方1，，配方编号：{code}，托盘编号：{trayCode}，配料完成，将信号反馈给西门子");
+                            MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，配料完成，将信号反馈给西门子");
                         }
                         HKDevice.HK_PLC_S7.Write("DB99.DBX1.4", true);
                         GVL_BigStation.Recipe1DosingStatus = 3;
@@ -1382,7 +1382,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
                         });
                         GVL_BigStation.Recipe1DosingStatus = 0;
-                        MessageNotify.GetInstance.ShowRunLog($"配方1，，配方编号：{code}，托盘编号：{trayCode}，复位plc配料完成信号");
+                        MessageNotify.GetInstance.ShowRunLog($"配方1，配方编号：{code}，托盘编号：{trayCode}，复位plc配料完成信号");
                     }
                 }
             }
@@ -1496,7 +1496,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
                         });
                         GVL_BigStation.Recipe2DosingStatus = 0;
-                        MessageNotify.GetInstance.ShowRunLog($"配方2，，配方编号：{code}，托盘编号：{trayCode}，，复位plc配料完成信号");
+                        MessageNotify.GetInstance.ShowRunLog($"配方2，配方编号：{code}，托盘编号：{trayCode}，，复位plc配料完成信号");
                     }
                 }
             }
@@ -1609,7 +1609,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成，移除当前配方
                         });
                         GVL_BigStation.Recipe3DosingStatus = 0;
-                        MessageNotify.GetInstance.ShowRunLog($"配方3，，配方编号：{code}，托盘编号：{trayCode}，复位plc配料完成信号");
+                        MessageNotify.GetInstance.ShowRunLog($"配方3，配方编号：{code}，托盘编号：{trayCode}，复位plc配料完成信号");
                     }
                 }
             }
diff --git a/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
index 3697d340..cf489b84 100644
--- a/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
@@ -1,16 +1,18 @@
-<UserControl x:Class="BPASmartClient.JXJFoodBigStation.View.ManualFlowView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
-             mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920">
+<UserControl
+    x:Class="BPASmartClient.JXJFoodBigStation.View.ManualFlowView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
     <UserControl.DataContext>
         <vm:ManualFlowViewModel />
     </UserControl.DataContext>
-    
+
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
@@ -20,213 +22,415 @@
         </Grid.RowDefinitions>
         <!--#region 表格标题栏设置-->
         <Grid>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center">
+            <StackPanel
+                HorizontalAlignment="left"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
+                    Panel.ZIndex="0"
                     Command="{Binding TrayInPlace}"
                     CommandParameter="1"
                     Content="AGV到达工位1"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
+                    Panel.ZIndex="0"
                     Command="{Binding TrayInPlace}"
                     CommandParameter="2"
                     Content="AGV到达工位2"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
+                    Panel.ZIndex="0"
                     Command="{Binding TrayInPlace}"
                     CommandParameter="3"
                     Content="AGV到达工位3"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
+                    Panel.ZIndex="0"
                     Command="{Binding TrayInPlace}"
                     CommandParameter="4"
                     Content="AGV到达工位4"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
+                    Panel.ZIndex="0"
                     Command="{Binding TrayInPlace}"
                     CommandParameter="5"
                     Content="AGV到达工位5"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
             </StackPanel>
         </Grid>
         <Grid Grid.Row="1">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center">
+            <StackPanel
+                HorizontalAlignment="left"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
+                    Panel.ZIndex="0"
                     Command="{Binding TrayLeave}"
                     CommandParameter="1"
                     Content="AGV离开工位1"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
+                    Panel.ZIndex="0"
                     Command="{Binding TrayLeave}"
                     CommandParameter="2"
                     Content="AGV离开工位2"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
+                    Panel.ZIndex="0"
                     Command="{Binding TrayLeave}"
                     CommandParameter="3"
                     Content="AGV离开工位3"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
+                    Panel.ZIndex="0"
                     Command="{Binding TrayLeave}"
                     CommandParameter="4"
                     Content="AGV离开工位4"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
+                    Panel.ZIndex="0"
                     Command="{Binding TrayLeave}"
                     CommandParameter="5"
                     Content="AGV离开工位5"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
             </StackPanel>
         </Grid>
 
         <Grid Grid.Row="2">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center">
+            <StackPanel
+                HorizontalAlignment="left"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
+                    Panel.ZIndex="0"
                     Command="{Binding ClearTrayInPlace}"
                     Content="清除AGV到位信号"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
                 <Button
                     Width="200"
                     Height="40"
                     Margin="5,0,5,0"
+                    Panel.ZIndex="0"
                     Command="{Binding ClearAllRecipe}"
                     Content="清除西门子所有配方"
                     FontSize="20"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
+                    Style="{StaticResource ImageButtonStyle}" />
             </StackPanel>
         </Grid>
         <Grid Grid.Row="3">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition></ColumnDefinition>
-                <ColumnDefinition></ColumnDefinition>
-                <ColumnDefinition></ColumnDefinition>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
             </Grid.ColumnDefinitions>
             <StackPanel>
                 <WrapPanel>
-                    <TextBlock Text="plc心跳：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding Heartbeat}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="plc心跳：" />
+                    <TextBlock
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding Heartbeat}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="订单号：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBox Width="300" Margin="5" Text="{Binding CancelRecipeCode}" FontSize="24" VerticalAlignment="Center"></TextBox>
-                    <Button Style="{StaticResource ImageButtonStyle}" Width="120" Height="40" FontSize="20" Content="取消订单" Margin="5" Command="{Binding CancelRecipeCommand}"></Button>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="订单号：" />
+                    <TextBox
+                        Width="300"
+                        Margin="5"
+                        VerticalAlignment="Center"
+                        FontSize="24"
+                        Text="{Binding CancelRecipeCode}" />
+                    <Button
+                        Width="120"
+                        Height="40"
+                        Margin="5"
+                        Command="{Binding CancelRecipeCommand}"
+                        Content="取消订单"
+                        FontSize="20"
+                        Style="{StaticResource ImageButtonStyle}" />
                 </WrapPanel>
             </StackPanel>
             <StackPanel Grid.Column="3">
                 <WrapPanel>
-                    <TextBlock Text="料仓名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBinName}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBinName}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="料仓1名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin1Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓1名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBin1Name}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="料仓2名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin2Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓2名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBin2Name}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="料仓3名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin3Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓3名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBin3Name}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="料仓4名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin4Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓4名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBin4Name}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="料仓5名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin5Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓5名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBin5Name}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="料仓6名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin6Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓6名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBin6Name}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="料仓7名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin7Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓7名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBin7Name}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="料仓8名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin8Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓8名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBin8Name}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="料仓9名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin9Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓9名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBin9Name}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="料仓10名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin10Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓10名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBin10Name}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="料仓11名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin11Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓11名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBin11Name}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="料仓12名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin12Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓12名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBin12Name}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="料仓13名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin13Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓13名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBin13Name}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Text="料仓14名称：" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                    <TextBlock Text="{Binding StockBin14Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock>
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓14名称：" />
+                    <TextBlock
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockBin14Name}" />
                 </WrapPanel>
             </StackPanel>
         </Grid>
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
index 3c220ef4..bdaa84f1 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
@@ -12,7 +12,7 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <UserControl.DataContext>
-        <vm:RecipeReceiveViewModel/>
+        <vm:RecipeReceiveViewModel />
     </UserControl.DataContext>
     <UserControl.Resources>
 
@@ -107,15 +107,15 @@
                         <DockPanel>
                             <ToggleButton
                                 x:Name="HeaderSite"
-                                Height="20"
                                 Width="auto"
+                                Height="20"
                                 MinWidth="0"
                                 MinHeight="0"
                                 Margin="1"
                                 Padding="{TemplateBinding Padding}"
-                                Background="Transparent"
                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Background="Transparent"
                                 Content="{TemplateBinding Header}"
                                 ContentTemplate="{TemplateBinding HeaderTemplate}"
                                 ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
@@ -152,20 +152,20 @@
 
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="50"/>
+            <RowDefinition Height="50" />
             <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
             <CheckBox
                 x:Name="IsUseLocalRecipe"
                 Margin="0,0,10,0"
+                VerticalAlignment="Center"
                 Content="使用本地配方配料"
                 FontFamily="楷体"
-                VerticalAlignment="Center"
                 Foreground="Aqua"
                 IsChecked="{Binding IsUseLocalRecipe}" />
 
-            <!--<pry:IcoButton 
+            <!--<pry:IcoButton
                 Width="140"
                 Margin="10"
                 HorizontalAlignment="Left"
@@ -175,8 +175,8 @@
                 Foreground="Aqua"
                 IcoText="&#xe626;"
                 Style="{StaticResource IcoButtonStyle}" />-->
-            
-            <pry:IcoButton 
+
+            <pry:IcoButton
                 Width="140"
                 Margin="10"
                 HorizontalAlignment="Left"
@@ -186,7 +186,7 @@
                 Foreground="Aqua"
                 IcoText="&#xe626;"
                 Style="{StaticResource IcoButtonStyle}" />
-            <!--<pry:IcoButton 
+            <!--<pry:IcoButton
                 Width="140"
                 Margin="10"
                 HorizontalAlignment="Left"
@@ -212,20 +212,19 @@
         </StackPanel>
         <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Hidden">
             <ListBox
-             
-            Grid.Row="2"
-            Margin="5"
-            VerticalAlignment="Top"
-            Background="Transparent"
-            BorderThickness="0"
-            ItemsSource="{Binding Recipes}"
-            ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                Grid.Row="2"
+                Margin="5"
+                VerticalAlignment="Top"
+                Background="Transparent"
+                BorderThickness="0"
+                ItemsSource="{Binding Recipes}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                 <ListBox.ItemsPanel>
                     <ItemsPanelTemplate>
                         <UniformGrid
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Columns="8" />
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Columns="8" />
                     </ItemsPanelTemplate>
                 </ListBox.ItemsPanel>
 
@@ -233,9 +232,9 @@
                     <DataTemplate>
 
                         <Grid
-                        Name="tt"
-                        Height="220"
-                        Margin="5">
+                            Name="tt"
+                            Height="220"
+                            Margin="5">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="30" />
                                 <RowDefinition Height="25" />
@@ -247,105 +246,105 @@
                                 <RowDefinition Height="40" />
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition></ColumnDefinition>
-                                <ColumnDefinition></ColumnDefinition>
+                                <ColumnDefinition />
+                                <ColumnDefinition />
                             </Grid.ColumnDefinitions>
                             <Image
-                            Grid.RowSpan="8"
-                            Grid.ColumnSpan="2"
-                            Source="/BPASmartClient.CustomResource;component/Image/配方背景/竖背景框.png"
-                            Stretch="Fill" />
+                                Grid.RowSpan="8"
+                                Grid.ColumnSpan="2"
+                                Source="/BPASmartClient.CustomResource;component/Image/配方背景/竖背景框.png"
+                                Stretch="Fill" />
 
                             <TextBlock
-                            Grid.Row="0"
-                            Grid.ColumnSpan="2"
-                            FontSize="14"
-                            Margin="5,0,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Foreground="#FF2AB2E7"
-                            Text="配方信息" />
-                            
+                                Grid.Row="0"
+                                Grid.ColumnSpan="2"
+                                Margin="5,0,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Foreground="#FF2AB2E7"
+                                Text="配方信息" />
+
                             <TextBlock
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="配方名称：" />
-                            
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="配方名称：" />
+
                             <TextBlock
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="{Binding RecipeName}" />
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="{Binding RecipeName}" />
 
                             <TextBlock
-                            Grid.Row="2"
-                            Grid.Column="0"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="配方编号：" />
+                                Grid.Row="2"
+                                Grid.Column="0"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="配方编号：" />
 
                             <TextBlock
-                            Grid.Row="2"
-                            Grid.Column="1"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="{Binding RecipeCode}" />
-                            
+                                Grid.Row="2"
+                                Grid.Column="1"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="{Binding RecipeCode}" />
+
                             <TextBlock
-                            Grid.Row="3"
-                            Grid.Column="0"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="托盘编号：" />
+                                Grid.Row="3"
+                                Grid.Column="0"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="托盘编号：" />
 
                             <TextBlock
-                            Grid.Row="3"
-                            Grid.Column="1"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="{Binding TrayCode}" />
+                                Grid.Row="3"
+                                Grid.Column="1"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="{Binding TrayCode}" />
 
                             <TextBlock
-                            Grid.Row="4"
-                            Grid.Column="0"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="订单类型：" />
+                                Grid.Row="4"
+                                Grid.Column="0"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="订单类型：" />
 
                             <TextBlock
-                            Grid.Row="4"
-                            Grid.Column="1"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="{Binding OrderType}" />
-                            
+                                Grid.Row="4"
+                                Grid.Column="1"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="{Binding OrderType}" />
+
                             <!--<ScrollViewer
                             Grid.Row="5"
                             VerticalAlignment="Top"
@@ -394,22 +393,22 @@
                             </ScrollViewer>-->
 
                             <Image
-                            Grid.Row="6"
-                            Grid.ColumnSpan="2"
-                            Width="{Binding ElementName=tt, Path=ActualWidth}"
-                            Height="2"
-                            VerticalAlignment="Bottom"
-                            Source="/BPASmartClient.CustomResource;component/Image/直线.png"
-                            Stretch="Fill" />
+                                Grid.Row="6"
+                                Grid.ColumnSpan="2"
+                                Width="{Binding ElementName=tt, Path=ActualWidth}"
+                                Height="2"
+                                VerticalAlignment="Bottom"
+                                Source="/BPASmartClient.CustomResource;component/Image/直线.png"
+                                Stretch="Fill" />
 
                             <Grid
-                            Name="gr"
-                            Grid.Row="7"
-                            Grid.ColumnSpan="2"
-                            Height="30"
-                            Margin="0,0,0,10"
-                            VerticalAlignment="Bottom"
-                            Background="Transparent">
+                                Name="gr"
+                                Grid.Row="7"
+                                Grid.ColumnSpan="2"
+                                Height="30"
+                                Margin="0,0,0,10"
+                                VerticalAlignment="Bottom"
+                                Background="Transparent">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition />
                                     <ColumnDefinition />
@@ -441,41 +440,40 @@
                                 Style="{StaticResource IcoButtonStyle}" />-->
 
                                 <pry:IcoButton
-                                 Grid.Column="1"
-                                Width="{Binding ElementName=gr, Path=ActualWidth}"
-                                Height="{Binding ElementName=gr, Path=ActualHeight}"
-                                Margin="3,4,4,0"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Background="#11F53F62"
-                                BorderThickness="0"
-                                Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
-                                CommandParameter="{Binding RecipeCode}"
-                                Content="删除"
-                                EnterBackground="#22F53F62"
-                                Foreground="#FFF53F62"
-                                IcoText="&#xe68e;"
-                                Style="{StaticResource IcoButtonStyle}" />
+                                    Grid.Column="1"
+                                    Width="{Binding ElementName=gr, Path=ActualWidth}"
+                                    Height="{Binding ElementName=gr, Path=ActualHeight}"
+                                    Margin="3,4,4,0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Background="#11F53F62"
+                                    BorderThickness="0"
+                                    Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
+                                    CommandParameter="{Binding RecipeCode}"
+                                    Content="删除"
+                                    EnterBackground="#22F53F62"
+                                    Foreground="#FFF53F62"
+                                    IcoText="&#xe68e;"
+                                    Style="{StaticResource IcoButtonStyle}" />
 
                                 <pry:IcoButton
-                                 
-                                Width="{Binding ElementName=gr, Path=ActualWidth}"
-                                Height="{Binding ElementName=gr, Path=ActualHeight}"
-                                Margin="3,4,4,0"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Background="#112AB2E7"
-                                BorderThickness="0"
-                                Command="{Binding DataContext.DetailsCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
-                                CommandParameter="{Binding RecipeCode}"
-                                Content="编辑"
-                                EnterBackground="#222AB2E7"
-                                Foreground="#FF2AB2E7"
-                                IcoText="&#xe636;"
-                                Style="{StaticResource IcoButtonStyle}" />
+                                    Width="{Binding ElementName=gr, Path=ActualWidth}"
+                                    Height="{Binding ElementName=gr, Path=ActualHeight}"
+                                    Margin="3,4,4,0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Background="#112AB2E7"
+                                    BorderThickness="0"
+                                    Command="{Binding DataContext.DetailsCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
+                                    CommandParameter="{Binding RecipeCode}"
+                                    Content="编辑"
+                                    EnterBackground="#222AB2E7"
+                                    Foreground="#FF2AB2E7"
+                                    IcoText="&#xe636;"
+                                    Style="{StaticResource IcoButtonStyle}" />
 
                             </Grid>
-                            
+
                         </Grid>
 
                     </DataTemplate>
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
index 5b5688dd..56180ecc 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
@@ -1,21 +1,23 @@
-<UserControl x:Class="BPASmartClient.JXJFoodBigStation.View.RecipeSendDownView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:con="clr-namespace:BPASmartClient.JXJFoodBigStation.Converter"
-             xmlns:local="clr-namespace:BPASmartClient.JXJFoodBigStation.View"
-             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="BPASmartClient.JXJFoodBigStation.View.RecipeSendDownView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:con="clr-namespace:BPASmartClient.JXJFoodBigStation.Converter"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.JXJFoodBigStation.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <UserControl.DataContext>
-        <vm:RecipeSendDownViewModel/>
+        <vm:RecipeSendDownViewModel />
     </UserControl.DataContext>
     <UserControl.Resources>
-        <con:EnbleConvert x:Key="EnbleConvert"/>
-        <con:IntToSourceConvert x:Key="IntToSourceConvert"/>
-        <con:RunStatusConvert x:Key="RunStatusConvert"/>
+        <con:EnbleConvert x:Key="EnbleConvert" />
+        <con:IntToSourceConvert x:Key="IntToSourceConvert" />
+        <con:RunStatusConvert x:Key="RunStatusConvert" />
         <Style x:Key="UserItemContainerStyle" TargetType="ListBoxItem">
             <Style.Resources>
                 <!--  SelectedItem with focus  -->
@@ -374,15 +376,15 @@
                         <DockPanel>
                             <ToggleButton
                                 x:Name="HeaderSite"
-                                Height="20"
                                 Width="auto"
+                                Height="20"
                                 MinWidth="0"
                                 MinHeight="0"
                                 Margin="1"
                                 Padding="{TemplateBinding Padding}"
-                                Background="Transparent"
                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Background="Transparent"
                                 Content="{TemplateBinding Header}"
                                 ContentTemplate="{TemplateBinding HeaderTemplate}"
                                 ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
@@ -456,104 +458,104 @@
                                 <RowDefinition Height="40" />
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition></ColumnDefinition>
-                                <ColumnDefinition></ColumnDefinition>
+                                <ColumnDefinition />
+                                <ColumnDefinition />
                             </Grid.ColumnDefinitions>
                             <Image
-                            Grid.RowSpan="8"
-                            Grid.ColumnSpan="2"
-                            Source="/BPASmartClient.CustomResource;component/Image/配方背景/竖背景框.png"
-                            Stretch="Fill" />
+                                Grid.RowSpan="8"
+                                Grid.ColumnSpan="2"
+                                Source="/BPASmartClient.CustomResource;component/Image/配方背景/竖背景框.png"
+                                Stretch="Fill" />
 
                             <TextBlock
-                            Grid.Row="0"
-                            Grid.ColumnSpan="2"
-                            FontSize="14"
-                            Margin="5,0,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Foreground="#FF2AB2E7"
-                            Text="配方信息" />
+                                Grid.Row="0"
+                                Grid.ColumnSpan="2"
+                                Margin="5,0,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Foreground="#FF2AB2E7"
+                                Text="配方信息" />
 
                             <TextBlock
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="配方名称：" />
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="配方名称：" />
 
                             <TextBlock
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="{Binding RecipeName}" />
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="{Binding RecipeName}" />
 
                             <TextBlock
-                            Grid.Row="2"
-                            Grid.Column="0"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="配方编号：" />
+                                Grid.Row="2"
+                                Grid.Column="0"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="配方编号：" />
 
                             <TextBlock
-                            Grid.Row="2"
-                            Grid.Column="1"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="{Binding RecipeCode}" />
+                                Grid.Row="2"
+                                Grid.Column="1"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="{Binding RecipeCode}" />
 
                             <TextBlock
-                            Grid.Row="3"
-                            Grid.Column="0"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="托盘编号：" />
+                                Grid.Row="3"
+                                Grid.Column="0"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="托盘编号：" />
 
                             <TextBlock
-                            Grid.Row="3"
-                            Grid.Column="1"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="{Binding TrayCode}" />
+                                Grid.Row="3"
+                                Grid.Column="1"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="{Binding TrayCode}" />
 
                             <TextBlock
-                            Grid.Row="4"
-                            Grid.Column="0"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="订单类型：" />
+                                Grid.Row="4"
+                                Grid.Column="0"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="订单类型：" />
 
                             <TextBlock
-                            Grid.Row="4"
-                            Grid.Column="1"
-                            Margin="2,5,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#FF2AB2E7"
-                            Text="{Binding OrderType}" />
+                                Grid.Row="4"
+                                Grid.Column="1"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="{Binding OrderType}" />
 
                             <!--<ScrollViewer
                             Grid.Row="2"
@@ -601,7 +603,7 @@
                                 </ItemsControl>
                             </ScrollViewer>-->
 
-                           
+
                             <Image
                                 Grid.Row="6"
                                 Grid.ColumnSpan="2"
@@ -923,11 +925,13 @@
                             </ItemsControl>
 
                         </Grid>
-                        --><!--<TreeView x:Name="repiceListMaking"   ItemsSource="{Binding RecipeProcesse}"
+        -->
+        <!--<TreeView x:Name="repiceListMaking"   ItemsSource="{Binding RecipeProcesse}"
                                   ScrollViewer.VerticalScrollBarVisibility="Disabled" HorizontalAlignment="Stretch" Background="Wheat"  ItemContainerStyle="{StaticResource recipeTreeItem}">
                         </TreeView>-->
 
-                        <!--  等待和已完成  --><!--
+        <!--  等待和已完成  -->
+        <!--
 
                         <TreeView
                             x:Name="repiceList"
diff --git a/BPASmartClient.JXJFoodBigStation/View/SiemensRecipeSendDownView.xaml b/BPASmartClient.JXJFoodBigStation/View/SiemensRecipeSendDownView.xaml
index b90c7de9..8c8f5a3a 100644
--- a/BPASmartClient.JXJFoodBigStation/View/SiemensRecipeSendDownView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/SiemensRecipeSendDownView.xaml
@@ -1,28 +1,30 @@
-<UserControl x:Class="BPASmartClient.JXJFoodBigStation.View.SiemensRecipeSendDownView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:con="clr-namespace:BPASmartClient.JXJFoodBigStation.Converter"
-             xmlns:local="clr-namespace:BPASmartClient.JXJFoodBigStation.View"
-             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="BPASmartClient.JXJFoodBigStation.View.SiemensRecipeSendDownView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:con="clr-namespace:BPASmartClient.JXJFoodBigStation.Converter"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.JXJFoodBigStation.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <UserControl.DataContext>
-        <vm:SiemensRecipeSendDownViewModel/>
+        <vm:SiemensRecipeSendDownViewModel />
     </UserControl.DataContext>
     <UserControl.Resources>
-        <con:EnbleConvert x:Key="EnbleConvert"/>
-        <con:IntToSourceConvert x:Key="IntToSourceConvert"/>
-        <con:RunStatusConvert x:Key="RunStatusConvert"/>
+        <con:EnbleConvert x:Key="EnbleConvert" />
+        <con:IntToSourceConvert x:Key="IntToSourceConvert" />
+        <con:RunStatusConvert x:Key="RunStatusConvert" />
         <Style x:Key="UserItemContainerStyle" TargetType="ListBoxItem">
             <Style.Resources>
                 <!--  SelectedItem with focus  -->
                 <SolidColorBrush
                     x:Key="{x:Static SystemColors.HighlightBrushKey}"
                     Opacity=".4"
-                    Color="White" />    
+                    Color="White" />
                 <!--  SelectedItem without focus  -->
                 <SolidColorBrush
                     x:Key="{x:Static SystemColors.ControlBrushKey}"
@@ -362,15 +364,15 @@
                         <DockPanel>
                             <ToggleButton
                                 x:Name="HeaderSite"
-                                Height="20"
                                 Width="auto"
+                                Height="20"
                                 MinWidth="0"
                                 MinHeight="0"
                                 Margin="1"
                                 Padding="{TemplateBinding Padding}"
-                                Background="Transparent"
                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Background="Transparent"
                                 Content="{TemplateBinding Header}"
                                 ContentTemplate="{TemplateBinding HeaderTemplate}"
                                 ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
@@ -450,16 +452,16 @@
                             <Grid Grid.Row="0">
 
                                 <Grid.RowDefinitions>
-                                    <RowDefinition></RowDefinition>
-                                    <RowDefinition></RowDefinition>
-                                    <RowDefinition></RowDefinition>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
                                 </Grid.RowDefinitions>
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="3*"></ColumnDefinition>
-                                    <ColumnDefinition Width="7*"></ColumnDefinition>
+                                    <ColumnDefinition Width="3*" />
+                                    <ColumnDefinition Width="7*" />
                                 </Grid.ColumnDefinitions>
 
-                                <TextBlock 
+                                <TextBlock
                                     Grid.Row="0"
                                     Grid.Column="0"
                                     Margin="7,5,0,0"
@@ -467,7 +469,7 @@
                                     VerticalAlignment="Center"
                                     FontSize="16"
                                     Foreground="#FF2AB2E7"
-                                    Text="配方名称："></TextBlock>
+                                    Text="配方名称：" />
                                 <TextBlock
                                     Grid.Row="0"
                                     Grid.Column="1"
@@ -477,7 +479,7 @@
                                     FontSize="16"
                                     Foreground="#FF2AB2E7"
                                     Text="{Binding RecipeName}" />
-                                <TextBlock 
+                                <TextBlock
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     Margin="7,5,0,0"
@@ -485,7 +487,7 @@
                                     VerticalAlignment="Center"
                                     FontSize="16"
                                     Foreground="#FF2AB2E7"
-                                    Text="配方编号："></TextBlock>
+                                    Text="配方编号：" />
                                 <TextBlock
                                     Grid.Row="1"
                                     Grid.Column="1"
@@ -495,7 +497,7 @@
                                     FontSize="16"
                                     Foreground="#FF2AB2E7"
                                     Text="{Binding RecipeCode}" />
-                                <TextBlock 
+                                <TextBlock
                                     Grid.Row="2"
                                     Grid.Column="0"
                                     Margin="7,5,0,0"
@@ -503,7 +505,7 @@
                                     VerticalAlignment="Center"
                                     FontSize="16"
                                     Foreground="#FF2AB2E7"
-                                    Text="托盘编号："></TextBlock>
+                                    Text="托盘编号：" />
                                 <TextBlock
                                     Grid.Row="2"
                                     Grid.Column="1"
@@ -514,53 +516,62 @@
                                     Foreground="#FF2AB2E7"
                                     Text="{Binding TrayCode}" />
                             </Grid>
-                            
+
 
                             <TextBlock
                                 Grid.Row="1"
-                                FontSize="16"
                                 Margin="7,2,0,0"
                                 VerticalAlignment="Top"
+                                FontSize="16"
                                 Foreground="#FF2AB2E7"
                                 Text="原料信息：" />
 
                             <ScrollViewer
-                            Grid.Row="2"
-                            VerticalAlignment="Top"
-                            Background="Transparent"
-                            HorizontalScrollBarVisibility="Hidden"
-                            VerticalScrollBarVisibility="Visible">
+                                Grid.Row="2"
+                                VerticalAlignment="Top"
+                                Background="Transparent"
+                                HorizontalScrollBarVisibility="Hidden"
+                                VerticalScrollBarVisibility="Visible">
                                 <ItemsControl ItemsSource="{Binding RawMaterial}">
                                     <ItemsControl.ItemsPanel>
                                         <ItemsPanelTemplate>
-                                            <StackPanel/>
+                                            <StackPanel />
                                         </ItemsPanelTemplate>
                                     </ItemsControl.ItemsPanel>
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate>
-                                            <Expander Style="{StaticResource ExpanderStyle}" Margin="40,0,0,0">
+                                            <Expander Margin="40,0,0,0" Style="{StaticResource ExpanderStyle}">
                                                 <Expander.Header>
                                                     <StackPanel Orientation="Horizontal">
-                                                        <Border Width="15" Height="15" CornerRadius="15" HorizontalAlignment="Left" Margin="0,0,5,0">
+                                                        <Border
+                                                            Width="15"
+                                                            Height="15"
+                                                            Margin="0,0,5,0"
+                                                            HorizontalAlignment="Left"
+                                                            CornerRadius="15">
                                                             <Border.Background>
                                                                 <RadialGradientBrush>
-                                                                    <GradientStop Color="#FF2AB2E7" Offset="0.5" />
-                                                                    <GradientStop Color="White"/>
+                                                                    <GradientStop Offset="0.5" Color="#FF2AB2E7" />
+                                                                    <GradientStop Color="White" />
                                                                 </RadialGradientBrush>
                                                             </Border.Background>
                                                         </Border>
-                                                        <TextBlock Text="{Binding RawMaterialName }" Foreground="#FF2AB2E7" VerticalAlignment="Center" FontSize="14"/>
+                                                        <TextBlock
+                                                            VerticalAlignment="Center"
+                                                            FontSize="14"
+                                                            Foreground="#FF2AB2E7"
+                                                            Text="{Binding RawMaterialName}" />
                                                     </StackPanel>
                                                 </Expander.Header>
                                                 <Expander.Content>
                                                     <StackPanel Margin="36,0,0,0">
                                                         <StackPanel Orientation="Horizontal">
-                                                            <TextBlock Text="原料桶号：" Foreground="#FF2AB2E7"/>
-                                                            <TextBlock Text="{Binding RawMaterialBarrelNum}" Foreground="#FF2AB2E7"/>
+                                                            <TextBlock Foreground="#FF2AB2E7" Text="原料桶号：" />
+                                                            <TextBlock Foreground="#FF2AB2E7" Text="{Binding RawMaterialBarrelNum}" />
                                                         </StackPanel>
                                                         <StackPanel Orientation="Horizontal">
-                                                            <TextBlock Text="原料重量：" Foreground="#FF2AB2E7"/>
-                                                            <TextBlock Text="{Binding RawMaterialWeight}" Foreground="#FF2AB2E7"/>
+                                                            <TextBlock Foreground="#FF2AB2E7" Text="原料重量：" />
+                                                            <TextBlock Foreground="#FF2AB2E7" Text="{Binding RawMaterialWeight}" />
                                                         </StackPanel>
                                                     </StackPanel>
                                                 </Expander.Content>
diff --git a/BPASmartClient.JXJFoodBigStation/View/StockBinRawMaterialView.xaml b/BPASmartClient.JXJFoodBigStation/View/StockBinRawMaterialView.xaml
index a0ea54b5..8a6aefd9 100644
--- a/BPASmartClient.JXJFoodBigStation/View/StockBinRawMaterialView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/StockBinRawMaterialView.xaml
@@ -1,16 +1,18 @@
-<UserControl x:Class="BPASmartClient.JXJFoodBigStation.View.StockBinRawMaterialView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
-             mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920">
+<UserControl
+    x:Class="BPASmartClient.JXJFoodBigStation.View.StockBinRawMaterialView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
     <UserControl.DataContext>
         <vm:StockBinRawMaterialViewModel />
     </UserControl.DataContext>
-    
+
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <!--<RowDefinition Height="60" />-->
@@ -35,29 +37,52 @@
                     Foreground="Aqua"
                     Style="{StaticResource IcoButtonStyle}" />
             </StackPanel>
-            
+
         </Grid>-->
         <Grid
             Grid.Row="0"
             Margin="0,10,0,0"
             Background="#ff0C255F">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="1*" />
             </Grid.ColumnDefinitions>
             <Grid Grid.Column="0">
-                <TextBlock  Text="序号" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"/>
-                <Border BorderThickness="1,1,1,1" Cursor="SizeWE"   />
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="24"
+                    Foreground="Aqua"
+                    Text="序号" />
+                <Border BorderThickness="1,1,1,1" Cursor="SizeWE" />
             </Grid>
-            <TextBlock  Grid.Column="1" FontSize="24" Text="料仓位置" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
-            <TextBlock  Grid.Column="2" FontSize="24" Text="原料编号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
-            <TextBlock  Grid.Column="3" FontSize="24" Text="原料名称" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <TextBlock
+                Grid.Column="1"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="24"
+                Foreground="Aqua"
+                Text="料仓位置" />
+            <TextBlock
+                Grid.Column="2"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="24"
+                Foreground="Aqua"
+                Text="原料编号" />
+            <TextBlock
+                Grid.Column="3"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="24"
+                Foreground="Aqua"
+                Text="原料名称" />
         </Grid>
         <Grid Grid.Row="1">
-            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"  >
-                <ItemsControl ItemsSource="{Binding RawMaterialInfo}" Foreground="Aqua">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                <ItemsControl Foreground="Aqua" ItemsSource="{Binding RawMaterialInfo}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
                             <Grid Name="gr" Margin="5">
@@ -69,46 +94,38 @@
                                 </Grid.ColumnDefinitions>
                                 <Grid Grid.Column="0" Margin="5">
                                     <TextBlock
-                                        FontSize="16"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
-                                        Text="{Binding  RawMaterialCount}" />
-                                    <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
-                                    
+                                        FontSize="16"
+                                        Text="{Binding RawMaterialCount}" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
+
                                 </Grid>
                                 <Grid Grid.Column="1" Margin="5">
                                     <TextBlock
-                                        FontSize="16"
-                                        TextAlignment="Center"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
-                                        Text="{Binding  RawMaterialLocation}" />
-                                    <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
+                                        FontSize="16"
+                                        Text="{Binding RawMaterialLocation}"
+                                        TextAlignment="Center" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
 
                                 </Grid>
                                 <Grid Grid.Column="2" Margin="5">
                                     <TextBlock
-                                        FontSize="16"
                                         HorizontalAlignment="Center"
-                                        VerticalAlignment="Center" 
-                                        Text="{Binding  RawMaterialName}" />
-                                    <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE"  />
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding RawMaterialName}" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                 </Grid>
                                 <Grid Grid.Column="3">
                                     <TextBlock
-                                        FontSize="16"
                                         HorizontalAlignment="Center"
-                                        VerticalAlignment="Center" 
-                                        Text="{Binding  RawMaterialChineseName}" />
-                                    <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE"  />
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding RawMaterialChineseName}" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                     <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                         <pry:IcoButton
                                             Margin="3,4,4,0"
@@ -124,10 +141,10 @@
                                             IcoText="&#xe68e;"
                                             Style="{StaticResource IcoButtonStyle}" />
                                     </StackPanel>-->
-                                    
+
                                 </Grid>
                             </Grid>
-                            
+
                             <DataTemplate.Triggers>
                                 <Trigger Property="IsMouseOver" Value="true">
                                     <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
diff --git a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
index fef16aea..45efa1f3 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml
@@ -246,7 +246,7 @@
                         Background="#ff0C255F">
 
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition  />
+                            <ColumnDefinition />
                             <ColumnDefinition Width="0.4*" />
                             <ColumnDefinition Width="0.4*" />
                             <ColumnDefinition Width="0.4*" />
@@ -315,7 +315,7 @@
                                     <DataTemplate>
                                         <Grid Name="gr">
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition  />
+                                                <ColumnDefinition />
                                                 <ColumnDefinition Width="0.4*" />
                                                 <ColumnDefinition Width="0.4*" />
                                                 <ColumnDefinition Width="0.4*" />
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RecipeControlView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RecipeControlView.xaml
index 453719a9..acbb53f4 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RecipeControlView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RecipeControlView.xaml
@@ -780,8 +780,8 @@
                         </TreeView>-->
 
                         <!--  等待和已完成  -->
-                       
-                            <TreeView
+
+                        <TreeView
                             x:Name="repiceList"
                             HorizontalAlignment="Stretch"
                             Background="Transparent"
@@ -790,8 +790,8 @@
                             ItemsSource="{Binding UserTreeWait}"
                             ScrollViewer.VerticalScrollBarVisibility="Visible" />
 
-                       
-                        
+
+
 
                     </Grid>
                 </Border>

From ace541c05d144d70ddf89f422ed26f206c96de3f Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Thu, 1 Jun 2023 17:59:06 +0800
Subject: [PATCH 81/96] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E9=85=8D=E6=96=B9=E5=AE=8C=E6=88=90=E6=95=B0?=
 =?UTF-8?q?=E7=9B=AE=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/ManualFlowView.xaml                             | 9 +++++++++
 .../ViewModel/ManualFlowViewModel.cs                     | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
index e0a63ea4..da0223a4 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
@@ -491,6 +491,15 @@
                         FontSize="25"
                         Foreground="#FF2AB2E7"
                         Text="{Binding RecipeDosingCompleNum}" />
+                    <Button
+                        Width="400"
+                        Height="40"
+                        Margin="5,0,5,0"
+                        Panel.ZIndex="0"
+                        Command="{Binding CompletedNumResetCommand}"
+                        Content="完成数目清零"
+                        FontSize="20"
+                        Style="{StaticResource ImageButtonStyle}" />
                 </WrapPanel>
             </Grid>
         </Grid>
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
index 9f7b4425..4291b762 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
@@ -165,6 +165,14 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 }
                 
             });
+            CompletedNumResetCommand = new RelayCommand(() => {
+                if (MessageNotify.GetInstance.ShowDialog("请确认，是否将配方完成数目清零？",DialogType.Warning))
+                {
+                    GVL_SmallStation.GetInstance.RecipeDosingCompleNum = 0;
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", "配方完成数目清零成功！");
+                    MessageNotify.GetInstance.ShowUserLog("手动清零配方完成数目。");
+                }
+            });
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
                 RecipeDosingCompleNum = GVL_SmallStation.GetInstance.RecipeDosingCompleNum;
@@ -290,6 +298,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public RelayCommand Test5Command { get; set; }
         public RelayCommand Test6Command { get; set; }
         public RelayCommand TimeSet { get; set; }
+        public RelayCommand CompletedNumResetCommand { get; set; }
         public static bool Heartbeat { get { return _mHeartbeat; } set { _mHeartbeat = value; OnStaticPropertyChanged(); } }
         private static bool _mHeartbeat;
 

From 8fd6a1a209cdace6202ee7bec73861c048d59d0b Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Fri, 2 Jun 2023 09:42:08 +0800
Subject: [PATCH 82/96] =?UTF-8?q?=E5=B0=8F=E6=96=99=E7=AB=99=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=89=8B=E5=8A=A8=E4=B8=8B=E5=8F=91=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E9=9C=80=E5=BB=B6=E6=97=B610S=E6=89=8D?=
 =?UTF-8?q?=E5=8F=AF=E7=82=B9=E5=87=BBAGV=E9=80=81=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/GVL_SmallStation.cs                 |  5 +++
 .../ViewModel/ManualFlowViewModel.cs          | 32 ++++++++++++++-----
 .../ViewModel/RecipeReceiveViewModel.cs       |  1 +
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
index 47d8ffe4..4ec45a75 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
@@ -352,6 +352,11 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// 机器人的程序号
         /// </summary>
         public byte RobotProgramNum { get; set; } = 0;
+        /// <summary>
+        /// 手动下发订单。
+        /// </summary>
+        [VarComm("Global","手动下发订单")]
+        public bool ManualIssueRecipe { get; set; }=false;
         #endregion
     }
     public enum IssueRecipeCondition
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
index 4291b762..987180b1 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
@@ -37,8 +37,9 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 VisibilityBtn1 = Visibility.Hidden;
                 VisibilityBtn2 = Visibility.Visible;
                 VisibilityBtn3 = Visibility.Hidden;
+                GVL_SmallStation.GetInstance.ManualIssueRecipe = false;
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV送托盘完成");
-            });
+            }, () => CanManualGetTray());
             Test2Command = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX4.0", PlcVarType = PlcVarType.Bool, Value = true });
@@ -147,12 +148,16 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 //MessageNotify.GetInstance.ShowUserLog($"手动点击按钮，清除所有手动配料完成信号");
                 //NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"清除所有手动配料完成信号");
             });
-            CancelRecipeCommand = new RelayCommand(() => {
+            CancelRecipeCommand = new RelayCommand(() =>
+            {
                 string cancelRecipeCode = CancelRecipeCode.Trim();
-                if (!String.IsNullOrEmpty(cancelRecipeCode) &&MessageNotify.GetInstance.ShowDialog($"请确认，是否进行删除订单【{cancelRecipeCode}】操作？")) {
-                    if (Json<RemoteRecipeDataColl>.Data.Recipes != null) {
+                if (!String.IsNullOrEmpty(cancelRecipeCode) && MessageNotify.GetInstance.ShowDialog($"请确认，是否进行删除订单【{cancelRecipeCode}】操作？"))
+                {
+                    if (Json<RemoteRecipeDataColl>.Data.Recipes != null)
+                    {
                         int index = Array.FindIndex(Json<RemoteRecipeDataColl>.Data.Recipes.ToArray(), p => p.RecipeCode == cancelRecipeCode);
-                        if (index >= 0) {
+                        if (index >= 0)
+                        {
                             GVL_SmallStation.GetInstance.Order_Cancel = true;
                             GVL_SmallStation.GetInstance.Order_CancelRecipeCode = cancelRecipeCode;
                             MessageNotify.GetInstance.ShowUserLog($"手动删除订单【{cancelRecipeCode}】。");
@@ -163,10 +168,11 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 
                     }
                 }
-                
+
             });
-            CompletedNumResetCommand = new RelayCommand(() => {
-                if (MessageNotify.GetInstance.ShowDialog("请确认，是否将配方完成数目清零？",DialogType.Warning))
+            CompletedNumResetCommand = new RelayCommand(() =>
+            {
+                if (MessageNotify.GetInstance.ShowDialog("请确认，是否将配方完成数目清零？", DialogType.Warning))
                 {
                     GVL_SmallStation.GetInstance.RecipeDosingCompleNum = 0;
                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", "配方完成数目清零成功！");
@@ -368,5 +374,15 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public string _CancelRecipeCode { get; set; }
 
         private static Visibility _VisibilityBtn3 = Visibility.Hidden;
+
+        //延迟10s后才可以执行手动点击送托盘完成操作。
+        private bool CanManualGetTray()
+        {
+            if (Delay.GetInstance("CanManualGetTray").Start(GVL_SmallStation.GetInstance.ManualIssueRecipe,10))
+            {
+                return true;
+            }
+            return false;
+        }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
index 0663f2f8..302a7fce 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
@@ -96,6 +96,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{res.RecipeName}配方下发成功!");
                                 MessageNotify.GetInstance.ShowUserLog($"下发本地模拟配方——{res.RecipeName}");
                             }
+                            GVL_SmallStation.GetInstance.ManualIssueRecipe = true;
                         }
                     }
                 }

From 35abe807d20ec4fca283ccb23ce1bb299749d41c Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Tue, 6 Jun 2023 09:37:26 +0800
Subject: [PATCH 83/96] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=A7=A3=E5=86=B3=E6=8E=A7=E4=BB=B6=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E5=8D=A1=E9=A1=BF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/View/RunLogView.xaml                | 244 +++++++++++-------
 .../Pages/ViewModel/RunLogViewModel.cs        |   2 +
 2 files changed, 154 insertions(+), 92 deletions(-)

diff --git a/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml b/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
index 503c0b8b..5c7b6492 100644
--- a/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
+++ b/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
@@ -54,7 +54,6 @@
                         <Setter Property="Foreground" Value="#FF2BD06F" />
                         <Setter Property="FontSize" Value="14" />
                     </Style>
-
                     <ControlTemplate x:Key="ButTemplate" TargetType="Button">
                         <Border
                             x:Name="br"
@@ -158,6 +157,7 @@
         </StackPanel>
 
         <!--#region 表格标题栏设置-->
+
         <Grid
             Grid.Row="1"
             Margin="0,0,17,0"
@@ -230,112 +230,172 @@
                     BorderThickness="1,0,1,0"
                     Cursor="SizeWE" />
             </Grid>-->
+
         </Grid>
         <!--#endregion-->
 
         <!--#region 表格数据显示-->
-        <ScrollViewer
+
+        <!--<ScrollViewer
             Grid.Row="2"
             HorizontalScrollBarVisibility="Hidden"
-            VerticalScrollBarVisibility="Visible">
-
-            <Grid>
-                <!--#region 实时报警信息-->
-                <ItemsControl ItemsSource="{Binding Log}" Visibility="{Binding CurrentDataVis}">
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <Grid x:Name="gr" MinHeight="30">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="150" />
-                                    <ColumnDefinition Width="150" />
-                                    <ColumnDefinition />
-                                </Grid.ColumnDefinitions>
-
-                                <TextBlock
-                                    Grid.Column="0"
-                                    Style="{StaticResource DataTextBlockStyle}"
-                                    Text="{Binding Date}" />
-
-                                <Grid Grid.Column="1">
-                                    <TextBlock Style="{StaticResource DataTextBlockStyle}" Text="{Binding Time}" />
-                                    <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
-                                </Grid>
-
-                                <TextBlock
-                                    Grid.Column="2"
-                                    Margin="10,0,0,0"
-                                    HorizontalAlignment="Left"
-                                    Style="{StaticResource DataTextBlockStyle}"
-                                    Text="{Binding RunLogInfo}"
-                                    TextWrapping="Wrap" />
-
-                                <Border
-                                    Grid.ColumnSpan="6"
-                                    BorderBrush="{StaticResource BorderSolid}"
-                                    BorderThickness="1" />
+            VerticalScrollBarVisibility="Visible">-->
 
+        <Grid Grid.Row="2">
+
+            <!--#region 实时报警信息-->
+
+            <ItemsControl
+                ItemsSource="{Binding Log}"
+                ScrollViewer.CanContentScroll="True"
+                VirtualizingStackPanel.IsVirtualizing="True"
+                Visibility="{Binding CurrentDataVis}">
+
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <VirtualizingStackPanel />
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.Template>
+                    <ControlTemplate>
+                        <Border
+                            Padding="{TemplateBinding Control.Padding}"
+                            Background="{TemplateBinding Panel.Background}"
+                            BorderBrush="{TemplateBinding Border.BorderBrush}"
+                            BorderThickness="{TemplateBinding Border.BorderThickness}"
+                            SnapsToDevicePixels="True">
+                            <ScrollViewer Padding="{TemplateBinding Control.Padding}" Focusable="False">
+                                <ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
+                            </ScrollViewer>
+                        </Border>
+                    </ControlTemplate>
+                </ItemsControl.Template>
+
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Grid x:Name="gr" MinHeight="30">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="150" />
+                                <ColumnDefinition Width="150" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock
+                                Grid.Column="0"
+                                Style="{StaticResource DataTextBlockStyle}"
+                                Text="{Binding Date}" />
+
+                            <Grid Grid.Column="1">
+                                <TextBlock Style="{StaticResource DataTextBlockStyle}" Text="{Binding Time}" />
+                                <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
                             </Grid>
 
-                            <DataTemplate.Triggers>
-                                <Trigger Property="IsMouseOver" Value="true">
-                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
-                                </Trigger>
-                            </DataTemplate.Triggers>
-
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
-                <!--#endregion-->
-
-                <!--#region  历史报警信息-->
-                <ItemsControl ItemsSource="{Binding HistoryRunLog}" Visibility="{Binding HistoryDataVis}">
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <Grid x:Name="gr" MinHeight="30">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="150" />
-                                    <ColumnDefinition Width="150" />
-                                    <ColumnDefinition />
-                                </Grid.ColumnDefinitions>
-
-                                <TextBlock
-                                    Grid.Column="0"
-                                    Style="{StaticResource DataTextBlockStyle}"
-                                    Text="{Binding Date}" />
-
-                                <Grid Grid.Column="1">
-                                    <TextBlock Style="{StaticResource DataTextBlockStyle}" Text="{Binding Time}" />
-                                    <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
-                                </Grid>
-
-                                <TextBlock
-                                    Grid.Column="2"
-                                    Margin="10,0,0,0"
-                                    HorizontalAlignment="Left"
-                                    Style="{StaticResource DataTextBlockStyle}"
-                                    Text="{Binding RunLogInfo}" />
-
-                                <Border
-                                    Grid.ColumnSpan="6"
-                                    BorderBrush="{StaticResource BorderSolid}"
-                                    BorderThickness="1" />
+                            <TextBlock
+                                Grid.Column="2"
+                                Margin="10,0,0,0"
+                                HorizontalAlignment="Left"
+                                Style="{StaticResource DataTextBlockStyle}"
+                                Text="{Binding RunLogInfo}"
+                                TextWrapping="Wrap" />
+
+                            <Border
+                                Grid.ColumnSpan="6"
+                                BorderBrush="{StaticResource BorderSolid}"
+                                BorderThickness="1" />
+
+                        </Grid>
+
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                            </Trigger>
+                        </DataTemplate.Triggers>
+
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
 
+            <!--#endregion-->
+
+            <!--#region  历史报警信息-->
+
+            <ItemsControl
+                ItemsSource="{Binding HistoryRunLog}"
+                ScrollViewer.CanContentScroll="True"
+                VirtualizingStackPanel.IsVirtualizing="True"
+                Visibility="{Binding HistoryDataVis}">
+
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <VirtualizingStackPanel />
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.Template>
+                    <ControlTemplate>
+                        <Border
+                            Padding="{TemplateBinding Control.Padding}"
+                            Background="{TemplateBinding Panel.Background}"
+                            BorderBrush="{TemplateBinding Border.BorderBrush}"
+                            BorderThickness="{TemplateBinding Border.BorderThickness}"
+                            SnapsToDevicePixels="True">
+                            <ScrollViewer Padding="{TemplateBinding Control.Padding}" Focusable="False">
+                                <ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
+                            </ScrollViewer>
+                        </Border>
+                    </ControlTemplate>
+                </ItemsControl.Template>
+
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Grid x:Name="gr" MinHeight="30">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="150" />
+                                <ColumnDefinition Width="150" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock
+                                Grid.Column="0"
+                                Style="{StaticResource DataTextBlockStyle}"
+                                Text="{Binding Date}" />
+
+                            <Grid Grid.Column="1">
+                                <TextBlock Style="{StaticResource DataTextBlockStyle}" Text="{Binding Time}" />
+                                <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
                             </Grid>
 
-                            <DataTemplate.Triggers>
-                                <Trigger Property="IsMouseOver" Value="true">
-                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
-                                </Trigger>
-                            </DataTemplate.Triggers>
+                            <TextBlock
+                                Grid.Column="2"
+                                Margin="10,0,0,0"
+                                HorizontalAlignment="Left"
+                                Style="{StaticResource DataTextBlockStyle}"
+                                Text="{Binding RunLogInfo}" />
 
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
-                <!--#endregion-->
-            </Grid>
-        </ScrollViewer>
+                            <Border
+                                Grid.ColumnSpan="6"
+                                BorderBrush="{StaticResource BorderSolid}"
+                                BorderThickness="1" />
+
+                        </Grid>
+
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                            </Trigger>
+                        </DataTemplate.Triggers>
+
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+
+            <!--#endregion-->
+
+        </Grid>
+        <!--</ScrollViewer>-->
         <!--#endregion-->
 
+        
+
 
     </Grid>
 
diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs
index 81234dd5..971f34f1 100644
--- a/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs
+++ b/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs
@@ -131,5 +131,7 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel
         public ObservableCollection<RunLog> HistoryRunLog { get; set; } = new ObservableCollection<RunLog>();
 
         public ObservableCollection<RunLog> Log { get; set; } = MessageNotify.GetInstance.runLogs;
+
+        
     }
 }

From c5ea0411cb983350a04648d9136070ace8e4c6b6 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Tue, 6 Jun 2023 17:07:30 +0800
Subject: [PATCH 84/96] =?UTF-8?q?=E5=B0=8F=E6=96=99=E7=AB=99=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9C=BA=E5=99=A8=E4=BA=BA=E5=8A=A8=E4=BD=9C=E6=A0=87?=
 =?UTF-8?q?=E5=BF=97=E4=BD=8D=E5=8F=98=E9=87=8F=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=85=8D=E6=96=B9=E5=AE=8C=E6=88=90=E6=95=B0=E7=9B=AE=E4=B8=BA?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E4=BF=9D=E5=AD=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.JXJFoodSmallStation/App.xaml.cs    |  2 ++
 .../Model/HK_PLC/PlcReadAddressDB3.cs             | 12 ++++++++++++
 .../Model/RawMaterial/LocaPar.cs                  |  4 ++++
 .../ViewModel/ManualFlowViewModel.cs              | 15 +++++----------
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
index e113200a..13e96bc6 100644
--- a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
@@ -52,6 +52,7 @@ namespace BPASmartClient.JXJFoodSmallStation
             }
             else
                 mv.Close();
+            GVL_SmallStation.GetInstance.RecipeDosingCompleNum = Json<LocaPar>.Data.RecipeDosingCompleNum;
             MainWindow = mv;
         }
         private async void Init()
@@ -66,6 +67,7 @@ namespace BPASmartClient.JXJFoodSmallStation
         protected override void OnExit(ExitEventArgs e)
         {
             base.OnExit(e);
+            Json<LocaPar>.Data.RecipeDosingCompleNum = GVL_SmallStation.GetInstance.RecipeDosingCompleNum;
             Json<LocaPar>.Save();
             Json<LocalRecipeDataColl>.Save();
             Json<RemoteRecipeDataColl>.Save();
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
index 4a97383d..af59c9cf 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/PlcReadAddressDB3.cs
@@ -69,5 +69,17 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
         [VarComm("DB3.DBX40.2", "工站1气缸信号")]
         public bool Station1Cylinder { get; set; }
 
+        [VarComm("DB3.DBX100.7", "机器人抓空桶完成")]
+        public bool RobotTakeEmptyBarrelFinish { get; set; }
+
+        [VarComm("DB3.DBX101.0", "机器人放空桶完成")]
+        public bool RobotPutEmptyBarrelFinish { get; set; }
+
+        [VarComm("DB3.DBX101.1", "机器人抓满桶完成")]
+        public bool RobotTakeFullBarrelFinish { get; set; }
+
+        [VarComm("DB3.DBX101.2", "机器人放满桶完成")]
+        public bool RobotPutFullBarrelFinish { get; set; }
+
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/LocaPar.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/LocaPar.cs
index 3d109842..a45bee4e 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/LocaPar.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/LocaPar.cs
@@ -12,5 +12,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
     public class LocaPar
     {
         public ObservableCollection<RecipeModel> Recipes { get; set; } = new ObservableCollection<RecipeModel>();
+        /// <summary>
+        /// 配方完成数目。
+        /// </summary>
+        public int RecipeDosingCompleNum { get; set; } = 0;
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
index 987180b1..64c5a242 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
@@ -39,7 +39,9 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 VisibilityBtn3 = Visibility.Hidden;
                 GVL_SmallStation.GetInstance.ManualIssueRecipe = false;
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV送托盘完成");
-            }, () => CanManualGetTray());
+                
+            }, () => { return Delay.GetInstance("CanManualGetTray").Start(GVL_SmallStation.GetInstance.ManualIssueRecipe, 10); });
+
             Test2Command = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX4.0", PlcVarType = PlcVarType.Bool, Value = true });
@@ -66,6 +68,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 VisibilityBtn3 = Visibility.Hidden;
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV取托盘完成");
             });
+
             Test4Command = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX1.5", PlcVarType = PlcVarType.Bool, Value = true });
@@ -375,14 +378,6 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 
         private static Visibility _VisibilityBtn3 = Visibility.Hidden;
 
-        //延迟10s后才可以执行手动点击送托盘完成操作。
-        private bool CanManualGetTray()
-        {
-            if (Delay.GetInstance("CanManualGetTray").Start(GVL_SmallStation.GetInstance.ManualIssueRecipe,10))
-            {
-                return true;
-            }
-            return false;
-        }
+        
     }
 }

From 12746711f3f83519be4de2c7db06d960684e5257 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Wed, 7 Jun 2023 15:09:46 +0800
Subject: [PATCH 85/96] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E6=96=B9?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=8F=8A=E9=85=8D=E6=96=B9=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E7=A1=AE=E8=AE=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.JXJFoodBigStation/App.xaml     |  27 ++
 .../Model/RawMaterial/RecipeData.cs           |   8 +
 .../View/RecipeInfosView.xaml                 | 330 ++++++++++++++----
 .../ViewModel/ManualFlowViewModel.cs          |  18 +-
 .../ViewModel/RecipeInfosViewModel.cs         |  34 +-
 .../ViewModel/RecipeReceiveViewModel.cs       |  14 +
 .../ViewModel/RecipeSendDownViewModel.cs      |   8 +
 7 files changed, 358 insertions(+), 81 deletions(-)

diff --git a/BPASmartClient.JXJFoodBigStation/App.xaml b/BPASmartClient.JXJFoodBigStation/App.xaml
index 5d64b9c2..368efbca 100644
--- a/BPASmartClient.JXJFoodBigStation/App.xaml
+++ b/BPASmartClient.JXJFoodBigStation/App.xaml
@@ -32,6 +32,33 @@
                 </ResourceDictionary>
 
             </ResourceDictionary.MergedDictionaries>
+
+            <Style x:Key="ListBoxGroupStyle" TargetType="GroupItem">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type GroupItem}">
+                            <Expander ExpandDirection="Down" IsExpanded="True">
+                                <Expander.Header>
+                                    <StackPanel Orientation="Horizontal" Margin="5,10">
+                                        <TextBlock
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="White"
+                                            Text="{Binding Path=Name}" />
+                                        <TextBlock
+                                            Margin="5,0,0,0"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="White"
+                                            Text="{Binding Path=ItemCount, StringFormat=数量:{0}个}" />
+                                    </StackPanel>
+                                </Expander.Header>
+                                <ItemsPresenter />
+                            </Expander>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs
index 9d1a21c9..01adfb87 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs
@@ -16,6 +16,14 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         public string RecipeName { get { return _mRecipeName; } set { _mRecipeName = value; OnPropertyChanged(); } }
         private string _mRecipeName;
 
+        
+        /// <summary>
+        /// 配方类别
+        /// </summary>
+        public string RecipeCategory { get { return _RecipeCategory; } set { _RecipeCategory = value; OnPropertyChanged(); } }
+        private string _RecipeCategory;
+
+
         /// <summary>
         /// 配方ID
         /// </summary>
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml
index 4d21eab2..6692a88d 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml
@@ -255,76 +255,212 @@
         </Grid>
     </Border>-->
 
-    <Border Name="br" BorderThickness="2" BorderBrush="#0CADF5">
+    <Border
+        Name="br"
+        BorderBrush="#0CADF5"
+        BorderThickness="2">
         <Border.Background>
             <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" />
         </Border.Background>
-        <Grid >
+        <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="50"></RowDefinition>
-                <RowDefinition Height="85"></RowDefinition>
-                <RowDefinition Height="40"></RowDefinition>
-                <RowDefinition></RowDefinition>
+                <RowDefinition Height="50" />
+                <RowDefinition Height="85" />
+                <RowDefinition Height="40" />
+                <RowDefinition />
             </Grid.RowDefinitions>
 
-            <TextBlock Text="大配料站配方信息" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="0,10"></TextBlock>
-            <UniformGrid Grid.Row="1" Columns="2" Margin="0,0,0,5">
-                <StackPanel Orientation="Vertical" >
-                    <StackPanel Orientation="Horizontal" Margin="0,8">
-                        <TextBlock Text="请输入配方名称：" Foreground="#FF2AB2E7" FontSize="18" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                        <TextBox  Text="{Binding RecipeName}" Width="230" Height="30" BorderThickness="1" Background="Transparent" Foreground="Orange"
-                             VerticalContentAlignment="Center"
-  BorderBrush="#FF2AB2E7" VerticalAlignment="Center" FontSize="16" ></TextBox>
+            <TextBlock
+                Margin="0,10"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="25"
+                Foreground="#FF2AB2E7"
+                Text="大配料站配方信息" />
+            <UniformGrid
+                Grid.Row="1"
+                Margin="0,0,0,5"
+                Columns="3">
+                <StackPanel Orientation="Vertical">
+                    <StackPanel Margin="0,8" Orientation="Horizontal">
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="18"
+                            Foreground="#FF2AB2E7"
+                            Text="请输入配方名称：" />
+                        <TextBox
+                            Width="170"
+                            Height="30"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Background="Transparent"
+                            BorderBrush="#FF2AB2E7"
+                            BorderThickness="1"
+                            FontSize="16"
+                            Foreground="Orange"
+                            Text="{Binding RecipeName}" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="请输入托盘编号：" Foreground="#FF2AB2E7" FontSize="18" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                        <TextBox  Text="{Binding TrayCode}" InputMethod.IsInputMethodEnabled="False"  Width="230" Height="30" BorderThickness="1" Background="Transparent" Foreground="Orange"
-                             VerticalContentAlignment="Center"
-  BorderBrush="#FF2AB2E7" VerticalAlignment="Center" FontSize="16" ></TextBox>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="18"
+                            Foreground="#FF2AB2E7"
+                            Text="请输入托盘编号：" />
+                        <TextBox
+                            Width="170"
+                            Height="30"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Background="Transparent"
+                            BorderBrush="#FF2AB2E7"
+                            BorderThickness="1"
+                            FontSize="16"
+                            Foreground="Orange"
+                            InputMethod.IsInputMethodEnabled="False"
+                            Text="{Binding TrayCode}" />
                     </StackPanel>
                 </StackPanel>
+                <StackPanel Margin="0,8" Orientation="Horizontal">
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="18"
+                        Foreground="#FF2AB2E7"
+                        Text="请选择配方类别：" />
+                    <ComboBox
+                        Width="170"
+                        Height="30"
+                        VerticalAlignment="Center"
+                        VerticalContentAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="#FF2AB2E7"
+                        BorderThickness="1"
+                        FontSize="16"
+                        Foreground="Orange"
+                        IsReadOnly="False"
+                        Text="{Binding RecipeCategory}"
+                        ItemsSource="{Binding Categorys}" />
+                </StackPanel>
                 <Grid>
                     <Grid.RowDefinitions>
-                        <RowDefinition/>
-                        <RowDefinition/>
+                        <RowDefinition />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
-                    <StackPanel Orientation="Horizontal"  HorizontalAlignment="Center" Margin="0,4,0,0">
-                        <CheckBox Content="是否洗桶" FontSize="16" Foreground="#FF2AB2E7" Height="30" Width="180" Margin="0,0,10,0" IsChecked="{Binding IsWashingBarrel}"/>
-                        <Button Content="添加原料" Width="180" Margin="0,0,10,0"  Height="30" Background="Transparent" BorderBrush="#FF2AB2E7" Foreground="#FF2AB2E7" Cursor="Hand" Command="{Binding AddRecipe}" ></Button>
+                    <StackPanel
+                        Margin="0,4,0,0"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <CheckBox
+                            Width="140"
+                            Height="30"
+                            Margin="0,0,10,0"
+                            Padding="10,0"
+                            HorizontalContentAlignment="Center"
+                            Content="是否洗桶"
+                            FontSize="16"
+                            Foreground="#FF2AB2E7"
+                            IsChecked="{Binding IsWashingBarrel}" />
+                        <Button
+                            Width="140"
+                            Height="30"
+                            Margin="0,0,10,0"
+                            Background="Transparent"
+                            BorderBrush="#FF2AB2E7"
+                            Command="{Binding AddRecipe}"
+                            Content="添加原料"
+                            Cursor="Hand"
+                            Foreground="#FF2AB2E7" />
                     </StackPanel>
-                    <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="0,4,0,0" HorizontalAlignment="Center">
-                        <Button Content="确认" Margin="0,0,10,0" Height="30" Width="180"  Background="Transparent" BorderBrush="#FF2AB2E7" Foreground="#FF2AB2E7" Command="{Binding Comfirm}"></Button>
-                        <Button Click="Button_Click" Content="取消" Margin="0,0,10,0" Height="30" FontSize="20" Background="Transparent" BorderBrush="#FF2AB2E7" Foreground="#FF2AB2E7" Width="180"  Cursor="Hand"></Button>
+                    <StackPanel
+                        Grid.Row="1"
+                        Margin="0,4,0,0"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="140"
+                            Height="30"
+                            Margin="0,0,10,0"
+                            Background="Transparent"
+                            BorderBrush="#FF2AB2E7"
+                            Command="{Binding Comfirm}"
+                            Content="确认"
+                            Foreground="#FF2AB2E7" />
+                        <Button
+                            Width="140"
+                            Height="30"
+                            Margin="0,0,10,0"
+                            Background="Transparent"
+                            BorderBrush="#FF2AB2E7"
+                            Click="Button_Click"
+                            Content="取消"
+                            Cursor="Hand"
+                            FontSize="20"
+                            Foreground="#FF2AB2E7" />
                     </StackPanel>
                 </Grid>
 
             </UniformGrid>
-            <Grid Grid.Row="2" Background="#FF2AB2E7" Margin="0,0,0,10">
+            <Grid
+                Grid.Row="2"
+                Margin="0,0,0,10"
+                Background="#FF2AB2E7">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
-                    <ColumnDefinition/>
-                    <ColumnDefinition/>
-                    <ColumnDefinition/>
-                    <ColumnDefinition/>
-                    <ColumnDefinition Width="120"/>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="120" />
                 </Grid.ColumnDefinitions>
-                <TextBlock Grid.Column="0" Text="原料位置" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
-                <GridSplitter></GridSplitter>
-                <TextBlock Grid.Column="1" Text="原料名称" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
-                <GridSplitter Grid.Column="1"></GridSplitter>
-                <TextBlock Grid.Column="2" Text="原料中文名" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
-                <GridSplitter Grid.Column="1"></GridSplitter>
-                <TextBlock Grid.Column="3" Text="托盘桶号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
-                <GridSplitter Grid.Column="2"></GridSplitter>
-                <TextBlock Grid.Column="4" Text="原料重量" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"></TextBlock>
-                <GridSplitter Grid.Column="3"></GridSplitter>
-                <TextBlock Grid.Column="5" Text="操作"     HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                <TextBlock
+                    Grid.Column="0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="White"
+                    Text="原料位置" />
+                <GridSplitter />
+                <TextBlock
+                    Grid.Column="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="White"
+                    Text="原料名称" />
+                <GridSplitter Grid.Column="1" />
+                <TextBlock
+                    Grid.Column="2"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="White"
+                    Text="原料中文名" />
+                <GridSplitter Grid.Column="1" />
+                <TextBlock
+                    Grid.Column="3"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="White"
+                    Text="托盘桶号" />
+                <GridSplitter Grid.Column="2" />
+                <TextBlock
+                    Grid.Column="4"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="White"
+                    Text="原料重量" />
+                <GridSplitter Grid.Column="3" />
+                <TextBlock
+                    Grid.Column="5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="White"
+                    Text="操作" />
             </Grid>
             <ScrollViewer Grid.Row="3" VerticalScrollBarVisibility="Hidden">
                 <ItemsControl ItemsSource="{Binding RawMaterialsInfo}">
                     <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
-                            <StackPanel></StackPanel>
+                            <StackPanel />
                         </ItemsPanelTemplate>
                     </ItemsControl.ItemsPanel>
                     <ItemsControl.ItemTemplate>
@@ -334,19 +470,19 @@
                                     <ControlTemplate>
                                         <Grid>
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition/>
-                                                <ColumnDefinition></ColumnDefinition>
-                                                <ColumnDefinition></ColumnDefinition>
-                                                <ColumnDefinition></ColumnDefinition>
-                                                <ColumnDefinition></ColumnDefinition>
-                                                <ColumnDefinition Width="120"></ColumnDefinition>
+                                                <ColumnDefinition />
+                                                <ColumnDefinition />
+                                                <ColumnDefinition />
+                                                <ColumnDefinition />
+                                                <ColumnDefinition />
+                                                <ColumnDefinition Width="120" />
                                             </Grid.ColumnDefinitions>
                                             <!--<ComboBox ItemsSource="{Binding DataContext.materialNames,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ItemsControl}}" Text="{Binding RawMaterialLocation}"  Margin="10,0,0,10" Width="190" FontSize="14" KeyUp="ComboBox_KeyUp" LostFocus="ComboBox_LostFocus">
                                                 <ComboBox.ItemContainerStyle>
                                                     <Style TargetType="{x:Type ComboBoxItem}">
                                                         <Setter Property="Background" Value="White" />
                                                         <Setter Property="Foreground" Value="#e69519"/>
-                                                        
+
 
                                                     </Style>
                                                 </ComboBox.ItemContainerStyle>-->
@@ -361,39 +497,79 @@
                                                 Foreground="LightGray"
                                                 IsEditable="False"
                                                 ItemsSource="{Binding DataContext.RawMaterialLocation, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                                SelectedValue="{Binding RawMaterialLocation}"
                                                 MouseLeave="ComboBox_MouseLeave"
+                                                SelectedValue="{Binding RawMaterialLocation}"
                                                 Style="{StaticResource ComboBoxStyle}"
-                                                Text="{Binding RawMaterialLocation}"/>
-                                            <StackPanel 
-                                               VerticalAlignment="Center" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center" >
-                                                <TextBlock Grid.Column="1" Text="{Binding RawMaterialName}" Background="Transparent" FontSize="14"  Foreground="LightGray"  ></TextBlock>
+                                                Text="{Binding RawMaterialLocation}" />
+                                            <StackPanel
+                                                Grid.Column="1"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Orientation="Horizontal">
+                                                <TextBlock
+                                                    Grid.Column="1"
+                                                    Background="Transparent"
+                                                    FontSize="14"
+                                                    Foreground="LightGray"
+                                                    Text="{Binding RawMaterialName}" />
                                             </StackPanel>
-                                            <StackPanel 
-                                               VerticalAlignment="Center" Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Center" >
-                                                <TextBlock Grid.Column="1" Text="{Binding RawMaterialChineseName}" Background="Transparent" FontSize="14"  Foreground="LightGray"  ></TextBlock>
+                                            <StackPanel
+                                                Grid.Column="2"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Orientation="Horizontal">
+                                                <TextBlock
+                                                    Grid.Column="1"
+                                                    Background="Transparent"
+                                                    FontSize="14"
+                                                    Foreground="LightGray"
+                                                    Text="{Binding RawMaterialChineseName}" />
                                             </StackPanel>
                                             <!--<TextBox Text="{Binding RawMaterialName}" Background="Transparent" FontSize="14"
                                                        BorderBrush="#e69519" Foreground="LightGray" Width="190" Margin="10,0,0,10" ></TextBox>-->
-                                            <StackPanel 
-                                                Margin="3" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Center">
-                                                <TextBox Text="{Binding RawMaterialBarrelNum}" Background="Transparent" FontSize="14"
-                                                       BorderBrush="#e69519" Foreground="LightGray" Width="120" ></TextBox>
-                                            </StackPanel>
-                                            <StackPanel 
-                                                Margin="3" Orientation="Horizontal"  Grid.Column="4" HorizontalAlignment="Center">
-                                                <TextBox Text="{Binding RawMaterialWeight}" Background="Transparent" FontSize="14"
-                                                       BorderBrush="#e69519" Foreground="LightGray" Width="120" ></TextBox>
-                                                <TextBlock FontSize="14" VerticalAlignment="Center" Margin="4,0,0,0" Text="Kg" Foreground="#e69519" ></TextBlock>
-                                            </StackPanel>
-                                            <Button Grid.Column="5"
-                                                    Content="删除"
-                                                    Width="94"
+                                            <StackPanel
+                                                Grid.Column="3"
+                                                Margin="3"
+                                                HorizontalAlignment="Center"
+                                                Orientation="Horizontal">
+                                                <TextBox
+                                                    Width="120"
+                                                    Background="Transparent"
+                                                    BorderBrush="#e69519"
                                                     FontSize="14"
+                                                    Foreground="LightGray"
+                                                    Text="{Binding RawMaterialBarrelNum}" />
+                                            </StackPanel>
+                                            <StackPanel
+                                                Grid.Column="4"
+                                                Margin="3"
+                                                HorizontalAlignment="Center"
+                                                Orientation="Horizontal">
+                                                <TextBox
+                                                    Width="120"
                                                     Background="Transparent"
-                                                       BorderBrush="#e69519" Foreground="LightGray" HorizontalAlignment="Center"
-                                                    Command="{Binding DataContext.RemoveRecipe,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ItemsControl}}"
-                                                    CommandParameter="{Binding RawMaterialLocation}"></Button>
+                                                    BorderBrush="#e69519"
+                                                    FontSize="14"
+                                                    Foreground="LightGray"
+                                                    Text="{Binding RawMaterialWeight}" />
+                                                <TextBlock
+                                                    Margin="4,0,0,0"
+                                                    VerticalAlignment="Center"
+                                                    FontSize="14"
+                                                    Foreground="#e69519"
+                                                    Text="Kg" />
+                                            </StackPanel>
+                                            <Button
+                                                Grid.Column="5"
+                                                Width="94"
+                                                HorizontalAlignment="Center"
+                                                Background="Transparent"
+                                                BorderBrush="#e69519"
+                                                Command="{Binding DataContext.RemoveRecipe, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ItemsControl}}"
+                                                CommandParameter="{Binding RawMaterialLocation}"
+                                                Content="删除"
+                                                FontSize="14"
+                                                Foreground="LightGray" />
                                         </Grid>
                                     </ControlTemplate>
                                 </RadioButton.Template>
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
index 4b9201b8..951df57b 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
@@ -1,4 +1,7 @@
-using BPASmartClient.Helper;
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.Helper;
 using BPASmartClient.JXJFoodBigStation.Model;
 using BPASmartClient.JXJFoodBigStation.Model.HK_PLC;
 using BPASmartClient.JXJFoodBigStation.Model.Siemens;
@@ -43,11 +46,22 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
             });
             ClearAllRecipe = new RelayCommand(() => 
             {
+                if (!MessageNotify.GetInstance.ShowDialog($"请确认，是否清除所有西门子配方？",DialogType.Warning))
+                {
+                    return;
+                }
                 Json<RemoteRecipe>.Data.Recipes.Clear();
                 GVL_BigStation.SiemensSendRecipeStatus = 0;
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"清楚所有配方完成");
+                MessageNotify.GetInstance.ShowUserLog($"手动清除所有西门子配方。");
             });
             CancelRecipeCommand = new RelayCommand(() => 
             {
+                if (!MessageNotify.GetInstance.ShowDialog($"请确认，是否取消订单【{CancelRecipeCode}】？", DialogType.Warning))
+                {
+                    return;
+                }
+
                 if (Json<RemoteRecipe>.Data.Recipes != null) 
                 {
                     int index = Array.FindIndex(Json<RemoteRecipe>.Data.Recipes.ToArray(), p => p.RecipeCode == CancelRecipeCode);
@@ -55,6 +69,8 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                     {
                         GVL_BigStation.Order_Cancel = true;
                         GVL_BigStation.Order_CancelRecipeCode = CancelRecipeCode;
+                        NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"订单取消完成");
+                        MessageNotify.GetInstance.ShowUserLog($"手动取消订单【{CancelRecipeCode}】。");
                     }
                 }
             });
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
index 7fdefbbd..67d5b677 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
@@ -32,6 +32,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                     RecipeCode = rm.RecipeCode;
                     TrayCode = rm.TrayCode;
                     IsWashingBarrel = rm.IsWashingBarrel;
+                    RecipeCategory = rm.RecipeCategory;
                     foreach (var item in rm.RawMaterial)
                     {
                         //item.RawMaterialCount = Array.FindIndex(ProcessControl.GetInstance.RawMaterialsInfo.ToArray(), p => p.RawMaterialName == item.RawMaterialName);
@@ -57,6 +58,10 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
             });
             Comfirm = new RelayCommand(() =>
             {
+                if (!MessageNotify.GetInstance.ShowDialog($"是否保存该配方？"))
+                {
+                    return;
+                }
                var bom= Json<LocalRecipe>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == RecipeCode);
                 if (bom == null)//新配方
                 {
@@ -70,16 +75,17 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                         {
                             if (IsWashingBarrel)
                             {
-                                Json<LocalRecipe>.Data.Recipes.Add(new RecipeData { RecipeCode = recipeCode,RecipeName = RecipeName, TrayCode = TrayCode, IsWashingBarrel = IsWashingBarrel, OrderType="洗桶" });
+                                Json<LocalRecipe>.Data.Recipes.Add(new RecipeData { RecipeCode = recipeCode,RecipeName = RecipeName, TrayCode = TrayCode, IsWashingBarrel = IsWashingBarrel, OrderType="洗桶",RecipeCategory=RecipeCategory});
                                 if (RawMaterialsInfo.Count > 0)
                                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Info, App.MainWindow, "提示", $"订单类型为洗桶，不保存原料信息");
                             }
                             else
                             {
-                                Json<LocalRecipe>.Data.Recipes.Add(new RecipeData { RecipeCode = recipeCode, RawMaterial = RawMaterialsInfo, RecipeName = RecipeName, TrayCode = TrayCode, IsWashingBarrel = IsWashingBarrel, OrderType = "配料" });
+                                Json<LocalRecipe>.Data.Recipes.Add(new RecipeData { RecipeCode = recipeCode, RawMaterial = RawMaterialsInfo, RecipeName = RecipeName, TrayCode = TrayCode, IsWashingBarrel = IsWashingBarrel, OrderType = "配料", RecipeCategory = RecipeCategory });
                             }
                             Json<LocalRecipe>.Save();
                             NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"配方保存完成");
+                            MessageNotify.GetInstance.ShowUserLog($"新增【{RecipeName}】配方,订单号为【{recipeCode}】。");
                         }
                         else
                         {
@@ -102,11 +108,14 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                     bom.RecipeName = RecipeName;
                     bom.TrayCode = TrayCode;
                     bom.IsWashingBarrel = IsWashingBarrel;
+                    bom.RecipeCategory = RecipeCategory;
                     if (IsWashingBarrel) 
                     {
                         bom.RawMaterial.Clear();
                     }
                     Json<LocalRecipe>.Save();
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"配方保存完成");
+                    MessageNotify.GetInstance.ShowUserLog($"修改【{RecipeName}】配方。");
                     ActionManage.GetInstance.Send("CloseRecipeInfosView");
                 }
             });
@@ -116,6 +125,15 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                 if (res != null)
                     RawMaterialsInfo.Remove(res);
             });
+
+            foreach (var item in Json<LocalRecipe>.Data.Recipes)
+            {
+                if (!Categorys.Contains(item.RecipeCategory))
+                {
+                    Categorys.Add(item.RecipeCategory);
+                }
+            }
+
         }
         public string RecipeName { get { return _mRecipeName; } set { _mRecipeName = value; OnPropertyChanged(); } }
         private string _mRecipeName;
@@ -130,7 +148,17 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
         private int _mSelectIndex;
         public bool IsWashingBarrel { get { return _mIsWashingBarrel; } set { _mIsWashingBarrel = value; OnPropertyChanged(); } }
         private bool _mIsWashingBarrel;
-        
+
+        public string RecipeCategory { get { return _RecipeCategory; } set { _RecipeCategory = value; OnPropertyChanged(); } }
+        private string _RecipeCategory;
+
+        private ObservableCollection<string> _Categorys=new();
+
+        public ObservableCollection<string> Categorys
+        {
+            get { return _Categorys; }
+            set { _Categorys = value; OnPropertyChanged(); }
+        }
 
         public RelayCommand ReturnPage { get; set; }
 
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs
index f4e90230..3a0eae43 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs
@@ -107,17 +107,31 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
             //});
             ClearAllRecipe = new RelayCommand(() =>  
             {
+                if (!MessageNotify.GetInstance.ShowDialog($"请确认，是否删除所有本地配方？",DialogType.Warning))
+                {
+                    return;
+                }
+
                 Json<LocalRecipe>.Data.Recipes.Clear();
                 Json<LocalRecipe>.Save();
+
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"本地配方已全部删除！");
+                MessageNotify.GetInstance.ShowUserLog($"手动清除所有配方。");
             });
 
             RemoveCommand = new RelayCommand<string>((recipeCode) => 
             {
+                if (!MessageNotify.GetInstance.ShowDialog($"请确认，是否删除配方【{recipeCode}】？",DialogType.Warning))
+                {
+                    return;
+                }
                 var res = Recipes.FirstOrDefault(p => p.RecipeCode == recipeCode);
                 if (res != null)
                 {
                     Recipes.Remove(res);
                     Json<LocalRecipe>.Save();
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"配方删除完成");
+                    MessageNotify.GetInstance.ShowUserLog($"手动删除【{res.RecipeName}】配方：【{recipeCode}】,");
                 }
             });
         }
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
index 0a6fc51b..b022f68a 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
@@ -41,6 +41,10 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                 {
                     if (GVL_BigStation.IsUseLocalRecipe)
                     {
+                        if (!MessageNotify.GetInstance.ShowDialog($"请确认，是否下发配方【{recipeName}】？"))
+                        {
+                            return;
+                        }
                         //配方下发逻辑
                         var res = Recipes.FirstOrDefault(p => p.RecipeName == recipeName);
                         if (res != null)
@@ -52,6 +56,10 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                                 MessageNotify.GetInstance.ShowRunLog($"手动下发配方:{recipeName}完成");
                                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"配方下发完成");
                             }
+                            else
+                            {
+                                NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "失败", $"配方下发失败，已下发过此配方。");
+                            }
                         }
                     }
                     else 

From e9a744847ce860b6c6b4de4ba9e52463c08e2938 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Wed, 7 Jun 2023 15:12:28 +0800
Subject: [PATCH 86/96] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E6=96=B9?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E7=95=8C=E9=9D=A2=E4=BB=A5=E5=8F=8A=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.JXJFoodBigStation/App.xaml     |   9 +-
 .../Model/ProcessControl.cs                   |   7 +-
 .../Model/RawMaterial/LocalRecipe.cs          |   1 +
 .../View/RecipeInfosView.xaml                 |   4 +-
 .../View/RecipeReceiveView.xaml               |  36 ++-
 .../View/RecipeReceiveView.xaml.cs            |   5 +
 .../View/RecipeSendDownView.xaml              |  15 +-
 .../View/SelectRecipesView.xaml               | 222 ++++++++++++++++++
 .../View/SelectRecipesView.xaml.cs            |  31 +++
 .../ViewModel/RecipeSendDownViewModel.cs      |  26 ++
 .../ViewModel/SelectRecipesViewModel.cs       | 114 +++++++++
 11 files changed, 456 insertions(+), 14 deletions(-)
 create mode 100644 BPASmartClient.JXJFoodBigStation/View/SelectRecipesView.xaml
 create mode 100644 BPASmartClient.JXJFoodBigStation/View/SelectRecipesView.xaml.cs
 create mode 100644 BPASmartClient.JXJFoodBigStation/ViewModel/SelectRecipesViewModel.cs

diff --git a/BPASmartClient.JXJFoodBigStation/App.xaml b/BPASmartClient.JXJFoodBigStation/App.xaml
index 368efbca..8b368652 100644
--- a/BPASmartClient.JXJFoodBigStation/App.xaml
+++ b/BPASmartClient.JXJFoodBigStation/App.xaml
@@ -17,7 +17,6 @@
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/BeveledRadioButtonStyle.xaml" />
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/DatePickeerDictionary.xaml" />
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecButtonStyle.xaml" />
-
                 <ResourceDictionary>
                     <con:ColorConverter x:Key="ColorConverter" />
                     <con:TextConverter x:Key="TextConverter" />
@@ -39,16 +38,16 @@
                         <ControlTemplate TargetType="{x:Type GroupItem}">
                             <Expander ExpandDirection="Down" IsExpanded="True">
                                 <Expander.Header>
-                                    <StackPanel Orientation="Horizontal" Margin="5,10">
+                                    <StackPanel Margin="5,10" Orientation="Horizontal">
                                         <TextBlock
                                             VerticalAlignment="Center"
-                                            FontSize="16"
+                                            FontSize="14"
                                             Foreground="White"
                                             Text="{Binding Path=Name}" />
                                         <TextBlock
                                             Margin="5,0,0,0"
                                             VerticalAlignment="Center"
-                                            FontSize="16"
+                                            FontSize="14"
                                             Foreground="White"
                                             Text="{Binding Path=ItemCount, StringFormat=数量:{0}个}" />
                                     </StackPanel>
@@ -59,6 +58,8 @@
                     </Setter.Value>
                 </Setter>
             </Style>
+
+            
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
index 2dc6d616..76a30277 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
@@ -1065,6 +1065,11 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                                 {
                                     GVL_BigStation.Order_CancelStep = 20;
                                 }
+                                //以下为新增，复位DB99托盘号，配方号，桶重量参数，以及配方下发确认和配料完成。
+                                StockBinParReset();
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX0.3", false);
+                                HKDevice.HK_PLC_S7.Write("DB99.DBX1.4", false);
+                                GVL_BigStation.Recipe1DosingFinish = false;
                             }
                             break;
                         case 10:
@@ -1102,7 +1107,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                             {
                                 Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);
                             });
-                            MessageNotify.GetInstance.ShowRunLog($"正在执行请求订单流程，配方还未到PLC，订单号：{GVL_BigStation.Order_CancelRecipeCode}");
+                            MessageNotify.GetInstance.ShowRunLog($"正在执行请求取消订单流程，配方还未到PLC，订单号：{GVL_BigStation.Order_CancelRecipeCode}");
                             GVL_BigStation.Order_Cancel = false;
                             GVL_BigStation.Order_CancelRecipeCode = "";
                             GVL_BigStation.Order_CancelStep = 0;
diff --git a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/LocalRecipe.cs b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/LocalRecipe.cs
index b00c6b2f..3c20a0e4 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/LocalRecipe.cs
+++ b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/LocalRecipe.cs
@@ -11,5 +11,6 @@ namespace BPASmartClient.JXJFoodBigStation.Model
     public class LocalRecipe
     {
         public ObservableCollection<RecipeData> Recipes { get; set; } = new ObservableCollection<RecipeData>();
+        public ObservableCollection<RecipeData> SelectedRecipes { get; set; } = new ObservableCollection<RecipeData>();
     }
 }
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml
index 6692a88d..a1d57384 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeInfosView.xaml
@@ -340,8 +340,8 @@
                         FontSize="16"
                         Foreground="Orange"
                         IsReadOnly="False"
-                        Text="{Binding RecipeCategory}"
-                        ItemsSource="{Binding Categorys}" />
+                        ItemsSource="{Binding Categorys}"
+                        Text="{Binding RecipeCategory}" />
                 </StackPanel>
                 <Grid>
                     <Grid.RowDefinitions>
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
index bdaa84f1..0dc1e74c 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
@@ -210,8 +210,9 @@
                 IsEnabled="True"
                 Style="{StaticResource IcoButtonStyle}" />
         </StackPanel>
-        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Hidden">
+        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Disabled">
             <ListBox
+                x:Name="recipeBox"
                 Grid.Row="2"
                 Margin="5"
                 VerticalAlignment="Top"
@@ -228,6 +229,14 @@
                     </ItemsPanelTemplate>
                 </ListBox.ItemsPanel>
 
+                <ListBox.GroupStyle>
+                    <GroupStyle>
+                        <GroupStyle.ContainerStyle>
+                            <Style BasedOn="{StaticResource ListBoxGroupStyle}" TargetType="{x:Type GroupItem}" />
+                        </GroupStyle.ContainerStyle>
+                    </GroupStyle>
+                </ListBox.GroupStyle>
+
                 <ListBox.ItemTemplate>
                     <DataTemplate>
 
@@ -284,16 +293,17 @@
                                 FontSize="12"
                                 Foreground="#FF2AB2E7"
                                 Text="{Binding RecipeName}" />
-
                             <TextBlock
-                                Grid.Row="2"
+                                Grid.Row="5"
                                 Grid.Column="0"
                                 Margin="2,5,0,0"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
                                 FontSize="12"
                                 Foreground="#FF2AB2E7"
-                                Text="配方编号：" />
+                                Text="配方类别：" />
+
+
 
                             <TextBlock
                                 Grid.Row="2"
@@ -391,6 +401,24 @@
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
                             </ScrollViewer>-->
+                            <TextBlock
+                                Grid.Row="5"
+                                Grid.Column="1"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="{Binding RecipeCategory}" />
+                            <TextBlock
+                                Grid.Row="2"
+                                Grid.Column="0"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="#FF2AB2E7"
+                                Text="配方编号：" />
 
                             <Image
                                 Grid.Row="6"
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml.cs b/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml.cs
index 1e6bf40b..812b8ef2 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml.cs
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml.cs
@@ -1,6 +1,7 @@
 using BPASmartClient.JXJFoodBigStation.Model;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -26,6 +27,10 @@ namespace BPASmartClient.JXJFoodBigStation.View
         {
             InitializeComponent();
             this.IsUseLocalRecipe.Click += (o, e) => { GVL_BigStation.IsUseLocalRecipe = (bool)IsUseLocalRecipe.IsChecked; };
+
+
+            ICollectionView cv = CollectionViewSource.GetDefaultView(recipeBox.ItemsSource);
+            cv.GroupDescriptions.Add(new PropertyGroupDescription("RecipeCategory"));
         }
     }
 }
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
index 56180ecc..b0370463 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeSendDownView.xaml
@@ -417,20 +417,29 @@
         </Style>
         <!--#endregion-->
     </UserControl.Resources>
+
     <Grid Margin="20">
 
         <Grid.ColumnDefinitions>
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-
-        <Grid Name="ggr" Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40" />
+            <RowDefinition Height="1*" />
+        </Grid.RowDefinitions>
+        <Button Content="筛选配方" Style="{StaticResource ButtonStyle}" Command="{Binding SelectRecipesCommand}" />
+
+        <Grid
+            Name="ggr"
+            Grid.Row="1"
+            Margin="10">
             <pry:ImageBorder Width="{Binding ElementName=ggr, Path=ActualWidth}" Height="{Binding ElementName=ggr, Path=ActualHeight}" />
             <ListBox
                 Margin="5"
                 VerticalAlignment="Top"
                 Background="Transparent"
                 BorderThickness="0"
-                ItemsSource="{Binding Recipes}"
+                ItemsSource="{Binding SelectedRecipes}"
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                 <ListBox.ItemsPanel>
                     <ItemsPanelTemplate>
diff --git a/BPASmartClient.JXJFoodBigStation/View/SelectRecipesView.xaml b/BPASmartClient.JXJFoodBigStation/View/SelectRecipesView.xaml
new file mode 100644
index 00000000..1f039b40
--- /dev/null
+++ b/BPASmartClient.JXJFoodBigStation/View/SelectRecipesView.xaml
@@ -0,0 +1,222 @@
+<Window
+    x:Class="BPASmartClient.JXJFoodBigStation.View.SelectRecipesView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Converter="clr-namespace:BPASmartClient.JXJFoodBigStation.Converter"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.JXJFoodBigStation.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
+    Title="SelectRecipesView"
+    Width="1000"
+    Height="620"
+    AllowsTransparency="True"
+    Background="{x:Null}"
+    Topmost="True"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
+
+    <Window.DataContext>
+        <vm:SelectRecipesViewModel />
+    </Window.DataContext>
+
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+
+            </ResourceDictionary.MergedDictionaries>
+            <!--修改了勾选的大小-->
+            <Style x:Key="CheckBoxLarge" TargetType="{x:Type CheckBox}">
+                <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+                <Setter Property="VerticalContentAlignment" Value="Center" />
+                <Setter Property="FocusVisualStyle">
+                    <Setter.Value>
+                        <Style>
+                            <Setter Property="Control.Template">
+                                <Setter.Value>
+                                    <ControlTemplate>
+                                        <Rectangle
+                                            Margin="1"
+                                            SnapsToDevicePixels="True"
+                                            Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                            StrokeDashArray="1 2"
+                                            StrokeThickness="1" />
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </Style>
+                    </Setter.Value>
+                </Setter>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type CheckBox}">
+                            <StackPanel
+                                Background="Transparent"
+                                Orientation="Horizontal"
+                                SnapsToDevicePixels="True">
+                                <Grid>
+                                    <Image
+                                        Width="24"
+                                        Height="28"
+                                        Source="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png" />
+                                    <Image
+                                        x:Name="image1"
+                                        Width="24"
+                                        Height="28"
+                                        Source="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png" />
+                                </Grid>
+                                <ContentPresenter
+                                    Margin="{TemplateBinding Padding}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Content="{TemplateBinding Content}"
+                                    ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                    RecognizesAccessKey="True"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            </StackPanel>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="HasContent" Value="True">
+                                    <Setter Property="FocusVisualStyle">
+                                        <Setter.Value>
+                                            <Style>
+                                                <Setter Property="Control.Template">
+                                                    <Setter.Value>
+                                                        <ControlTemplate>
+                                                            <Rectangle
+                                                                Margin="14,0,0,0"
+                                                                SnapsToDevicePixels="True"
+                                                                Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                                                StrokeDashArray="1 2"
+                                                                StrokeThickness="1" />
+                                                        </ControlTemplate>
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </Style>
+                                        </Setter.Value>
+                                    </Setter>
+                                    <Setter Property="Padding" Value="4,0,0,0" />
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                                </Trigger>
+                                <Trigger Property="IsChecked" Value="true">
+                                    <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/Cb_Checked.png" />
+                                </Trigger>
+                                <Trigger Property="IsChecked" Value="{x:Null}">
+                                    <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png" />
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
+        </ResourceDictionary>
+    </Window.Resources>
+    <Border
+        Name="br"
+        BorderBrush="#0CADF5"
+        BorderThickness="2">
+        <Border.Background>
+            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" />
+        </Border.Background>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="40" />
+                <RowDefinition Height="40" />
+                <RowDefinition Height="1*" />
+            </Grid.RowDefinitions>
+            <TextBlock
+                HorizontalAlignment="Center"
+                FontSize="35"
+                Text="配方筛选界面" />
+            <StackPanel
+                Grid.Row="1"
+                Margin="10,0"
+                HorizontalAlignment="Right"
+                Orientation="Horizontal">
+                <Button
+                    Width="100"
+                    Margin="20,0"
+                    Command="{Binding AllSelectCommand}"
+                    Content="全选" />
+                <Button
+                    Width="100"
+                    Margin="20,0"
+                    Command="{Binding AllCancelCommand}"
+                    Content="取消全选" />
+                <Button
+                    Width="100"
+                    Margin="20,0"
+                    Command="{Binding ConfirmCommand}"
+                    Content="确认选择" />
+                <Button
+                    Width="100"
+                    Margin="20,0"
+                    Command="{Binding CancelCommand}"
+                    Content="退出" />
+            </StackPanel>
+            <Border
+                Grid.Row="2"
+                BorderBrush="#FFA2C2E8"
+                BorderThickness="1">
+                <!--  视图显示  -->
+                <ListBox
+                    Margin="5"
+                    Background="Transparent"
+                    ItemsSource="{Binding AllRecipes}"
+                    ScrollViewer.VerticalScrollBarVisibility="Visible">
+                    
+                    <ListBox.GroupStyle>
+                        <GroupStyle>
+                            <GroupStyle.ContainerStyle>
+                                <Style BasedOn="{StaticResource ListBoxGroupStyle}" TargetType="{x:Type GroupItem}" />
+                            </GroupStyle.ContainerStyle>
+                        </GroupStyle>
+                    </ListBox.GroupStyle>
+
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Orientation="Vertical">
+                                <StackPanel Orientation="Horizontal">
+                                    <!--<CheckBox Margin="5" Command="{Binding DataContext.CheckCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}" IsChecked="{Binding IsSelected}">
+                                        <CheckBox.CommandParameter>
+                                            <MultiBinding Converter="{StaticResource CheckRecipeConverter}">
+                                                <Binding Path="IsChecked" RelativeSource="{RelativeSource Self}" />
+                                                <Binding Path="RecipeCode" />
+                                            </MultiBinding>
+                                        </CheckBox.CommandParameter>
+                                    </CheckBox>-->
+                                    <CheckBox
+                                        Margin="5"
+                                        IsChecked="{Binding IsSelected, Mode=TwoWay}" Style="{StaticResource CheckBoxLarge}"/>
+
+                                    <TextBlock
+                                        Margin="10"
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding Recipe.RecipeCode, StringFormat=配方编号：{0}}" />
+                                    <TextBlock
+                                        Margin="10,0"
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding Recipe.RecipeName, StringFormat=配方名称：{0}}" />
+                                </StackPanel>
+                                <Line
+                                    Stroke="#FFA2C2E8"
+                                    StrokeThickness="3"
+                                    X1="0"
+                                    X2="1000"
+                                    Y1="0"
+                                    Y2="0" />
+                            </StackPanel>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+            </Border>
+        </Grid>
+    </Border>
+</Window>
diff --git a/BPASmartClient.JXJFoodBigStation/View/SelectRecipesView.xaml.cs b/BPASmartClient.JXJFoodBigStation/View/SelectRecipesView.xaml.cs
new file mode 100644
index 00000000..86b3075e
--- /dev/null
+++ b/BPASmartClient.JXJFoodBigStation/View/SelectRecipesView.xaml.cs
@@ -0,0 +1,31 @@
+using BPASmartClient.Helper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.JXJFoodBigStation.View
+{
+    /// <summary>
+    /// SelectRecipesView.xaml 的交互逻辑
+    /// </summary>
+    public partial class SelectRecipesView : Window
+    {
+        public SelectRecipesView()
+        {
+            InitializeComponent();
+            this.br.MouseLeftButtonDown += (o, e) => { if (e.LeftButton == MouseButtonState.Pressed) this.DragMove(); };
+            ActionManage.GetInstance.CancelRegister("CloseSelectRecipesView");
+            ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "CloseSelectRecipesView");
+        }
+    }
+}
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
index b022f68a..78c4d6ee 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
@@ -4,6 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.Helper;
 using BPASmartClient.JXJFoodBigStation.Model;
 using BPASmartClient.JXJFoodBigStation.Model.Siemens;
+using BPASmartClient.JXJFoodBigStation.View;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
@@ -31,7 +32,16 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
         /// </summary>
         public static ObservableCollection<RecipeData> UserTreeCompelete { get; set; } = new ObservableCollection<RecipeData>();
 
+
+        /// <summary>
+        /// 筛选后的配方列表。
+        /// </summary>
+        public static ObservableCollection<RecipeData> SelectedRecipes { get; set; } = Json<LocalRecipe>.Data.SelectedRecipes;
+        
+
+
         public RelayCommand<string> StartCommand { get; set; }
+        public RelayCommand SelectRecipesCommand { get; set; }
 
         public RecipeSendDownViewModel()
         {
@@ -68,6 +78,22 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                     }
                 }
             });
+
+            SelectRecipesCommand = new RelayCommand(() =>
+            {
+                var selectView = new SelectRecipesView();
+                selectView.ShowDialog();
+
+                Json<LocalRecipe>.Data.SelectedRecipes.Clear();
+                foreach ( var recipe in SelectRecipesViewModel.SelectRecipes )
+                {
+                    if ( recipe != null && !Json<LocalRecipe>.Data.SelectedRecipes.Contains(recipe))
+                    {
+                        Json<LocalRecipe>.Data.SelectedRecipes.Add(recipe);
+                    }
+                    
+                }
+            });
         }
     }
 }
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/SelectRecipesViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/SelectRecipesViewModel.cs
new file mode 100644
index 00000000..88be8341
--- /dev/null
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/SelectRecipesViewModel.cs
@@ -0,0 +1,114 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.Helper;
+using BPASmartClient.JXJFoodBigStation.Model;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodBigStation.ViewModel
+{
+    internal class SelectRecipesViewModel:ObservableObject
+    {
+        public SelectRecipesViewModel()
+        {
+            AllRecipes = new();
+            foreach (var item in Json<LocalRecipe>.Data.SelectedRecipes)
+            {
+                SelectRecipes.Add(item);
+            }
+
+            if (Json<LocalRecipe>.Data.Recipes != null)
+            {
+                foreach (var item in Json<LocalRecipe>.Data.Recipes)
+                {
+                    AllRecipes.Add(new RecipeDataWithCheck()
+                    {
+                        Recipe = item,
+                        IsSelected = SelectRecipes.Any(p => p.RecipeCode == item.RecipeCode)
+                    });
+                }
+            }
+
+
+            ConfirmCommand = new(() =>
+            {
+                RefreshSelected();
+                ActionManage.GetInstance.Send("CloseSelectRecipesView");
+            });
+
+            CancelCommand = new(() =>
+            {
+                    ActionManage.GetInstance.Send("CloseSelectRecipesView");
+            });
+
+            AllSelectCommand = new(() =>
+            {
+                foreach (var item in AllRecipes)
+                {
+                    item.IsSelected = true;
+                }
+            });
+
+            AllCancelCommand = new(() =>
+            {
+                foreach (var item in AllRecipes)
+                {
+                    item.IsSelected = false;
+                }
+            });
+
+        }
+
+        private void RefreshSelected()
+        {
+            SelectRecipes.Clear();
+            foreach (var item in AllRecipes)
+            {
+                if (item.IsSelected==true)
+                {
+                    SelectRecipes.Add(item.Recipe);
+                }
+            }
+        }
+
+        public ObservableCollection<RecipeDataWithCheck> AllRecipes {get; set; }
+
+        public static ObservableCollection<RecipeData> SelectRecipes { get; set; } = new ObservableCollection<RecipeData>();
+
+        /// <summary>
+        /// 取消筛选，即关闭本窗口。
+        /// </summary>
+        public RelayCommand CancelCommand { get; set; }
+        /// <summary>
+        /// 全选。
+        /// </summary>
+        public RelayCommand AllSelectCommand { get; set; }
+        /// <summary>
+        /// 全部取消选择。
+        /// </summary>
+        public RelayCommand AllCancelCommand { get; set; }
+        /// <summary>
+        /// 确认选择。
+        /// </summary>
+        public RelayCommand ConfirmCommand { get; set; }
+
+
+        internal class RecipeDataWithCheck:ObservableObject
+        {
+            public RecipeData Recipe { get; set; }
+            private bool _IsSelected;
+
+            public bool IsSelected
+            {
+                get { return _IsSelected; }
+                set { _IsSelected = value; OnPropertyChanged(); }
+            }
+
+        }
+    }
+}

From 5f588b2339127535ef6afdfef0f120b2bf7838c6 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Wed, 7 Jun 2023 16:53:56 +0800
Subject: [PATCH 87/96] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E6=96=B9?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModel/RecipeSendDownViewModel.cs             | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
index 78c4d6ee..51b7f08b 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
@@ -36,7 +36,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
         /// <summary>
         /// 筛选后的配方列表。
         /// </summary>
-        public static ObservableCollection<RecipeData> SelectedRecipes { get; set; } = Json<LocalRecipe>.Data.SelectedRecipes;
+        public static ObservableCollection<RecipeData> SelectedRecipes { get; set; }
         
 
 
@@ -45,6 +45,9 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
 
         public RecipeSendDownViewModel()
         {
+
+            SelectedRecipes= Json<LocalRecipe>.Data.SelectedRecipes;
+
             StartCommand = new RelayCommand<string>((recipeName) => 
             {
                 if (recipeName != null)
@@ -59,7 +62,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                         var res = Recipes.FirstOrDefault(p => p.RecipeName == recipeName);
                         if (res != null)
                         {
-                            if (!Json<RemoteRecipe>.Data.Recipes.Contains(res))
+                            if (!Json<RemoteRecipe>.Data.Recipes.Any(p=>p.RecipeCode==res.RecipeCode))
                             {
                                 res.RecipesSource = RecipeSource.本地;
                                 Json<RemoteRecipe>.Data.Recipes.Add(res);
@@ -87,12 +90,13 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                 Json<LocalRecipe>.Data.SelectedRecipes.Clear();
                 foreach ( var recipe in SelectRecipesViewModel.SelectRecipes )
                 {
-                    if ( recipe != null && !Json<LocalRecipe>.Data.SelectedRecipes.Contains(recipe))
+                    if ( recipe != null && !Json<LocalRecipe>.Data.SelectedRecipes.Any(p=>p.RecipeCode==recipe.RecipeCode))
                     {
                         Json<LocalRecipe>.Data.SelectedRecipes.Add(recipe);
                     }
-                    
                 }
+                //不保存会导致下次打开本地配方下发页面，会重新读取之前存储的文件。
+                Json<LocalRecipe>.Save();
             });
         }
     }

From 31a506542ad99a556e1c90fd510469c918e16099 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Thu, 8 Jun 2023 14:06:00 +0800
Subject: [PATCH 88/96] =?UTF-8?q?=E5=B0=8F=E6=96=99=E7=AB=99=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD=E5=8F=8A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=85=8D=E6=96=B9=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BPASmartClient.JXJFoodSmallStation.csproj |   3 +
 .../Model/ProcessControl.cs                   |  39 +++-
 .../Model/Siemens/LocalRecipeDataColl.cs      |   4 +
 .../View/RecipeReceiveView.xaml               |   6 +-
 .../View/SelectRecipesView.xaml               | 221 ++++++++++++++++++
 .../View/SelectRecipesView.xaml.cs            |  31 +++
 .../ViewModel/NewLocalRecipeViewModel.cs      |  17 +-
 .../ViewModel/RecipeReceiveViewModel.cs       |  33 ++-
 .../ViewModel/SelectRecipesViewModel.cs       | 115 +++++++++
 9 files changed, 462 insertions(+), 7 deletions(-)
 create mode 100644 BPASmartClient.JXJFoodSmallStation/View/SelectRecipesView.xaml
 create mode 100644 BPASmartClient.JXJFoodSmallStation/View/SelectRecipesView.xaml.cs
 create mode 100644 BPASmartClient.JXJFoodSmallStation/ViewModel/SelectRecipesViewModel.cs

diff --git a/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj b/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
index 6c3c8aaa..53a1f31f 100644
--- a/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
+++ b/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
@@ -35,6 +35,9 @@
     <Compile Update="View\ManualFlowView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="View\SelectRecipesView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="View\StockBinRawMaterialView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index 2912495d..a7a6fbdf 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -1340,9 +1340,44 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             //将本地配方发送到西门子配方里，执行配料
             ActionManage.GetInstance.Register(new Action<Object>((res) =>
             {
-                if (res != null && res is RemoteRecipeData recipe)
+                if (res != null && res is RemoteRecipeData rm)
                 {
-                    Json<RemoteRecipeDataColl>.Data.Recipes.Add(recipe);
+                    //Json<RemoteRecipeDataColl>.Data.Recipes.Add(rm);
+                    var newRecipe=new RemoteRecipeData();
+                   newRecipe.RecipeName = rm.RecipeName;
+                   newRecipe.RecipeCode = rm.RecipeCode;
+                   newRecipe.TrayCode = rm.TrayCode;
+
+                    foreach (var item in rm.RawMaterial)
+                    {
+                        newRecipe.RawMaterial.Add(new RemoteRecipeRawMaterial()
+                        {
+                            DeviceIp = item.DeviceIp,
+                            RawMaterialName = item.RawMaterialName,
+                            RawMaterialBarrelNum = item.RawMaterialBarrelNum,
+                            RawMaterialType = item.RawMaterialType,
+                            RawMaterialWeight = item.RawMaterialWeight,
+                            Laying_Off_Weight = item.Laying_Off_Weight,
+                            StockBinRemainingWeight = item.StockBinRemainingWeight,
+                            RawMaterialLocation = item.RawMaterialLocation,
+                            IsDosingComple = item.IsDosingComple
+                        });
+                    }
+                    foreach (var item in rm.WindSend)
+                    {
+                        newRecipe.WindSend.Add(new WindSendRawMaterial()
+                        {
+                            DeviceIp = item.DeviceIp,
+                            Location=item.Location,
+                            RawMaterialChineseName = item.RawMaterialChineseName,
+                            RawMaterialName = item.RawMaterialName,
+                            RawMaterialWeight = item.RawMaterialWeight,
+                            DosingCompleWeight = item.DosingCompleWeight,
+                            RawMaterialBarrelNum = item.RawMaterialBarrelNum,
+                            RawMaterialType = item.RawMaterialType,
+                        });
+                    }
+                    Json<RemoteRecipeDataColl>.Data.Recipes.Add(newRecipe);
                 }
             }), "LocalSimulationRecipeIssue", true);
 
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/LocalRecipeDataColl.cs b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/LocalRecipeDataColl.cs
index 90e6184c..1405375d 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/LocalRecipeDataColl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/LocalRecipeDataColl.cs
@@ -10,5 +10,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.Siemens
     internal class LocalRecipeDataColl
     {
         public ObservableCollection<RemoteRecipeData> Recipes { get; set; } = new ObservableCollection<RemoteRecipeData>();
+        /// <summary>
+        /// 筛选后的配方显示集合。
+        /// </summary>
+        public ObservableCollection<RemoteRecipeData> SelectedRecipes { get; set; } = new ObservableCollection<RemoteRecipeData>();
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
index 07b8ba80..e6a4227a 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RecipeReceiveView.xaml
@@ -46,6 +46,7 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
+            <RowDefinition Height="40" />
             <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
@@ -111,13 +112,14 @@
                 IsEnabled="True"
                 Style="{StaticResource IcoButtonStyle}" />
         </StackPanel>
-        <ScrollViewer Grid.Row="1">
+        <Button Content="筛选配方" Style="{StaticResource ButtonStyle}" Command="{Binding SelectRecipesCommand}" Grid.Row="1"/>
+        <ScrollViewer Grid.Row="2">
             <ListView
                 Margin="5"
                 VerticalAlignment="Top"
                 Background="Transparent"
                 BorderThickness="0"
-                ItemsSource="{Binding Recipes}"
+                ItemsSource="{Binding SelectedRecipes}"
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                 <ListView.ItemsPanel>
                     <ItemsPanelTemplate>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/SelectRecipesView.xaml b/BPASmartClient.JXJFoodSmallStation/View/SelectRecipesView.xaml
new file mode 100644
index 00000000..d84962e8
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/View/SelectRecipesView.xaml
@@ -0,0 +1,221 @@
+<Window
+    x:Class="BPASmartClient.JXJFoodSmallStation.View.SelectRecipesView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.JXJFoodSmallStation.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
+    Title="SelectRecipesView"
+    Width="1000"
+    Height="620"
+    AllowsTransparency="True"
+    Background="{x:Null}"
+    Topmost="True"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
+
+    <Window.DataContext>
+        <vm:SelectRecipesViewModel />
+    </Window.DataContext>
+
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+
+            </ResourceDictionary.MergedDictionaries>
+            <!--修改了勾选的大小-->
+            <Style x:Key="CheckBoxLarge" TargetType="{x:Type CheckBox}">
+                <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+                <Setter Property="VerticalContentAlignment" Value="Center" />
+                <Setter Property="FocusVisualStyle">
+                    <Setter.Value>
+                        <Style>
+                            <Setter Property="Control.Template">
+                                <Setter.Value>
+                                    <ControlTemplate>
+                                        <Rectangle
+                                            Margin="1"
+                                            SnapsToDevicePixels="True"
+                                            Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                            StrokeDashArray="1 2"
+                                            StrokeThickness="1" />
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </Style>
+                    </Setter.Value>
+                </Setter>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type CheckBox}">
+                            <StackPanel
+                                Background="Transparent"
+                                Orientation="Horizontal"
+                                SnapsToDevicePixels="True">
+                                <Grid>
+                                    <Image
+                                        Width="24"
+                                        Height="28"
+                                        Source="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png" />
+                                    <Image
+                                        x:Name="image1"
+                                        Width="24"
+                                        Height="28"
+                                        Source="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png" />
+                                </Grid>
+                                <ContentPresenter
+                                    Margin="{TemplateBinding Padding}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Content="{TemplateBinding Content}"
+                                    ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                    RecognizesAccessKey="True"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            </StackPanel>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="HasContent" Value="True">
+                                    <Setter Property="FocusVisualStyle">
+                                        <Setter.Value>
+                                            <Style>
+                                                <Setter Property="Control.Template">
+                                                    <Setter.Value>
+                                                        <ControlTemplate>
+                                                            <Rectangle
+                                                                Margin="14,0,0,0"
+                                                                SnapsToDevicePixels="True"
+                                                                Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                                                StrokeDashArray="1 2"
+                                                                StrokeThickness="1" />
+                                                        </ControlTemplate>
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </Style>
+                                        </Setter.Value>
+                                    </Setter>
+                                    <Setter Property="Padding" Value="4,0,0,0" />
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                                </Trigger>
+                                <Trigger Property="IsChecked" Value="true">
+                                    <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/Cb_Checked.png" />
+                                </Trigger>
+                                <Trigger Property="IsChecked" Value="{x:Null}">
+                                    <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png" />
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
+        </ResourceDictionary>
+    </Window.Resources>
+    <Border
+        Name="br"
+        BorderBrush="#0CADF5"
+        BorderThickness="2">
+        <Border.Background>
+            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" />
+        </Border.Background>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="40" />
+                <RowDefinition Height="40" />
+                <RowDefinition Height="1*" />
+            </Grid.RowDefinitions>
+            <TextBlock
+                HorizontalAlignment="Center"
+                FontSize="35"
+                Text="配方筛选界面" />
+            <StackPanel
+                Grid.Row="1"
+                Margin="10,0"
+                HorizontalAlignment="Right"
+                Orientation="Horizontal">
+                <Button
+                    Width="100"
+                    Margin="20,0"
+                    Command="{Binding AllSelectCommand}"
+                    Content="全选" />
+                <Button
+                    Width="100"
+                    Margin="20,0"
+                    Command="{Binding AllCancelCommand}"
+                    Content="取消全选" />
+                <Button
+                    Width="100"
+                    Margin="20,0"
+                    Command="{Binding ConfirmCommand}"
+                    Content="确认选择" />
+                <Button
+                    Width="100"
+                    Margin="20,0"
+                    Command="{Binding CancelCommand}"
+                    Content="退出" />
+            </StackPanel>
+            <Border
+                Grid.Row="2"
+                BorderBrush="#FFA2C2E8"
+                BorderThickness="1">
+                <!--  视图显示  -->
+                <ListBox
+                    Margin="5"
+                    Background="Transparent"
+                    ItemsSource="{Binding AllRecipes}"
+                    ScrollViewer.VerticalScrollBarVisibility="Visible">
+                    
+                    <!--<ListBox.GroupStyle>
+                        <GroupStyle>
+                            <GroupStyle.ContainerStyle>
+                                <Style BasedOn="{StaticResource ListBoxGroupStyle}" TargetType="{x:Type GroupItem}" />
+                            </GroupStyle.ContainerStyle>
+                        </GroupStyle>
+                    </ListBox.GroupStyle>-->
+
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Orientation="Vertical">
+                                <StackPanel Orientation="Horizontal">
+                                    <!--<CheckBox Margin="5" Command="{Binding DataContext.CheckCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}" IsChecked="{Binding IsSelected}">
+                                        <CheckBox.CommandParameter>
+                                            <MultiBinding Converter="{StaticResource CheckRecipeConverter}">
+                                                <Binding Path="IsChecked" RelativeSource="{RelativeSource Self}" />
+                                                <Binding Path="RecipeCode" />
+                                            </MultiBinding>
+                                        </CheckBox.CommandParameter>
+                                    </CheckBox>-->
+                                    <CheckBox
+                                        Margin="5"
+                                        IsChecked="{Binding IsSelected, Mode=TwoWay}" Style="{StaticResource CheckBoxLarge}"/>
+
+                                    <TextBlock
+                                        Margin="10"
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding Recipe.RecipeCode, StringFormat=配方编号：{0}}" />
+                                    <TextBlock
+                                        Margin="10,0"
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding Recipe.RecipeName, StringFormat=配方名称：{0}}" />
+                                </StackPanel>
+                                <Line
+                                    Stroke="#FFA2C2E8"
+                                    StrokeThickness="3"
+                                    X1="0"
+                                    X2="1000"
+                                    Y1="0"
+                                    Y2="0" />
+                            </StackPanel>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+            </Border>
+        </Grid>
+    </Border>
+</Window>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/SelectRecipesView.xaml.cs b/BPASmartClient.JXJFoodSmallStation/View/SelectRecipesView.xaml.cs
new file mode 100644
index 00000000..d42c3e80
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/View/SelectRecipesView.xaml.cs
@@ -0,0 +1,31 @@
+using BPASmartClient.Helper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.JXJFoodSmallStation.View
+{
+    /// <summary>
+    /// SelectRecipesView.xaml 的交互逻辑
+    /// </summary>
+    public partial class SelectRecipesView : Window
+    {
+        public SelectRecipesView()
+        {
+            InitializeComponent();
+            this.br.MouseLeftButtonDown += (o, e) => { if (e.LeftButton == MouseButtonState.Pressed) this.DragMove(); };
+            ActionManage.GetInstance.CancelRegister("CloseSelectRecipesView");
+            ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "CloseSelectRecipesView");
+        }
+    }
+}
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
index 9d03c596..e3c90415 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
@@ -14,6 +14,7 @@ using System.Diagnostics;
 using BPASmartClient.JXJFoodSmallStation.Model.Siemens;
 using Google.Protobuf.WellKnownTypes;
 using Newtonsoft.Json.Linq;
+using BPASmartClient.CustomResource.Pages.Model;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -30,7 +31,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     RecipeName = rm.RecipeName;
                     RecipeCode = rm.RecipeCode;
                     TrayNum = rm.TrayCode;
-                    foreach (var item in rm.RawMaterial)
+                    foreach (RemoteRecipeRawMaterial item in rm.RawMaterial)
                     {
                         var res = Json<DevicePar>.Data.rawMaterialStockBin.FirstOrDefault(p => p.RawMaterialLocation == item.RawMaterialLocation);
                         if (res != null && !string.IsNullOrEmpty(res.RawMaterialName))
@@ -41,7 +42,15 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                                 item.RawMaterialName = temp.MaterialName;
                             }
                         }
-                        AllRawMaterial.Add(item);
+                        //AllRawMaterial.Add(item);
+                        AllRawMaterial.Add(new RemoteRecipeRawMaterial()
+                        {
+                            RawMaterialType = item.RawMaterialType,
+                            RawMaterialName = item.RawMaterialName,
+                            RawMaterialWeight = item.RawMaterialWeight,
+                            RawMaterialLocation = item.RawMaterialLocation,
+                            RawMaterialBarrelNum = item.RawMaterialBarrelNum,
+                        });
                     }
                     foreach (var item1 in rm.WindSend)
                     {
@@ -115,6 +124,10 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             });
             SaveCommand = new RelayCommand(() =>
             {
+                if (!MessageNotify.GetInstance.ShowDialog("请确认，是否保存该配方配置？"))
+                {
+                    return;
+                }
                 if (RecipeName.Length < 0 || RecipeName == null || RecipeName == String.Empty || RecipeName == "")
                 {
                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"配方名称不能为空");
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
index 302a7fce..fc0e185e 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
@@ -19,6 +19,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.JXJFoodSmallStation.Model.Siemens;
 using BPASmartClient.JXJFoodSmallStation.Model.GVL;
+using BPASmartClient.JXJFoodSmallStation.View;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -155,7 +156,31 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             });
             ClearAllRecipe = new RelayCommand(() =>
             {
-                Json<LocalRecipeDataColl>.Data.Recipes.Clear();
+                if (MessageNotify.GetInstance.ShowDialog("请确认，是否清除所有本地配方？", DialogType.Warning))
+                {
+                    Json<LocalRecipeDataColl>.Data.Recipes.Clear();
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"本地配方清空成功。");
+                    MessageNotify.GetInstance.ShowUserLog("手动清除所有本地配方");
+                }
+            });
+
+
+            SelectedRecipes = Json<LocalRecipeDataColl>.Data.SelectedRecipes;
+            SelectRecipesCommand = new RelayCommand(() =>
+            {
+                var selectView = new SelectRecipesView();
+                selectView.ShowDialog();
+
+                Json<LocalRecipeDataColl>.Data.SelectedRecipes.Clear();
+                foreach (var recipe in SelectRecipesViewModel.SelectRecipes)
+                {
+                    if (recipe != null && !Json<LocalRecipeDataColl>.Data.SelectedRecipes.Any(p => p.RecipeCode == recipe.RecipeCode))
+                    {
+                        Json<LocalRecipeDataColl>.Data.SelectedRecipes.Add(recipe);
+                    }
+                }
+                //不保存会导致下次打开本地配方下发页面，会重新读取之前存储的文件。
+                Json<LocalRecipeDataColl>.Save();
             });
         }
 
@@ -168,12 +193,18 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
         public bool IsUseWindSendDosing { get { return _mIsUseWindSendDosing; } set { _mIsUseWindSendDosing = value; OnPropertyChanged(); } }
         private bool _mIsUseWindSendDosing;
 
+        /// <summary>
+        /// 筛选后的配方列表。
+        /// </summary>
+        public static ObservableCollection<RemoteRecipeData> SelectedRecipes { get; set; }
+
         public RelayCommand<object> DetailsCommand { get; set; }
         public RelayCommand<object> IssueRecipe { get; set; }
         public RelayCommand<object> RemoveRecipe { get; set; }
         public RelayCommand NewSimulateRecipe { get; set; }
         public RelayCommand ClearAllRecipe { get; set; }
         public RelayCommand NewRecipe { get; set; }
+        public RelayCommand SelectRecipesCommand { get; set; }
         public ObservableCollection<RemoteRecipeData> Recipes { get; set; }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/SelectRecipesViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/SelectRecipesViewModel.cs
new file mode 100644
index 00000000..b5fec65e
--- /dev/null
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/SelectRecipesViewModel.cs
@@ -0,0 +1,115 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.Helper;
+using BPASmartClient.JXJFoodSmallStation.Model;
+using BPASmartClient.JXJFoodSmallStation.Model.Siemens;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.JXJFoodSmallStation.ViewModel
+{
+    internal class SelectRecipesViewModel:ObservableObject
+    {
+        public SelectRecipesViewModel()
+        {
+            AllRecipes = new();
+            foreach (var item in Json<LocalRecipeDataColl>.Data.SelectedRecipes)
+            {
+                SelectRecipes.Add(item);
+            }
+
+            if (Json<LocalRecipeDataColl>.Data.Recipes != null)
+            {
+                foreach (var item in Json<LocalRecipeDataColl>.Data.Recipes)
+                {
+                    AllRecipes.Add(new RecipeDataWithCheck()
+                    {
+                        Recipe = item,
+                        IsSelected = SelectRecipes.Any(p => p.RecipeCode == item.RecipeCode)
+                    });
+                }
+            }
+
+
+            ConfirmCommand = new(() =>
+            {
+                RefreshSelected();
+                ActionManage.GetInstance.Send("CloseSelectRecipesView");
+            });
+
+            CancelCommand = new(() =>
+            {
+                    ActionManage.GetInstance.Send("CloseSelectRecipesView");
+            });
+
+            AllSelectCommand = new(() =>
+            {
+                foreach (var item in AllRecipes)
+                {
+                    item.IsSelected = true;
+                }
+            });
+
+            AllCancelCommand = new(() =>
+            {
+                foreach (var item in AllRecipes)
+                {
+                    item.IsSelected = false;
+                }
+            });
+
+        }
+
+        private void RefreshSelected()
+        {
+            SelectRecipes.Clear();
+            foreach (var item in AllRecipes)
+            {
+                if (item.IsSelected==true)
+                {
+                    SelectRecipes.Add(item.Recipe);
+                }
+            }
+        }
+
+        public ObservableCollection<RecipeDataWithCheck> AllRecipes {get; set; }
+
+        public static ObservableCollection<RemoteRecipeData> SelectRecipes { get; set; } = new ObservableCollection<RemoteRecipeData>();
+
+        /// <summary>
+        /// 取消筛选，即关闭本窗口。
+        /// </summary>
+        public RelayCommand CancelCommand { get; set; }
+        /// <summary>
+        /// 全选。
+        /// </summary>
+        public RelayCommand AllSelectCommand { get; set; }
+        /// <summary>
+        /// 全部取消选择。
+        /// </summary>
+        public RelayCommand AllCancelCommand { get; set; }
+        /// <summary>
+        /// 确认选择。
+        /// </summary>
+        public RelayCommand ConfirmCommand { get; set; }
+
+
+        internal class RecipeDataWithCheck:ObservableObject
+        {
+            public RemoteRecipeData Recipe { get; set; }
+            private bool _IsSelected;
+
+            public bool IsSelected
+            {
+                get { return _IsSelected; }
+                set { _IsSelected = value; OnPropertyChanged(); }
+            }
+
+        }
+    }
+}

From 25fad3cb08bd745c6b22bbc0533cccfd6464fb25 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Thu, 8 Jun 2023 17:09:49 +0800
Subject: [PATCH 89/96] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E6=96=B9?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=9A=82=E6=97=B6=E7=A7=BB=E9=99=A4AGV=E9=80=81?=
 =?UTF-8?q?=E6=89=98=E7=9B=98=E5=91=BD=E4=BB=A4=E9=AA=8C=E8=AF=81=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/RecipeInfosView.xaml                 | 10 ++---
 .../ViewModel/ManualFlowViewModel.cs          |  8 +++-
 .../ViewModel/NewLocalRecipeViewModel.cs      |  2 +-
 .../ViewModel/RecipeInfosViewModel.cs         | 38 ++++++++++++++++++-
 4 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml
index 5dfcccfe..3338ebca 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml
@@ -199,35 +199,35 @@
                                                 Grid.Column="0"
                                                 HorizontalAlignment="Center"
                                                 VerticalAlignment="Top"
-                                                FontSize="20"
+                                                FontSize="16"
                                                 Foreground="#FF2AB2E7"
                                                 Text="{Binding RawMaterialName}" />
                                             <TextBlock
                                                 Grid.Column="1"
                                                 HorizontalAlignment="Center"
                                                 VerticalAlignment="Top"
-                                                FontSize="20"
+                                                FontSize="16"
                                                 Foreground="#FF2AB2E7"
                                                 Text="{Binding RawMaterialLocation}" />
                                             <TextBlock
                                                 Grid.Column="2"
                                                 HorizontalAlignment="Center"
                                                 VerticalAlignment="Top"
-                                                FontSize="20"
+                                                FontSize="16"
                                                 Foreground="#FF2AB2E7"
                                                 Text="{Binding RawMaterialBarrelNum}" />
                                             <TextBlock
                                                 Grid.Column="3"
                                                 HorizontalAlignment="Center"
                                                 VerticalAlignment="Top"
-                                                FontSize="20"
+                                                FontSize="16"
                                                 Foreground="#FF2AB2E7"
                                                 Text="{Binding RawMaterialWeight}" />
                                             <TextBlock
                                                 Grid.Column="4"
                                                 HorizontalAlignment="Center"
                                                 VerticalAlignment="Top"
-                                                FontSize="20"
+                                                FontSize="16"
                                                 Foreground="#FF2AB2E7"
                                                 Text="{Binding RawMaterialType}" />
                                         </Grid>
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
index 64c5a242..8ff56f43 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
@@ -28,6 +28,12 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             time = GVL_SmallStation.GetInstance.Time;
             Test1Command = new RelayCommand(() =>
             {
+                //if (!Delay.GetInstance("CanManualGetTray").Start(GVL_SmallStation.GetInstance.ManualIssueRecipe, 10))
+                //{
+                //    NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "提示", $"手动下发订单间隔不足10秒，请稍后再点击。");
+                //    return;
+                //}
+
                 ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX8.0", PlcVarType = PlcVarType.Bool, Value = true });
                 //Thread.Sleep(200);
                 //ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX8.0", PlcVarType = PlcVarType.Bool, Value = false });
@@ -40,7 +46,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 GVL_SmallStation.GetInstance.ManualIssueRecipe = false;
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV送托盘完成");
                 
-            }, () => { return Delay.GetInstance("CanManualGetTray").Start(GVL_SmallStation.GetInstance.ManualIssueRecipe, 10); });
+            });
 
             Test2Command = new RelayCommand(() =>
             {
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
index e3c90415..8acdb26e 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
@@ -58,7 +58,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                         var res = Json<DevicePar>.Data.windSendRawMaterial.FirstOrDefault(p => p.Location == item1.Location);
                         if (res != null)
                         {
-                            item1.RawMaterialName = res.RawMaterialName;
+                            item1.RawMaterialName = res.RawMaterialChineseName;
                         }
 
                         AllRawMaterial.Add(new RemoteRecipeRawMaterial()
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeInfosViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeInfosViewModel.cs
index 94751f12..807a7733 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeInfosViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeInfosViewModel.cs
@@ -27,11 +27,45 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     TrayCode = rm.TrayCode;
                     foreach (var item in rm.RawMaterial)
                     {
-                        RawMaterialsInfo.Add(item);
+                        //RawMaterialsInfo.Add(item);
+
+                        var res = Json<DevicePar>.Data.rawMaterialStockBin.FirstOrDefault(p => p.RawMaterialLocation == item.RawMaterialLocation);
+                        if (res != null && !string.IsNullOrEmpty(res.RawMaterialName))
+                        {
+                            var temp = Json<DevicePar>.Data.BomMaterial.FirstOrDefault(p => p.MaterialCode == res.RawMaterialName);
+                            if (temp != null && !string.IsNullOrEmpty(temp.MaterialName))
+                            {
+                                item.RawMaterialName = temp.MaterialName;
+                            }
+                        }
+                        RawMaterialsInfo.Add(new RemoteRecipeRawMaterial()
+                        {
+                            RawMaterialType = item.RawMaterialType,
+                            RawMaterialName = item.RawMaterialName,
+                            RawMaterialWeight = item.RawMaterialWeight,
+                            RawMaterialLocation = item.RawMaterialLocation,
+                            RawMaterialBarrelNum = item.RawMaterialBarrelNum,
+                        });
                     }
                     foreach (var item1 in rm.WindSend)
                     {
-                        RawMaterialsInfo.Add(new RemoteRecipeRawMaterial() { RawMaterialName= item1.RawMaterialName, RawMaterialLocation= item1.Location,RawMaterialBarrelNum= item1.RawMaterialBarrelNum,RawMaterialWeight= item1.RawMaterialWeight,RawMaterialType=item1.RawMaterialType});
+                        // RawMaterialsInfo.Add(new RemoteRecipeRawMaterial() { RawMaterialName= item1.RawMaterialName, RawMaterialLocation= item1.Location,RawMaterialBarrelNum= item1.RawMaterialBarrelNum,RawMaterialWeight= item1.RawMaterialWeight,RawMaterialType=item1.RawMaterialType});
+                       
+                        var res = Json<DevicePar>.Data.windSendRawMaterial.FirstOrDefault(p => p.Location == item1.Location);
+                        if (res != null)
+                        {
+                            item1.RawMaterialName = res.RawMaterialChineseName;
+                        }
+
+                        RawMaterialsInfo.Add(new RemoteRecipeRawMaterial()
+                        {
+                            RawMaterialType = item1.RawMaterialType,
+                            RawMaterialName = item1.RawMaterialName,
+                            RawMaterialWeight = item1.RawMaterialWeight,
+                            RawMaterialLocation = item1.Location,
+                            RawMaterialBarrelNum = item1.RawMaterialBarrelNum,
+                        });
+
                     }
                 }
             }), "RecipeInfo");

From d99b65c58745a77b6ff2b709d5dbc930bab7134d Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Fri, 9 Jun 2023 09:56:13 +0800
Subject: [PATCH 90/96] =?UTF-8?q?=E5=B0=8F=E6=96=99=E7=AB=99=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E6=89=8B=E5=8A=A8AGV=E9=80=81=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E8=A6=81=E6=B1=82=E5=88=A4=E5=AE=9A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/GVL_SmallStation.cs                       |  5 ++---
 .../ViewModel/ManualFlowViewModel.cs                | 13 ++++++-------
 .../ViewModel/RecipeReceiveViewModel.cs             |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
index 4ec45a75..b8660926 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
@@ -353,10 +353,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// </summary>
         public byte RobotProgramNum { get; set; } = 0;
         /// <summary>
-        /// 手动下发订单。
+        /// 最近一次下发订单的时间
         /// </summary>
-        [VarComm("Global","手动下发订单")]
-        public bool ManualIssueRecipe { get; set; }=false;
+        public DateTime LatestIssueRecipe { get; set; } = new DateTime(2023, 5, 1, 00, 00, 00);
         #endregion
     }
     public enum IssueRecipeCondition
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
index 8ff56f43..61a5c88c 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs
@@ -28,12 +28,12 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             time = GVL_SmallStation.GetInstance.Time;
             Test1Command = new RelayCommand(() =>
             {
-                //if (!Delay.GetInstance("CanManualGetTray").Start(GVL_SmallStation.GetInstance.ManualIssueRecipe, 10))
-                //{
-                //    NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "提示", $"手动下发订单间隔不足10秒，请稍后再点击。");
-                //    return;
-                //}
-
+                if (DateTime.Now.Subtract(GVL_SmallStation.GetInstance.LatestIssueRecipe).TotalSeconds<=10)
+                {
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "提示", $"最后一次手动下发订单间隔不足10秒，请稍后再点击。");
+                    return;
+                }
+                
                 ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX8.0", PlcVarType = PlcVarType.Bool, Value = true });
                 //Thread.Sleep(200);
                 //ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX8.0", PlcVarType = PlcVarType.Bool, Value = false });
@@ -43,7 +43,6 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 VisibilityBtn1 = Visibility.Hidden;
                 VisibilityBtn2 = Visibility.Visible;
                 VisibilityBtn3 = Visibility.Hidden;
-                GVL_SmallStation.GetInstance.ManualIssueRecipe = false;
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV送托盘完成");
                 
             });
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
index fc0e185e..0b012811 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
@@ -97,7 +97,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{res.RecipeName}配方下发成功!");
                                 MessageNotify.GetInstance.ShowUserLog($"下发本地模拟配方——{res.RecipeName}");
                             }
-                            GVL_SmallStation.GetInstance.ManualIssueRecipe = true;
+                            GVL_SmallStation.GetInstance.LatestIssueRecipe=DateTime.Now;
                         }
                     }
                 }

From 0ba654067c040c6bb97d4f39ccc26eb53c0c5d06 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Fri, 9 Jun 2023 17:09:01 +0800
Subject: [PATCH 91/96] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E9=85=8D=E6=96=99=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=EF=BC=8C=E5=B9=B6=E5=81=9A=E7=AE=80=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BPASmartClient.CustomResource.csproj      |    2 +-
 BPASmartClient.FoodStationTest/App.config     |    9 +
 BPASmartClient.FoodStationTest/App.xaml       |   37 +
 BPASmartClient.FoodStationTest/App.xaml.cs    |  349 +++++
 .../AssemblyInfo.cs                           |   10 +
 .../BPASmartClient.FoodStationTest.csproj     |  101 ++
 .../Model/Bom/BomMaterial.cs                  |   16 +
 .../Model/Bom/BomMaterialData.cs              |   10 +
 .../Converter/DataTableRedundantConverter.cs  |   27 +
 .../Model/Converter/RunStatusConvert.cs       |   71 +
 .../Model/GVL/GVL.cs                          |    6 +
 .../Model/GVL/PlcInfos.cs                     |   22 +
 .../Model/GVL/ReadSmallMaterial.cs            |  111 ++
 .../Model/GVL/VarCommAttribute.cs             |   16 +
 .../Model/GVL/WriteSmallMaterial.cs           |  179 +++
 .../Model/GVL_SmallStation.cs                 |  366 +++++
 .../Model/HK_PLC/HKDeviceRead.cs              |   10 +
 .../Model/HK_PLC/HKDeviceStatus.cs            |  183 +++
 .../Model/HK_PLC/HKDeviceWrite.cs             |   17 +
 .../Model/HK_PLC/HKPlcCommAddress.cs          |  134 ++
 .../Model/HK_PLC/PlcManualComm.cs             |   12 +
 .../Model/HK_PLC/PlcReadAddressDB3.cs         |   80 ++
 .../Model/HK_PLC/PlcReadAddressDB45.cs        |   52 +
 .../Model/Par/ConnectParMode.cs               |   28 +
 .../Model/ProcessControl.cs                   | 1236 +++++++++++++++++
 .../Model/RawMaterial/ActionMenu.cs           |   22 +
 .../Model/RawMaterial/AlarmInfo.cs            |   43 +
 .../Model/RawMaterial/ConveyorServer.cs       |   10 +
 .../Model/RawMaterial/CylinderStatusModel.cs  |   22 +
 .../Model/RawMaterial/DeviceAddress.cs        |  114 ++
 .../Model/RawMaterial/DeviceCurrentStatus.cs  |   25 +
 .../Model/RawMaterial/DeviceInquire.cs        |  443 ++++++
 .../Model/RawMaterial/DevicePar.cs            |   18 +
 .../Model/RawMaterial/DeviceParModel.cs       |   73 +
 .../Model/RawMaterial/GlobalData.cs           |    7 +
 .../Model/RawMaterial/LocaPar.cs              |   13 +
 .../Model/RawMaterial/RawMaterialColl.cs      |   94 ++
 .../RawMaterial/RawMaterialDeviceStatus.cs    |   59 +
 .../Model/RawMaterial/RawMaterialStockBin.cs  |   24 +
 .../Model/RawMaterial/RecipeModel.cs          |   50 +
 .../Model/RawMaterial/RecipeProcess.cs        |   15 +
 .../Model/Recipe/LocalRecipeDataColl.cs       |   13 +
 .../Model/Recipe/RemoteRecipeData.cs          |   31 +
 .../Model/Recipe/RemoteRecipeDataColl.cs      |   11 +
 .../Model/Recipe/RemoteRecipeRawMaterial.cs   |   49 +
 .../Model/TestData.cs                         |  105 ++
 .../Model/VarMonitor.cs                       |   26 +
 .../Resource/MyStyle.xaml                     |  113 ++
 .../View/BomOfMaterialView.xaml               |  377 +++++
 .../View/BomOfMaterialView.xaml.cs            |   15 +
 .../View/ChangeDeviceNameView.xaml            |  122 ++
 .../View/ChangeDeviceNameView.xaml.cs         |   21 +
 .../View/DeviceListView.xaml                  |  195 +++
 .../View/DeviceListView.xaml.cs               |   15 +
 .../View/DeviceMaterialParView.xaml           |  284 ++++
 .../View/DeviceMaterialParView.xaml.cs        |   15 +
 .../View/HardwareStatusView.xaml              |  232 ++++
 .../View/HardwareStatusView.xaml.cs           |   15 +
 .../View/ManualCommView.xaml                  |  174 +++
 .../View/ManualCommView.xaml.cs               |   15 +
 .../View/ManualControlView.xaml               |  628 +++++++++
 .../View/ManualControlView.xaml.cs            |   15 +
 .../View/ManualFlowView.xaml                  |  507 +++++++
 .../View/ManualFlowView.xaml.cs               |   15 +
 .../View/NewLocalRecipeView.xaml              |  412 ++++++
 .../View/NewLocalRecipeView.xaml.cs           |   24 +
 .../View/NewMaterialView.xaml                 |  175 +++
 .../View/NewMaterialView.xaml.cs              |   23 +
 .../View/NewRecipeView.xaml                   |  238 ++++
 .../View/NewRecipeView.xaml.cs                |   22 +
 .../View/PlcVarMonitorView.xaml               |  202 +++
 .../View/PlcVarMonitorView.xaml.cs            |   15 +
 .../View/ProcessMonitorView.xaml              |  177 +++
 .../View/ProcessMonitorView.xaml.cs           |   15 +
 .../View/RecipeControlView.xaml               |  802 +++++++++++
 .../View/RecipeControlView.xaml.cs            |   44 +
 .../View/RecipeInfosView.xaml                 |  248 ++++
 .../View/RecipeInfosView.xaml.cs              |   21 +
 .../View/RecipeReceiveView.xaml               |  228 +++
 .../View/RecipeReceiveView.xaml.cs            |   20 +
 .../View/RecipeSettingsView.xaml              |  289 ++++
 .../View/RecipeSettingsView.xaml.cs           |   34 +
 .../View/RobotView.xaml                       |  308 ++++
 .../View/RobotView.xaml.cs                    |   15 +
 .../View/SelectRecipesView.xaml               |  221 +++
 .../View/SelectRecipesView.xaml.cs            |   21 +
 .../View/SiemensRecipeReceiveView.xaml        |  150 ++
 .../View/SiemensRecipeReceiveView.xaml.cs     |   15 +
 .../View/StockBinRawMaterialView.xaml         |  173 +++
 .../View/StockBinRawMaterialView.xaml.cs      |   15 +
 .../View/SystemParView.xaml                   |  308 ++++
 .../View/SystemParView.xaml.cs                |   15 +
 .../View/WindSendParView.xaml                 |  218 +++
 .../View/WindSendParView.xaml.cs              |   16 +
 .../ViewModel/BomOfMaterialViewModel.cs       |   77 +
 .../ViewModel/ChangeDeviceNameViewModel.cs    |   72 +
 .../ViewModel/DeviceListViewModel.cs          |   68 +
 .../ViewModel/DeviceMaterialParViewModel.cs   |   65 +
 .../ViewModel/HardwareStatusViewModel.cs      |   24 +
 .../ViewModel/ManualCommViewModel.cs          |   29 +
 .../ViewModel/ManualControlViewModel.cs       |  423 ++++++
 .../ViewModel/ManualFlowViewModel.cs          |  380 +++++
 .../ViewModel/NewLocalRecipeViewModel.cs      |  220 +++
 .../ViewModel/NewMaterialViewModel.cs         |   58 +
 .../ViewModel/NewRecipeViewModel.cs           |  186 +++
 .../ViewModel/PlcVarMonitorViewModel.cs       |   16 +
 .../ViewModel/ProcessMonitorViewModel.cs      |   16 +
 .../ViewModel/RecipeControlViewModel.cs       |  212 +++
 .../ViewModel/RecipeInfosViewModel.cs         |   68 +
 .../ViewModel/RecipeReceiveViewModel.cs       |  199 +++
 .../ViewModel/RecipeSettingsViewModel.cs      |   77 +
 .../ViewModel/RobotViewModel.cs               |  129 ++
 .../ViewModel/SelectRecipesViewModel.cs       |  109 ++
 .../SiemensRecipeReceiveViewModel.cs          |   47 +
 .../ViewModel/StockBinRawMaterialViewModel.cs |   50 +
 .../ViewModel/SystemParViewModel.cs           |   85 ++
 .../ViewModel/WindSendParViewModel.cs         |   22 +
 BPASmartClient.FoodStationTest/hbl.ico        |  Bin 0 -> 4286 bytes
 SmartClient.sln                               |   25 +-
 119 files changed, 14228 insertions(+), 2 deletions(-)
 create mode 100644 BPASmartClient.FoodStationTest/App.config
 create mode 100644 BPASmartClient.FoodStationTest/App.xaml
 create mode 100644 BPASmartClient.FoodStationTest/App.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/AssemblyInfo.cs
 create mode 100644 BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj
 create mode 100644 BPASmartClient.FoodStationTest/Model/Bom/BomMaterial.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/Bom/BomMaterialData.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/Converter/DataTableRedundantConverter.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/Converter/RunStatusConvert.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/GVL/GVL.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/GVL/PlcInfos.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/GVL/ReadSmallMaterial.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/GVL/VarCommAttribute.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/GVL/WriteSmallMaterial.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/GVL_SmallStation.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceRead.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceStatus.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceWrite.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/HK_PLC/HKPlcCommAddress.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/HK_PLC/PlcManualComm.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/HK_PLC/PlcReadAddressDB3.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/HK_PLC/PlcReadAddressDB45.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/ProcessControl.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/ActionMenu.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/AlarmInfo.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/ConveyorServer.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/CylinderStatusModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceAddress.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceCurrentStatus.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceInquire.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/DevicePar.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceParModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/GlobalData.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/LocaPar.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialColl.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialDeviceStatus.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialStockBin.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeProcess.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/Recipe/LocalRecipeDataColl.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeData.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeDataColl.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeRawMaterial.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/TestData.cs
 create mode 100644 BPASmartClient.FoodStationTest/Model/VarMonitor.cs
 create mode 100644 BPASmartClient.FoodStationTest/Resource/MyStyle.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/BomOfMaterialView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/BomOfMaterialView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/ChangeDeviceNameView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/ChangeDeviceNameView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/DeviceListView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/DeviceListView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/DeviceMaterialParView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/DeviceMaterialParView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/HardwareStatusView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/HardwareStatusView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/ManualCommView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/ManualCommView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/ManualControlView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/ManualControlView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/ManualFlowView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/ManualFlowView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/NewLocalRecipeView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/NewLocalRecipeView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/NewMaterialView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/NewMaterialView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/NewRecipeView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/NewRecipeView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/PlcVarMonitorView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/PlcVarMonitorView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/ProcessMonitorView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/ProcessMonitorView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/RecipeControlView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/RecipeControlView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/RecipeInfosView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/RecipeInfosView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/RecipeSettingsView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/RecipeSettingsView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/RobotView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/RobotView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/SelectRecipesView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/SelectRecipesView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/SiemensRecipeReceiveView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/SiemensRecipeReceiveView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/StockBinRawMaterialView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/StockBinRawMaterialView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/SystemParView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/SystemParView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/View/WindSendParView.xaml
 create mode 100644 BPASmartClient.FoodStationTest/View/WindSendParView.xaml.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/BomOfMaterialViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/ChangeDeviceNameViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/DeviceListViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/DeviceMaterialParViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/HardwareStatusViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/ManualCommViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/ManualControlViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/ManualFlowViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/NewLocalRecipeViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/NewMaterialViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/NewRecipeViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/PlcVarMonitorViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/ProcessMonitorViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/RecipeControlViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/RecipeInfosViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/RecipeReceiveViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/RecipeSettingsViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/RobotViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/SelectRecipesViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/SiemensRecipeReceiveViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/StockBinRawMaterialViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/SystemParViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/ViewModel/WindSendParViewModel.cs
 create mode 100644 BPASmartClient.FoodStationTest/hbl.ico

diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
index 222df551..bf927934 100644
--- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
+++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
@@ -459,7 +459,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.54" />
+    <PackageReference Include="BPA.Helper" Version="1.0.62" />
     <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
diff --git a/BPASmartClient.FoodStationTest/App.config b/BPASmartClient.FoodStationTest/App.config
new file mode 100644
index 00000000..a50b26f3
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/App.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<appSettings>
+		<add key="RawMaterial_IP" value="107.107.2."/>
+		<add key="HKPlc_IP" value="107.107.2.88"/>
+		<add key="Siemens_IP" value="107.107.2.200"/>
+		<add key="WindSend_IP" value="107.107.2.210"/>
+	</appSettings>
+</configuration>
\ No newline at end of file
diff --git a/BPASmartClient.FoodStationTest/App.xaml b/BPASmartClient.FoodStationTest/App.xaml
new file mode 100644
index 00000000..5b23a45f
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/App.xaml
@@ -0,0 +1,37 @@
+<Application
+    x:Class="BPASmartClient.FoodStationTest.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:con="clr-namespace:BPASmartClient.CustomResource.Converters;assembly=BPASmartClient.CustomResource"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecCheckBox.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecTitleBarButton.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/GlobalStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecComboBox.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecIcoButtonStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecToggleButton.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/BeveledRadioButtonStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/DatePickeerDictionary.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecButtonStyle.xaml" />
+
+                <ResourceDictionary>
+                    <con:ColorConverter x:Key="ColorConverter" />
+                    <con:TextConverter x:Key="TextConverter" />
+                    <con:VisibleTypeConverter x:Key="VisibleTypeConverter" />
+                    <con:StatusConverter x:Key="StatusConverter" />
+                    <con:StringToIconConverter x:Key="StringToIconConverter" />
+                </ResourceDictionary>
+
+                <ResourceDictionary>
+                    <ImageBrush x:Key="hbl" ImageSource="/BPASmartClient.CustomResource;component/Image/HBL.png" />
+                    <ImageBrush x:Key="dbxt" ImageSource="/BPASmartClient.CustomResource;component/Image/顶部线条.png" />
+                </ResourceDictionary>
+
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/BPASmartClient.FoodStationTest/App.xaml.cs b/BPASmartClient.FoodStationTest/App.xaml.cs
new file mode 100644
index 00000000..bd3ba7a8
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/App.xaml.cs
@@ -0,0 +1,349 @@
+using BPASmartClient.CustomResource.Pages.Enums;
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.CustomResource.Pages.View;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.Helper;
+using System;
+using System.Collections.ObjectModel;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace BPASmartClient.FoodStationTest
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+        public static Window MainWindow;
+        public EventWaitHandle ProgramStarted { get; set; }
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            bool createNew;
+            ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, "SmallStationApp", out createNew);
+            if (!createNew)
+            {
+                MessageBox.Show("程序已启动");
+                App.Current.Shutdown();
+                Environment.Exit(0);
+            }
+            BPASmartClient.Helper.SystemHelper.GetInstance.CreateDesktopShortcut();
+            base.OnStartup(e);
+
+            MenuInit();
+            DataInit();
+            Init();
+            MainView mv = new MainView();
+            mv.TitleName = "自动化产线-小料站上位机控制系统";
+            LoginView lv = new LoginView();
+            var res = lv.ShowDialog();
+            if (res != null && res == true)
+            {
+                MessageNotify.GetInstance.ShowUserLog("用户登录");
+                mv.Show();
+            }
+            else
+                mv.Close();
+            GVL_SmallStation.GetInstance.RecipeDosingCompleNum = Json<LocaPar>.Data.RecipeDosingCompleNum;
+            MainWindow = mv;
+        }
+        private async void Init()
+        {
+            await Task.Run(new Action(() =>
+            {
+                DeviceInquire.GetInstance.Init();//配料机设备上线监听，设备列表初始化
+                ProcessControl.GetInstance.Init();
+            }));
+        }
+
+        protected override void OnExit(ExitEventArgs e)
+        {
+            base.OnExit(e);
+            Json<LocaPar>.Data.RecipeDosingCompleNum = GVL_SmallStation.GetInstance.RecipeDosingCompleNum;
+            Json<LocaPar>.Save();
+            Json<LocalRecipeDataColl>.Save();
+            Json<RemoteRecipeDataColl>.Save();
+            MessageNotify.GetInstance.LogSave();
+            ThreadManage.GetInstance().Dispose();
+        }
+
+        private void MenuInit()
+        {
+            //NfcServer.GetInstance.Init();
+
+            #region 配方管理菜单
+            ObservableCollection<SubMenumodel> RecipeManage = new ObservableCollection<SubMenumodel>();
+            //RecipeManage.Add(new SubMenumodel()
+            //{
+            //    SubMenuName = "味魔方配方管理",
+            //    SubMenuPermission = new Permission[] { Permission.管理员 },
+            //    AssemblyName = "BPASmartClient.FoodStationTest",
+            //    ToggleWindowPath = "View.RecipeSettingsView"
+            //});
+
+            //RecipeManage.Add(new SubMenumodel()
+            //{
+            //    SubMenuName = "味魔方配方下发",
+            //    SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员 },
+            //    AssemblyName = "BPASmartClient.FoodStationTest",
+            //    ToggleWindowPath = "View.RecipeControlView"
+            //});
+            RecipeManage.Add(new SubMenumodel()
+            {
+                SubMenuName = "本地配方管理",
+                SubMenuPermission = new Permission[] { Permission.管理员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.RecipeReceiveView"
+            });
+            RecipeManage.Add(new SubMenumodel()
+            {
+                SubMenuName = "西门子配方管理",
+                SubMenuPermission = new Permission[] { Permission.管理员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.SiemensRecipeReceiveView"
+            });
+            MenuManage.GetInstance.menuModels.Add(new MenuModel()
+            {
+                MainMenuIcon = "&#xe683;",
+                MainMenuName = "配方管理",
+                Alias = "Recipe Management",
+                subMenumodels = RecipeManage,
+            });
+            #endregion
+
+            #region 参数设置
+            ObservableCollection<SubMenumodel> ParSet = new ObservableCollection<SubMenumodel>();
+            ParSet.Add(new SubMenumodel()
+            {
+                SubMenuName = "味魔方参数设置",
+                SubMenuPermission = new Permission[] { Permission.管理员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.DeviceMaterialParView"
+            });
+            ParSet.Add(new SubMenumodel()
+            {
+                SubMenuName = "粉仓参数设置",
+                SubMenuPermission = new Permission[] { Permission.管理员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.WindSendParView"
+            });
+            ParSet.Add(new SubMenumodel()
+            {
+                SubMenuName = "系统参数设置",
+                SubMenuPermission = new Permission[] { Permission.管理员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.SystemParView"
+            });
+            ParSet.Add(new SubMenumodel()
+            {
+                SubMenuName = "原料与料仓管理",
+                SubMenuPermission = new Permission[] { Permission.管理员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.StockBinRawMaterialView"
+            });
+            ParSet.Add(new SubMenumodel()
+            {
+                SubMenuName = "西门子物料管理",
+                SubMenuPermission = new Permission[] { Permission.管理员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.BomOfMaterialView"
+            });
+
+            MenuManage.GetInstance.menuModels.Add(new MenuModel()
+            {
+                MainMenuIcon = "&#xe62d;",
+                MainMenuName = "参数设置",
+                Alias = "Parameter Set",
+                subMenumodels = ParSet,
+            });
+            #endregion
+
+            #region 手动控制
+            ObservableCollection<SubMenumodel> ManualControl = new ObservableCollection<SubMenumodel>();
+            ManualControl.Add(new SubMenumodel()
+            {
+                SubMenuName = "手动控制硬件",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.ManualControlView"
+            });
+            /*ManualControl.Add(new SubMenumodel()
+            {
+                SubMenuName = "手动控制信号",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.ManualCommView"
+
+            });*/
+            ManualControl.Add(new SubMenumodel()
+            {
+                SubMenuName = "手动控制流程",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.ManualFlowView"
+
+            });
+            ManualControl.Add(new SubMenumodel()
+            {
+                SubMenuName = "机器人设备控制",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.RobotView"
+
+            });
+
+            MenuManage.GetInstance.menuModels.Add(new MenuModel()
+            {
+                MainMenuIcon = "&#xe622;",
+                MainMenuName = "手动控制",
+                Alias = "Parameter Set",
+                subMenumodels = ManualControl,
+            });
+            #endregion
+
+            #region 消息日志
+            ObservableCollection<SubMenumodel> InfoLog = new ObservableCollection<SubMenumodel>();
+            InfoLog.Add(new SubMenumodel()
+            {
+                SubMenuName = "操作日志",
+                SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.UserLogView"
+            });
+
+            InfoLog.Add(new SubMenumodel()
+            {
+                SubMenuName = "运行日志",
+                SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.RunLogView"
+            });
+
+            InfoLog.Add(new SubMenumodel()
+            {
+                SubMenuName = "配方日志",
+                SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.RecipeCompleteView"
+            });
+
+            InfoLog.Add(new SubMenumodel()
+            {
+                SubMenuName = "报警记录",
+                SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.AlarmView"
+            });
+
+            InfoLog.Add(new SubMenumodel()
+            {
+                SubMenuName = "调试日志",
+                SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.DebugLogView"
+            });
+
+            MenuManage.GetInstance.menuModels.Add(new MenuModel()
+            {
+                MainMenuIcon = "&#xe668;",
+                MainMenuName = "消息日志",
+                Alias = "Message Log",
+                subMenumodels = InfoLog,
+            });
+            #endregion
+
+            #region 硬件设备监控
+            ObservableCollection<SubMenumodel> DeviceMonitor = new ObservableCollection<SubMenumodel>();
+            DeviceMonitor.Add(new SubMenumodel()
+            {
+                SubMenuName = "原料设备列表",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.DeviceListView"
+            });
+            DeviceMonitor.Add(new SubMenumodel()
+            {
+                SubMenuName = "Plc变量监控",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.PlcVarMonitorView"
+            });
+            DeviceMonitor.Add(new SubMenumodel()
+            {
+                SubMenuName = "流程变量监控",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.ProcessMonitorView"
+            });
+            DeviceMonitor.Add(new SubMenumodel()
+            {
+                SubMenuName = "设备状态",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.FoodStationTest",
+                ToggleWindowPath = "View.HardwareStatusView"
+            });
+
+            MenuManage.GetInstance.menuModels.Add(new MenuModel()
+            {
+                MainMenuIcon = "&#xe603;",
+                MainMenuName = "设备监控",
+                Alias = "Device Monitor",
+                subMenumodels = DeviceMonitor,
+            });
+            #endregion
+
+            #region 用户管理
+            ObservableCollection<SubMenumodel> UserManager = new ObservableCollection<SubMenumodel>();
+            UserManager.Add(new SubMenumodel()
+            {
+                SubMenuName = "用户登录",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.SubPagLoginView"
+            });
+
+            UserManager.Add(new SubMenumodel()
+            {
+                SubMenuName = "密码修改",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.PasswordChangeView"
+            });
+            UserManager.Add(new SubMenumodel()
+            {
+                SubMenuName = "用户管理",
+                SubMenuPermission = new Permission[] { Permission.管理员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.UserManagerView"
+            });
+
+            /* UserManager.Add(new SubMenumodel()
+             {
+                 SubMenuName = "NFC登录设置",
+                 SubMenuPermission = new Permission[] { Permission.管理员 },
+                 AssemblyName = "BPASmartClient.CustomResource",
+                 ToggleWindowPath = "Pages.View.NfcSetView"
+             });*/
+
+            MenuManage.GetInstance.menuModels.Add(new MenuModel()
+            {
+                MainMenuIcon = "&#xe66d;",
+                MainMenuName = "用户管理",
+                Alias = "User Management",
+                subMenumodels = UserManager,
+            });
+            #endregion
+        }
+
+        private void DataInit()
+        {
+            //Config.GetInstance.Init();
+            Json<LocaPar>.Read();
+            Json<DevicePar>.Read();
+            Json<LocalRecipeDataColl>.Read();
+            Json<RemoteRecipeDataColl>.Read();
+        }
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/AssemblyInfo.cs b/BPASmartClient.FoodStationTest/AssemblyInfo.cs
new file mode 100644
index 00000000..8b5504ec
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj b/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj
new file mode 100644
index 00000000..abe64643
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj
@@ -0,0 +1,101 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="hbl.ico" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="hbl.ico" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BPA.Communication" Version="1.0.104" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BPASmartClient.CustomResource\BPASmartClient.CustomResource.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="View\BomOfMaterialView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="View\ManualFlowView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="View\RobotView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="View\SelectRecipesView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="View\StockBinRawMaterialView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="View\BomOfMaterialView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\ChangeDeviceNameView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\DeviceListView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\DeviceMaterialParView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\HardwareStatusView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\ManualCommView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\ManualControlView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\ManualFlowView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\NewLocalRecipeView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\NewMaterialView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\NewRecipeView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\RecipeControlView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\RecipeSettingsView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\RobotView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\SiemensRecipeReceiveView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\StockBinRawMaterialView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\SystemParView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="View\WindSendParView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+  </ItemGroup>
+
+</Project>
diff --git a/BPASmartClient.FoodStationTest/Model/Bom/BomMaterial.cs b/BPASmartClient.FoodStationTest/Model/Bom/BomMaterial.cs
new file mode 100644
index 00000000..7a3d72e6
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/Bom/BomMaterial.cs
@@ -0,0 +1,16 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace BPASmartClient.FoodStationTest.Model.Bom
+{
+    public class BomMaterial : ObservableObject
+    {
+        public int Count { get { return _count; } set { _count = value; OnPropertyChanged(); } }
+        public int _count { get; set; }
+
+        public string MaterialCode { get { return _materialCode; } set { _materialCode = value; OnPropertyChanged(); } }
+        private string _materialCode = "";
+
+        public string MaterialName { get { return _materialName; } set { _materialName = value; OnPropertyChanged(); } }
+        private string _materialName = "";
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/Bom/BomMaterialData.cs b/BPASmartClient.FoodStationTest/Model/Bom/BomMaterialData.cs
new file mode 100644
index 00000000..858ca849
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/Bom/BomMaterialData.cs
@@ -0,0 +1,10 @@
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.FoodStationTest.Model.Bom
+{
+    public class BomMaterialData
+    {
+        public ObservableCollection<BomMaterial> Materials { get; set; } = new ObservableCollection<BomMaterial>();
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/Converter/DataTableRedundantConverter.cs b/BPASmartClient.FoodStationTest/Model/Converter/DataTableRedundantConverter.cs
new file mode 100644
index 00000000..b16725f2
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/Converter/DataTableRedundantConverter.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace BPASmartClient.FoodStationTest.Converter
+{
+    public class DataTableRedundantConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value != null && value is bool bit)
+            {
+                if (bit)
+                    return new SolidColorBrush(Color.FromArgb(255, 245, 63, 98));
+                else
+                    return new SolidColorBrush(Color.FromArgb(255, 42, 178, 231));
+            }
+            return default;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/Converter/RunStatusConvert.cs b/BPASmartClient.FoodStationTest/Model/Converter/RunStatusConvert.cs
new file mode 100644
index 00000000..1addccd1
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/Converter/RunStatusConvert.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace BPASmartClient.FoodStationTest.Converter
+{
+    public class RunStatusConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is ushort tempValue)
+            {
+                if (tempValue == 1)
+                    return "等待配料";
+                if (tempValue == 2)
+                    return "配料中";
+                if (tempValue == 3)
+                    return "配料完成";
+            }
+            return "等待配料";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public class EnbleConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is ushort tempValue)
+            {
+                if (tempValue == 0)
+                    return true;
+                if (tempValue == 1)
+                    return false;
+
+            }
+            return true;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public class IntToSourceConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is ushort tempValue)
+            {
+                if (tempValue == 0)
+                    return "本地原料";
+                if (tempValue == 1)
+                    return "设备原料";
+
+            }
+            return "未知";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+}
diff --git a/BPASmartClient.FoodStationTest/Model/GVL/GVL.cs b/BPASmartClient.FoodStationTest/Model/GVL/GVL.cs
new file mode 100644
index 00000000..e918fcf4
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/GVL/GVL.cs
@@ -0,0 +1,6 @@
+namespace BPASmartClient.FoodStationTest.Model.GVL
+{
+    public class GVL
+    {
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/GVL/PlcInfos.cs b/BPASmartClient.FoodStationTest/Model/GVL/PlcInfos.cs
new file mode 100644
index 00000000..f5ff018d
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/GVL/PlcInfos.cs
@@ -0,0 +1,22 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace BPASmartClient.FoodStationTest.Model.GVL
+{
+    public class PlcInfos : ObservableObject
+    {
+        public int Count { get { return _Count; } set { _Count = value; OnPropertyChanged(); } }
+        private int _Count { get; set; }
+
+        public string Name { get { return _Name; } set { _Name = value; OnPropertyChanged(); } }
+        private string _Name { get; set; }
+        public string Address { get { return _Address; } set { _Address = value; OnPropertyChanged(); } }
+        private string _Address { get; set; }
+        public string Type { get { return _Type; } set { _Type = value; OnPropertyChanged(); } }
+        private string _Type { get; set; }
+        public string Describe { get { return _Describe; } set { _Describe = value; OnPropertyChanged(); } }
+        private string _Describe { get; set; }
+        public string Value { get { return _Value; } set { _Value = value; OnPropertyChanged(); } }
+        private string _Value { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/GVL/ReadSmallMaterial.cs b/BPASmartClient.FoodStationTest/Model/GVL/ReadSmallMaterial.cs
new file mode 100644
index 00000000..70702c4c
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/GVL/ReadSmallMaterial.cs
@@ -0,0 +1,111 @@
+namespace BPASmartClient.FoodStationTest.Model.GVL
+{
+    public class ReadSmallMaterial
+    {
+        /// <summary>
+        /// PLC到上位机心跳
+        /// </summary>
+        public bool Heart { get; set; }
+        public bool Agv1 { get; set; }
+        public bool Agv2 { get; set; }
+        public bool Agv3 { get; set; }
+        public bool Agv4 { get; set; }
+        public bool Agv5 { get; set; }
+        public bool Agv6 { get; set; }
+        /// <summary>
+        /// 1#托盘工位占用
+        /// </summary>
+        public bool Tray1BeOccupied { get; set; }
+        /// <summary>
+        /// 2#托盘工位占用
+        /// </summary>
+        public bool Tray2BeOccupied { get; set; }
+        /// <summary>
+        /// 1#托盘工位配料完成
+        /// </summary>
+        public bool Tray1MaterialFinish { get; set; }
+        /// <summary>
+        /// 2#托盘工位配料完成
+        /// </summary>
+        public bool Tray2MaterialFinish { get; set; }
+        /// <summary>
+        /// 接收托盘1配方数据完成
+        /// </summary>
+        public bool Tray1ReceiveFinish { get; set; }
+        /// <summary>
+        /// 接收托盘2配方数据完成
+        /// </summary>
+        public bool Tray2ReceiveFinish { get; set; }
+
+        public int Reserve1 { get; set; }
+        public int Receive2 { get; set; }
+        /// <summary>
+        /// 托盘1_1#桶位置反馈
+        /// </summary>
+        public float Tray1Barrel1Location { get; set; }
+        /// <summary>
+        /// 托盘1_2#桶位置反馈
+        /// </summary>
+        public float Tray1Barrel2Location { get; set; }
+        /// <summary>
+        /// 托盘1_3#桶位置反馈
+        /// </summary>
+        public float Tray1Barrel3Location { get; set; }
+        /// <summary>
+        /// 托盘1_4#桶位置反馈
+        /// </summary>
+        public float Tray1Barrel4Location { get; set; }
+        /// <summary>
+        /// 托盘2_1#桶位置反馈
+        /// </summary>
+        public float Tray2Barrel1Location { get; set; }
+        /// <summary>
+        /// 托盘2_2#桶位置反馈
+        /// </summary>
+        public float Tray2Barrel2Location { get; set; }
+        /// <summary>
+        /// 托盘2_3#桶位置反馈
+        /// </summary>
+        public float Tray2Barrel3Location { get; set; }
+        /// <summary>
+        /// 托盘2_4#桶位置反馈
+        /// </summary>
+        public float Tray2Barrel4Location { get; set; }
+
+        public int Reserve3 { get; set; }
+        public int Receive4 { get; set; }
+        /// <summary>
+        /// 托盘1_1#桶允许配料
+        /// </summary>
+        public float Tray1Barrel1AllowDosing { get; set; }
+        /// <summary>
+        /// 托盘1_2#桶允许配料
+        /// </summary>
+        public float Tray1Barrel2AllowDosing { get; set; }
+        /// <summary>
+        /// 托盘1_3#桶允许配料
+        /// </summary>
+        public float Tray1Barrel3AllowDosing { get; set; }
+        /// <summary>
+        /// 托盘1_4#桶允许配料
+        /// </summary>
+        public float Tray1Barrel4AllowDosing { get; set; }
+        /// <summary>
+        /// 托盘2_1#桶允许配料
+        /// </summary>
+        public float Tray2Barrel1AllowDosing { get; set; }
+        /// <summary>
+        /// 托盘2_2#桶允许配料
+        /// </summary>
+        public float Tray2Barrel2AllowDosing { get; set; }
+        /// <summary>
+        /// 托盘2_3#桶允许配料
+        /// </summary>
+        public float Tray2Barrel3AllowDosing { get; set; }
+        /// <summary>
+        /// 托盘2_4#桶允许配料
+        /// </summary>
+        public float Tray2Barrel4AllowDosing { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/GVL/VarCommAttribute.cs b/BPASmartClient.FoodStationTest/Model/GVL/VarCommAttribute.cs
new file mode 100644
index 00000000..6e43e369
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/GVL/VarCommAttribute.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace BPASmartClient.FoodStationTest.Model.GVL
+{
+    [AttributeUsage(AttributeTargets.Property)]
+    public sealed class VarCommAttribute : Attribute
+    {
+        public VarCommAttribute(string address, string des)
+        {
+            Address = address;
+            Describe = des;
+        }
+        public string Describe { get; set; }
+        public string Address { get; set; }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/GVL/WriteSmallMaterial.cs b/BPASmartClient.FoodStationTest/Model/GVL/WriteSmallMaterial.cs
new file mode 100644
index 00000000..6db4ed80
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/GVL/WriteSmallMaterial.cs
@@ -0,0 +1,179 @@
+namespace BPASmartClient.FoodStationTest.Model.GVL
+{
+    public class WriteSmallMaterial
+    {
+        /// <summary>
+        /// PLC到上位机心跳
+        /// </summary>
+        public bool Heart { get; set; }
+        public bool Agv1 { get; set; }
+        public bool Agv2 { get; set; }
+        public bool Agv3 { get; set; }
+        public bool Agv4 { get; set; }
+        public bool Agv5 { get; set; }
+        public bool Agv6 { get; set; }
+        public bool Agv7 { get; set; }
+        public bool Agv8 { get; set; }
+        public bool Agv9 { get; set; }
+        public bool Agv10 { get; set; }
+        /// <summary>
+        /// 下发配方到托盘1
+        /// </summary>
+        public bool Tray1IssueRecipe { get; set; }
+        /// <summary>
+        /// 下发配方到托盘2
+        /// </summary>
+        public bool Tray2IssueRecipe { get; set; }
+        public int Reserve1 { get; set; }
+        public int Receive2 { get; set; }
+
+
+        public bool Tray1Barrel1IsDosing1;
+        public bool Tray1Barrel1IsDosing2;
+        public bool Tray1Barrel1IsDosing3;
+        public bool Tray1Barrel1IsDosing4;
+        public bool Tray1Barrel1IsDosing5;
+        public bool Tray1Barrel1IsDosing6;
+        public bool Tray1Barrel1IsDosing7;
+        public bool Tray1Barrel1IsDosing8;
+        public bool Tray1Barrel1IsDosing9;
+        public bool Tray1Barrel1IsDosing10;
+        public bool Tray1Barrel1IsDosing11;
+        public bool Tray1Barrel1IsDosing12;
+        public bool Tray1Barrel1IsDosing13;
+        public bool Tray1Barrel1IsDosing14;
+        public bool Tray1Barrel1IsDosing15;
+        public bool Receive3;
+        public bool Tray1Barrel2IsDosing1;
+        public bool Tray1Barrel2IsDosing2;
+        public bool Tray1Barrel2IsDosing3;
+        public bool Tray1Barrel2IsDosing4;
+        public bool Tray1Barrel2IsDosing5;
+        public bool Tray1Barrel2IsDosing6;
+        public bool Tray1Barrel2IsDosing7;
+        public bool Tray1Barrel2IsDosing8;
+        public bool Tray1Barrel2IsDosing9;
+        public bool Tray1Barrel2IsDosing10;
+        public bool Tray1Barrel2IsDosing11;
+        public bool Tray1Barrel2IsDosing12;
+        public bool Tray1Barrel2IsDosing13;
+        public bool Tray1Barrel2IsDosing14;
+        public bool Tray1Barrel2IsDosing15;
+        public bool Receive4;
+        public bool Tray1Barrel3IsDosing1;
+        public bool Tray1Barrel3IsDosing2;
+        public bool Tray1Barrel3IsDosing3;
+        public bool Tray1Barrel3IsDosing4;
+        public bool Tray1Barrel3IsDosing5;
+        public bool Tray1Barrel3IsDosing6;
+        public bool Tray1Barrel3IsDosing7;
+        public bool Tray1Barrel3IsDosing8;
+        public bool Tray1Barrel3IsDosing9;
+        public bool Tray1Barrel3IsDosing10;
+        public bool Tray1Barrel3IsDosing11;
+        public bool Tray1Barrel3IsDosing12;
+        public bool Tray1Barrel3IsDosing13;
+        public bool Tray1Barrel3IsDosing14;
+        public bool Tray1Barrel3IsDosing15;
+        public bool Receive5;
+        public bool Tray1Barrel4IsDosing1;
+        public bool Tray1Barrel4IsDosing2;
+        public bool Tray1Barrel4IsDosing3;
+        public bool Tray1Barrel4IsDosing4;
+        public bool Tray1Barrel4IsDosing5;
+        public bool Tray1Barrel4IsDosing6;
+        public bool Tray1Barrel4IsDosing7;
+        public bool Tray1Barrel4IsDosing8;
+        public bool Tray1Barrel4IsDosing9;
+        public bool Tray1Barrel4IsDosing10;
+        public bool Tray1Barrel4IsDosing11;
+        public bool Tray1Barrel4IsDosing12;
+        public bool Tray1Barrel4IsDosing13;
+        public bool Tray1Barrel4IsDosing14;
+        public bool Tray1Barrel4IsDosing15;
+        public bool Receive6;
+
+        public bool Tray2Barrel1IsDosing1;
+        public bool Tray2Barrel1IsDosing2;
+        public bool Tray2Barrel1IsDosing3;
+        public bool Tray2Barrel1IsDosing4;
+        public bool Tray2Barrel1IsDosing5;
+        public bool Tray2Barrel1IsDosing6;
+        public bool Tray2Barrel1IsDosing7;
+        public bool Tray2Barrel1IsDosing8;
+        public bool Tray2Barrel1IsDosing9;
+        public bool Tray2Barrel1IsDosing10;
+        public bool Tray2Barrel1IsDosing11;
+        public bool Tray2Barrel1IsDosing12;
+        public bool Tray2Barrel1IsDosing13;
+        public bool Tray2Barrel1IsDosing14;
+        public bool Tray2Barrel1IsDosing15;
+        public bool Receive7;
+        public bool Tray2Barrel2IsDosing1;
+        public bool Tray2Barrel2IsDosing2;
+        public bool Tray2Barrel2IsDosing3;
+        public bool Tray2Barrel2IsDosing4;
+        public bool Tray2Barrel2IsDosing5;
+        public bool Tray2Barrel2IsDosing6;
+        public bool Tray2Barrel2IsDosing7;
+        public bool Tray2Barrel2IsDosing8;
+        public bool Tray2Barrel2IsDosing9;
+        public bool Tray2Barrel2IsDosing10;
+        public bool Tray2Barrel2IsDosing11;
+        public bool Tray2Barrel2IsDosing12;
+        public bool Tray2Barrel2IsDosing13;
+        public bool Tray2Barrel2IsDosing14;
+        public bool Tray2Barrel2IsDosing15;
+        public bool Receive8;
+        public bool Tray2Barrel3IsDosing1;
+        public bool Tray2Barrel3IsDosing2;
+        public bool Tray2Barrel3IsDosing3;
+        public bool Tray2Barrel3IsDosing4;
+        public bool Tray2Barrel3IsDosing5;
+        public bool Tray2Barrel3IsDosing6;
+        public bool Tray2Barrel3IsDosing7;
+        public bool Tray2Barrel3IsDosing8;
+        public bool Tray2Barrel3IsDosing9;
+        public bool Tray2Barrel3IsDosing10;
+        public bool Tray2Barrel3IsDosing11;
+        public bool Tray2Barrel3IsDosing12;
+        public bool Tray2Barrel3IsDosing13;
+        public bool Tray2Barrel3IsDosing14;
+        public bool Tray2Barrel3IsDosing15;
+        public bool Receive9;
+        public bool Tray2Barrel4IsDosing1;
+        public bool Tray2Barrel4IsDosing2;
+        public bool Tray2Barrel4IsDosing3;
+        public bool Tray2Barrel4IsDosing4;
+        public bool Tray2Barrel4IsDosing5;
+        public bool Tray2Barrel4IsDosing6;
+        public bool Tray2Barrel4IsDosing7;
+        public bool Tray2Barrel4IsDosing8;
+        public bool Tray2Barrel4IsDosing9;
+        public bool Tray2Barrel4IsDosing10;
+        public bool Tray2Barrel4IsDosing11;
+        public bool Tray2Barrel4IsDosing12;
+        public bool Tray2Barrel4IsDosing13;
+        public bool Tray2Barrel4IsDosing14;
+        public bool Tray2Barrel4IsDosing15;
+        public bool Receive10;
+        public int Receive11;
+
+        public bool StockIn1DosingFinish;
+        public bool StockIn2DosingFinish;
+        public bool StockIn3DosingFinish;
+        public bool StockIn4DosingFinish;
+        public bool StockIn5DosingFinish;
+        public bool StockIn6DosingFinish;
+        public bool StockIn7DosingFinish;
+        public bool StockIn8DosingFinish;
+        public bool StockIn9DosingFinish;
+        public bool StockIn10DosingFinish;
+        public bool StockIn11DosingFinish;
+        public bool StockIn12DosingFinish;
+        public bool StockIn13DosingFinish;
+        public bool StockIn14DosingFinish;
+        public bool StockIn15DosingFinish;
+        public bool Receive12;
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/GVL_SmallStation.cs b/BPASmartClient.FoodStationTest/Model/GVL_SmallStation.cs
new file mode 100644
index 00000000..875b839a
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/GVL_SmallStation.cs
@@ -0,0 +1,366 @@
+using BPASmartClient.FoodStationTest.Model.GVL;
+using BPASmartClient.FoodStationTest.Model.HK_PLC;
+using System;
+using System.Collections.Concurrent;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class GVL_SmallStation
+    {
+        private volatile static GVL_SmallStation SmallStation;
+        public static GVL_SmallStation GetInstance => SmallStation ?? (SmallStation = new GVL_SmallStation());
+        private GVL_SmallStation() { }
+
+        public PlcReadAddressDB3 plcReadDataDB3 { get; set; } = new PlcReadAddressDB3();
+
+        /// <summary>
+        /// 配料站料仓数目
+        /// </summary>
+        public const int Max_DosingSotckBinNum = 15;
+        /// <summary>
+        /// 风送料仓数目
+        /// </summary>
+        public const int Max_PowderSotckBinNum = 5;
+
+        [VarComm("Global", "订单取消")]
+        /// <summary>
+        /// 订单取消
+        /// </summary>
+        public bool Order_Cancel { get; set; }
+
+        [VarComm("Global", "订单取消的配方编号")]
+        /// <summary>
+        /// 订单取消的配方编号
+        /// </summary>
+        public string Order_CancelRecipeCode { get; set; } = "";
+
+        [VarComm("Global", "柔性配料料仓配料下发情况")]
+        /// <summary>
+        /// 料仓配料情况
+        /// </summary>
+        public bool[] PlcAllowIssueRecipe { get; set; } = new bool[5] { false, false, false, false, false };
+
+        [VarComm("Global", "柔性配料料仓,气缸顶起状态")]
+        /// <summary>
+        /// 柔性配料料仓,气缸顶起状态
+        /// </summary>
+        public ushort StockBinCylinderStatus { get; set; }
+
+        [VarComm("Global", "柔性配料料仓配料下发情况")]
+        /// <summary>
+        /// 料仓配料情况
+        /// </summary>
+        public ushort[] StockBinDosingIssue { get; set; } = new ushort[5] { 0, 0, 0, 0, 0 };
+        [VarComm("Global", "柔性配料料仓配料下发情况")]
+        /// <summary>
+        /// 料仓配料情况
+        /// </summary>
+        public ushort[] RecipeStockBinDosing { get; set; } = new ushort[5] { 0, 0, 0, 0, 0 };
+
+        [VarComm("Global", "柔性配料料仓配料情况")]
+        /// <summary>
+        /// 料仓配料情况
+        /// </summary>
+        public ushort StockBinDosing { get; set; } = 0;
+
+        [VarComm("Global", "托盘1托盘到位情况0:未到位,1=AGV到位,2=托盘有货架,3=AGV取托盘完成")]
+        /// <summary>
+        /// 托盘1托盘到位情况
+        /// </summary>
+        public int Tray1LogicFinish { get; set; } = 0;
+
+        [VarComm("Global", "托盘1托盘到位情况0:未到位,1=AGV到位,2=托盘有货架,3=AGV取托盘完成")]
+        /// <summary>
+        /// 托盘1托盘到位情况
+        /// </summary>
+        public int[] Tray_AGVLogic { get; set; } = new int[5] { 0, 0, 0, 0, 0 };
+
+        [VarComm("Global", "托盘2托盘到位情况0:未到位,1=AGV到位,2=托盘有货架,3=AGV取托盘完成")]
+        /// <summary>
+        /// 托盘2托盘到位 逻辑完成
+        /// </summary>
+        public int Tray2LogicFinish { get; set; } = 0;
+
+        [VarComm("Global", "托盘1有货架")]
+        /// <summary>
+        /// 托盘1有货架
+        /// </summary>
+        public bool Station1HaveTray { get; set; }
+
+
+        [VarComm("Global", "托盘2有货架")]
+        /// <summary>
+        /// 托盘2有货架
+        /// </summary>
+        public bool Station2HaveTray { get; set; }
+
+
+        [VarComm("Global", "托盘1传感器信号")]
+        /// <summary>
+        /// 托盘1传感器信号
+        /// </summary>
+        public bool Station1Sensor { get; set; }
+
+        [VarComm("Global", "托盘2传感器信号")]
+        /// <summary>
+        /// 托盘2传感器信号
+        /// </summary>
+        public bool Station2Sensor { get; set; }
+
+
+        [VarComm("Global", "托盘1气缸信号")]
+        /// <summary>
+        /// 托盘1气缸信号
+        /// </summary>
+        public bool Station1Cylinder { get; set; }
+
+        [VarComm("Global", "托盘2气缸信号")]
+        /// <summary>
+        /// 托盘2气缸信号
+        /// </summary>
+        public bool Station2Cylinder { get; set; }
+
+        [VarComm("Global", "AGV放托盘1完成")]
+        /// <summary>
+        /// AGV放托盘1完成
+        /// </summary>
+        public bool AGV_PutTray1Finish { get; set; }
+
+        [VarComm("Global", "AGV取托盘1完成")]
+        /// <summary>
+        /// AGV取托盘1完成
+        /// </summary>
+        public bool AGV_GetTray1Finish { get; set; }
+
+        [VarComm("Global", "AGV放托盘2完成")]
+        /// <summary>
+        /// AGV放托盘1完成
+        /// </summary>
+        public bool AGV_PutTray2Finish { get; set; }
+
+        [VarComm("Global", "AGV取托盘2完成")]
+        /// <summary>
+        /// AGV取托盘2完成
+        /// </summary>
+        public bool AGV_GetTray2Finish { get; set; }
+
+        [VarComm("Global", "托盘1气缸复位")]
+        /// <summary>
+        /// 托盘1气缸复位
+        /// </summary>
+        public bool CylinderReset { get; set; }
+
+        [VarComm("Global", "发送给plc的心跳")]
+        /// <summary>
+        /// 发送给plc的心跳
+        /// </summary>
+        public bool HeartBeatToPlc { get; set; } = false;
+
+        [VarComm("Global", "屏蔽小料站料仓不足15个报警")]
+
+
+        public bool DisEnableStockAlarm { get; set; } = false;
+
+        [VarComm("Global", "配方制作完成数量")]
+        /// <summary>
+        /// 配方制作完成数量
+        /// </summary>
+        public int RecipeDosingCompleNum { get; set; } = 0;
+
+        [VarComm("Global", "来自plc的心跳")]
+
+
+        /// <summary>
+        /// 来自plc的心跳
+        /// </summary>
+        public bool HeartBeatFromPlc { get; set; } = false;
+
+        [VarComm("Global", "是否允许西门子下发配方")]
+        /// <summary>
+        /// 是否允许西门子下发配方
+        /// </summary>
+        public bool IsAllowSiemensSendRecipe { get; set; } = false;
+
+        [VarComm("Global", "西门子下发配方状态0=等待下发配方 1=请求下发配方 2=接收配方 3=配方接收配方完成 4=请求配料 5=西门子确认开始配料 6=西门子确认开始配料信号复位")]
+        /// <summary>
+        /// 西门子下发配方状态 0:等待下发配方 1：请求下发配方 2：上位机接收配方 3：配方接收配方完成 4：上位机向西门子请求配料 5：西门子确认开始配料 6:西门子确认开始配料 信号复位
+        /// </summary>
+        public int SiemensSendRecipeStatus { get; set; } = 0;
+
+        [VarComm("Global", "配方1下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料")]
+        /// <summary>
+        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料
+        /// </summary>
+        public int RecipeStatusIDTray1 { get; set; } = 0;
+
+        [VarComm("Global", "配方1下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料")]
+        /// <summary>
+        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料
+        /// </summary>
+        public int[] RecipeProcessStatus { get; set; } = new int[5] { 0, 0, 0, 0, 0 };
+
+
+        [VarComm("Global", "配方1下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料")]
+        /// <summary>
+        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料
+        /// </summary>
+        public bool AGVIsGetTray { get; set; } = false;
+
+        [VarComm("Global", "配方2下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料")]
+        /// <summary>
+        /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方，正在配料
+        /// </summary>
+        public int RecipeStatusIDTray2 { get; set; } = 0;
+
+        [VarComm("Global", "当前配方正在配料位置")]
+        /// <summary>
+        /// 当前料仓的位置
+        /// </summary>
+        public int StockInIsWork { get; set; } = 0;
+
+
+
+
+        [VarComm("Global", "设置料仓配料完成")]
+        /// <summary>
+        /// 当前料仓的位置
+        /// </summary>
+        public bool[] StockInDosingComple { get; set; } = new bool[15];
+
+
+        [VarComm("Global", "是否使用粉仓配料")]
+        /// <summary>
+        /// 是否使用粉仓配料
+        /// </summary>
+        public bool IsUseWindSend { get; set; } = false;
+
+        [VarComm("Global", "粉仓正在配料")]
+        /// <summary>
+        /// 粉仓正在配料
+        /// </summary>
+        public bool WindSendDosing { get; set; } = false;
+
+
+        /// <summary>
+        /// 所有气缸的信号
+        /// </summary>
+        public bool[] Cylinder_JackInfo { get; set; } = new bool[30];
+
+        #region 本地模拟配方
+
+        [VarComm("Global", "是否使用本地模拟配方")]
+        /// <summary>
+        /// 是否使用本地模拟配方
+        /// </summary>
+        public bool IsUseLocalRecipe { get; set; }
+
+        [VarComm("Global", "是否使用本地模拟配方")]
+        /// <summary>
+        /// 是否使用本地模拟配方
+        /// </summary>
+        public bool NotUseSmallStation { get; set; }
+
+        /// <summary>
+        /// 配料时间
+        /// </summary>
+        public DateTime time1;
+
+        /// <summary>
+        /// 配料时间
+        /// </summary>
+        public DateTime[] DosingTime = new DateTime[5] { DateTime.Now, DateTime.Now, DateTime.Now, DateTime.Now, DateTime.Now };
+
+        /// <summary>
+        /// 原料的名称和原料编号对应，Mes提供的信息
+        /// </summary>
+        public ConcurrentDictionary<string, string> RawMaterialsNameCode { get; set; } = new ConcurrentDictionary<string, string>();
+
+        [VarComm("Global", "风送是否允许AGV到工站")]
+        /// <summary>
+        /// 风送是否允许AGV到工站
+        /// </summary>
+        public bool WindSendAllowAGVPutGet { get; set; } = false;
+
+        [VarComm("Global", "粉料仓配料完成")]
+        /// <summary>
+        /// 粉料仓配料完成
+        /// </summary>
+        public bool WindSendDosingComple { get; set; } = false;
+
+
+        [VarComm("Global", "粉料仓配料状态")]
+        /// <summary>
+        /// 粉料仓配料状态(0:无意义,1:粉料仓下配方，2：plc接收配方完成，3：粉料仓配料完成，4：粉料仓配料完成信号复位，5：排料完成)
+        /// </summary>
+        public int WindSendDosingStatus { get; set; } = 0;
+
+        [VarComm("Global", "PLC的系统模式 DB44.DBX0.1")]
+        /// <summary>
+        /// PLC的系统模式 DB44.DBX0.1
+        /// </summary>
+        public bool PlcSystemMode { get; set; } = false;
+
+        [VarComm("Global", "PLC的系统模式 DB44.DBX0.1")]
+        /// <summary>
+        /// 不使用15个料仓报警
+        /// </summary>
+        public bool DisEnableStockBinAlarm { get; set; } = false;
+
+        [VarComm("Global", "PLC的系统自动启停 DB44.DBX0.0")]
+        /// <summary>
+        /// PLC的系统自动启停 DB44.DBX0.0
+        /// </summary>
+        public bool PlcSystemIsAutoRun { get; set; } = false;
+
+        [VarComm("Global", "PLC的系统自动暂停/开始 DB44.DBX0.2")]
+        /// <summary>
+        /// PLC的系统自动暂停/开始 DB44.DBX0.2
+        /// </summary>
+        public bool PlcSystemIsPause { get; set; } = false;
+
+        [VarComm("Global", "延迟采集料仓的配料完成重量")]
+        /// <summary>
+        /// 延迟采集料仓的配料完成重量
+        /// </summary>
+        public int Time { get; set; } = 2000;
+
+        [VarComm("Global", "取消订单的步骤号")]
+        /// <summary>
+        /// 取消订单的步骤： 1-9：配料过程中配方1取消配方 10-19：配料过程中配方2取消配方 20-29：下发订单的过程中取消订单(订单未到达上位机)  30-39：下发订单的过程中取消订单(订单未到达PLC)
+        /// </summary>
+        public int OrderCancelStep { get; set; } = 0;
+
+        [VarComm("Global", "机器人的状态")]
+        /// <summary>
+        /// 机器人的状态
+        /// </summary>
+        public ushort RobotStatus { get; set; } = 0;
+
+        [VarComm("Global", "机器人的程序号")]
+        /// <summary>
+        /// 机器人的程序号
+        /// </summary>
+        public byte RobotProgramNum { get; set; } = 0;
+        /// <summary>
+        /// 最近一次下发订单的时间
+        /// </summary>
+        public DateTime LatestIssueRecipe { get; set; } = new DateTime(2023, 5, 1, 00, 00, 00);
+        #endregion
+    }
+    public enum IssueRecipeCondition
+    {
+        等待小料站PLC允许下配方,
+        等待西门子下发配方,
+        等待西门子下发配方信号复位,
+        等待上位机请求配料,
+        等待西门子确认配料,
+        等待西门子确认配料信号复位,
+    }
+    public enum ProcessCondition
+    {
+        等待AGV到位,
+        等待小料站PLC接受配方完成,
+        等待配方配料完成,
+        等待AGV取托盘完成
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceRead.cs b/BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceRead.cs
new file mode 100644
index 00000000..c1e9e2d5
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceRead.cs
@@ -0,0 +1,10 @@
+namespace BPASmartClient.FoodStationTest.Model.HK_PLC
+{
+    public class HKDeviceRead
+    {
+        public bool HeartBeat { get; set; }
+        public bool SystemMode { get; set; }
+        public bool SystemStart { get; set; }
+        public bool SystemPause { get; set; }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceStatus.cs b/BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceStatus.cs
new file mode 100644
index 00000000..87e27e55
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceStatus.cs
@@ -0,0 +1,183 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.Helper;
+using System;
+using System.Collections.ObjectModel;
+using System.Threading;
+
+namespace BPASmartClient.FoodStationTest.Model.HK_PLC
+{
+    public class HKDeviceStatus
+    {
+        public BPA.Communication.Siemens HK_PLC_S7 = new BPA.Communication.Siemens();
+        public bool IsConnected => HK_PLC_S7.IsConnected();
+        public PlcReadAddressDB45 DeviceStatus = new PlcReadAddressDB45();
+        public void Init()
+        {
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                if (IsConnected)
+                {
+                    var res = this.HK_PLC_S7.Read<PlcReadAddressDB45>(45);
+
+                    if (res.IsSuccess && res.Content != null && res.Content is PlcReadAddressDB45 data)
+                    {
+                        DeviceStatus = data;
+                    }
+                    var res1 = this.HK_PLC_S7.Read<PlcReadAddressDB3>(3);
+                    if (res1.IsSuccess && res1.Content != null && res1.Content is PlcReadAddressDB3 data1)
+                    {
+                        GVL_SmallStation.GetInstance.plcReadDataDB3 = data1;
+                    }
+                }
+                Thread.Sleep(10);
+            }), "海科PLC设备状态", true);
+        }
+
+        private void TempStockBinPar(int num, ushort StockBinLocation, string info)
+        {
+            if (StockBinLocation >= 1 && StockBinLocation <= 8)
+            {
+                HK_PLC_S7.Write<bool>($"DB4.DBX{num}." + (StockBinLocation - 1), true);
+            }
+            else if (StockBinLocation >= 9 && StockBinLocation <= 15)
+            {
+                HK_PLC_S7.Write<bool>($"DB4.DBX{num + 1}." + (StockBinLocation - 9), true);
+            }
+            MessageNotify.GetInstance.ShowRunLog($"托盘{info}号桶在料仓{StockBinLocation}配料");
+        }
+
+        /// <summary>
+        /// 下发配方数据
+        /// </summary>
+        /// <param name="BarrelNum">单个桶的编号</param>
+        /// <param name="StockBinLocation">单个桶对应的料仓位置</param>
+        public void StockBinPar(uint BarrelNum, ushort StockBinLocation, int TrayNum = 1)
+        {
+            if (IsConnected)
+            {
+                if (TrayNum == 1)
+                {
+                    if (BarrelNum >= 6 && BarrelNum <= 8 && StockBinLocation >= 1 && StockBinLocation <= 15)
+                    {
+                        if (BarrelNum == 6)
+                        {
+                            TempStockBinPar(10, StockBinLocation, "1—1");
+                        }
+                        else if (BarrelNum == 7)
+                        {
+                            TempStockBinPar(12, StockBinLocation, "1—2");
+                        }
+                        else if (BarrelNum == 8)
+                        {
+                            TempStockBinPar(14, StockBinLocation, "1—3");
+                        }
+                        else if (BarrelNum == 4)
+                        {
+                            TempStockBinPar(16, StockBinLocation, "1—4");
+                        }
+                    }
+                }
+                else if (TrayNum == 2)
+                {
+                    if (BarrelNum >= 1 && BarrelNum <= 4 && StockBinLocation >= 1 && StockBinLocation <= 15)
+                    {
+                        if (BarrelNum == 6)
+                        {
+                            TempStockBinPar(18, StockBinLocation, "2—1");
+                        }
+                        else if (BarrelNum == 7)
+                        {
+                            TempStockBinPar(20, StockBinLocation, "2—2");
+                        }
+                        else if (BarrelNum == 8)
+                        {
+                            TempStockBinPar(22, StockBinLocation, "2—3");
+                        }
+                        else if (BarrelNum == 4)
+                        {
+                            TempStockBinPar(24, StockBinLocation, "2—4");
+                        }
+                    }
+                }
+            }
+        }
+
+        public void IssueRecipeToPlc(ObservableCollection<RemoteRecipeRawMaterial> rawMaterials, int recipeLoction)
+        {
+            bool[] barrel = new bool[16];
+            bool[] barrel1 = new bool[16];
+            bool[] barrel2 = new bool[16];
+            bool[] barrel3 = new bool[16];
+            ushort barrel1_short = 0;
+            ushort barrel2_short = 0;
+            ushort barrel3_short = 0;
+
+            foreach (var item in rawMaterials)
+            {
+                switch (item.RawMaterialBarrelNum)
+                {
+                    case 6:
+                        barrel[item.RawMaterialLocation - 1] = true;
+                        barrel1[item.RawMaterialLocation - 1] = true;
+                        break;
+                    case 7:
+                        barrel[item.RawMaterialLocation - 1] = true;
+                        barrel2[item.RawMaterialLocation - 1] = true;
+                        break;
+                    case 8:
+                        barrel[item.RawMaterialLocation - 1] = true;
+                        barrel3[item.RawMaterialLocation - 1] = true;
+                        break;
+                    default:
+                        break;
+                }
+            }
+            for (int i = 0; i < 16; i++)
+            {
+                if (recipeLoction == 0)
+                {
+                    if (i >= 8)
+                    {
+                        HK_PLC_S7.Write<bool>("DB4.DBX15." + (i - 8), barrel1[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX17." + (i - 8), barrel2[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX19." + (i - 8), barrel3[i]);
+                    }
+                    else
+                    {
+                        HK_PLC_S7.Write<bool>("DB4.DBX14." + i, barrel1[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX16." + i, barrel2[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX18." + i, barrel3[i]);
+                    }
+                    barrel1_short = barrel1_short.SetBitValue((byte)(i + 1), barrel1[i]);
+                    barrel2_short = barrel2_short.SetBitValue((byte)(i + 1), barrel2[i]);
+                    barrel3_short = barrel3_short.SetBitValue((byte)(i + 1), barrel3[i]);
+                    GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeLoction] = GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeLoction].SetBitValue((byte)(i + 1), barrel[i]);
+                }
+                else if (recipeLoction == 1)
+                {
+                    if (i >= 8)
+                    {
+                        HK_PLC_S7.Write<bool>("DB4.DBX21." + (i - 8), barrel1[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX23." + (i - 8), barrel2[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX25." + (i - 8), barrel3[i]);
+                    }
+                    else
+                    {
+                        HK_PLC_S7.Write<bool>("DB4.DBX20." + i, barrel1[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX22." + i, barrel2[i]);
+                        HK_PLC_S7.Write<bool>("DB4.DBX24." + i, barrel3[i]);
+                    }
+                    barrel1_short = barrel1_short.SetBitValue((byte)(i + 1), barrel1[i]);
+                    barrel2_short = barrel2_short.SetBitValue((byte)(i + 1), barrel2[i]);
+                    barrel3_short = barrel3_short.SetBitValue((byte)(i + 1), barrel3[i]);
+                    GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeLoction] = GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeLoction].SetBitValue((byte)(i + 1), barrel[i]);
+                }
+            }
+            MessageNotify.GetInstance.ShowRunLog($"配方下发，plc配方位置{recipeLoction},桶1料仓配料{barrel1_short}，配料位置{barrel1_short.ToBinString()}");
+            MessageNotify.GetInstance.ShowRunLog($"配方下发，plc配方位置{recipeLoction},桶2料仓配料{barrel2_short}，配料位置{barrel2_short.ToBinString()}");
+            MessageNotify.GetInstance.ShowRunLog($"配方下发，plc配方位置{recipeLoction},桶3料仓配料{barrel3_short}，配料位置{barrel3_short.ToBinString()}");
+            MessageNotify.GetInstance.ShowRunLog($"配方下发，plc配方位置{recipeLoction},料仓配料{GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeLoction]}，配料位置{GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeLoction].ToBinString()}");
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceWrite.cs b/BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceWrite.cs
new file mode 100644
index 00000000..3a68a023
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceWrite.cs
@@ -0,0 +1,17 @@
+namespace BPASmartClient.FoodStationTest.Model.HK_PLC
+{
+    public class HKDeviceWrite
+    {
+        public string Address { get; set; }
+        public PlcVarType PlcVarType { get; set; } = PlcVarType.Bool;
+        public object Value { get; set; }
+    }
+    public enum PlcVarType
+    {
+        Bool,
+        Byte,
+        Int,
+        Dint,
+        Real,
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/HK_PLC/HKPlcCommAddress.cs b/BPASmartClient.FoodStationTest/Model/HK_PLC/HKPlcCommAddress.cs
new file mode 100644
index 00000000..307d24f2
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/HK_PLC/HKPlcCommAddress.cs
@@ -0,0 +1,134 @@
+namespace BPASmartClient.FoodStationTest.Model.HK_PLC
+{
+    public class HKPlcCommAddress
+    {
+        #region 海科PLC ==> 上位机
+        /// <summary>
+        /// 是否允许配料
+        /// </summary>
+        public static string IsAllowDosing { get; set; } = "";
+        /// <summary>
+        /// 当前料仓位置
+        /// </summary>
+        public static string StockBinLocation { get; set; } = "";
+        /// <summary>
+        /// 当前料仓的状态(0:无意义，1：到达接料位置)
+        /// </summary>
+        public static string StockState { get; set; } = "";
+        #endregion
+
+        #region 上位机 ==> 海科PLC
+        /// <summary>
+        /// 料仓位置(配置该配方，所需要多个原料桶，每个原料桶有多个料仓位置)
+        /// </summary>
+        public static string StockBinLocationToPLC { get; set; } = "";
+        /// <summary>
+        /// 对应桶号
+        /// </summary>
+        public static string BarrelNumToPLC { get; set; } = "";
+        /// <summary>
+        /// 当前配料机配料完成
+        /// </summary>
+        public static string SingleDosingFinishToPLC { get; set; } = "";
+        /// <summary>
+        /// 当前配料料仓的位置
+        /// </summary>
+        public static string SingleStockBinLocationToPLC { get; set; } = "";
+
+        public static string RecipeDosingFinish { get; set; } = "";
+        #endregion
+
+        #region AGV进出站1
+        /// <summary>
+        /// Agv送货 进站申请 
+        /// </summary>
+        public static string DeliveryAGVApply { get; set; } = "DB3.DBX0.1";
+        /// <summary>
+        /// Agv送货 进站申请 
+        /// </summary>
+        public static string DeliveryAGVIsApply { get; set; } = "";
+        /// <summary>
+        /// Agv送货 进站顶升申请 
+        /// </summary>
+        public static string DeliveryAGVApplyJack { get; set; } = "";
+        /// <summary>
+        /// Agv送货 进站顶升申请 
+        /// </summary>
+        public static string DeliveryAGVIsApplyJack { get; set; } = "";
+        /// <summary>
+        /// Agv送货 送货完成 
+        /// </summary>
+        public static string DeliveryAGVFinsih { get; set; } = "";
+        /// <summary>
+        /// Agv送货 工位上有货架 
+        /// </summary>
+        public static string StationHaveCargo { get; set; } = "";
+        /// <summary>
+        ///  Agv送货 进站申请 
+        /// </summary>
+        public static string PickAGVApply { get; set; } = "";
+        /// <summary>
+        ///  Agv送货 进站申请 
+        /// </summary>
+        public static string PickAGVIsApply { get; set; } = "";
+        /// <summary>
+        /// Agv送货 取货架完成 
+        /// </summary>
+        public static string PickCargoAGVFinish { get; set; } = "";
+        /// <summary>
+        /// Agv送货 取料完成 
+        /// </summary>
+        public static string PickAGVFinish { get; set; } = "";
+        /// <summary>
+        ///  工位上是否有小车
+        /// </summary>
+        public static string StationIsExistTray { get; set; } = "";
+        #endregion
+        #region AGV进出站2
+        /// <summary>
+        /// Agv送货 进站申请 
+        /// </summary>
+        public static string DeliveryAGVApplyStation2 { get; set; } = "";
+        /// <summary>
+        /// Agv送货 进站申请 
+        /// </summary>
+        public static string DeliveryAGVIsApplyStation2 { get; set; } = "";
+        /// <summary>
+        /// Agv送货 进站顶升申请 
+        /// </summary>
+        public static string DeliveryAGVApplyJackStation2 { get; set; } = "";
+        /// <summary>
+        /// Agv送货 进站顶升申请 
+        /// </summary>
+        public static string DeliveryAGVIsApplyJackStation2 { get; set; } = "";
+        /// <summary>
+        /// Agv送货 送货完成 
+        /// </summary>
+        public static string DeliveryAGVFinsihStation2 { get; set; } = "";
+        /// <summary>
+        /// Agv送货 工位上有货架 
+        /// </summary>
+        public static string StationHaveCargoStation2 { get; set; } = "";
+        /// <summary>
+        ///  Agv送货 进站申请 
+        /// </summary>
+        public static string PickAGVApplyStation2 { get; set; } = "";
+        /// <summary>
+        ///  Agv送货 进站申请 
+        /// </summary>
+        public static string PickAGVIsApplyStation2 { get; set; } = "";
+        /// <summary>
+        /// Agv送货 取货架完成 
+        /// </summary>
+        public static string PickCargoAGVFinishStation2 { get; set; } = "";
+        /// <summary>
+        /// Agv送货 取料完成 
+        /// </summary>
+        public static string PickAGVFinishStation2 { get; set; } = "";
+        /// <summary>
+        ///  工位上是否有货架
+        /// </summary>
+        public static string StationIsExistTrayStation2 { get; set; } = "";
+        #endregion
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/HK_PLC/PlcManualComm.cs b/BPASmartClient.FoodStationTest/Model/HK_PLC/PlcManualComm.cs
new file mode 100644
index 00000000..b4747cfd
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/HK_PLC/PlcManualComm.cs
@@ -0,0 +1,12 @@
+namespace BPASmartClient.FoodStationTest.Model.HK_PLC
+{
+    public class PlcManualComm
+    {
+        public int SerialNum { get; set; }
+        public string Address { get; set; }
+        public string Describe { get; set; }
+        public string NowValue { get; set; }
+        public string SetValue { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/HK_PLC/PlcReadAddressDB3.cs b/BPASmartClient.FoodStationTest/Model/HK_PLC/PlcReadAddressDB3.cs
new file mode 100644
index 00000000..b1ba348f
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/HK_PLC/PlcReadAddressDB3.cs
@@ -0,0 +1,80 @@
+using BPASmartClient.FoodStationTest.Model.GVL;
+
+namespace BPASmartClient.FoodStationTest.Model.HK_PLC
+{
+    public class PlcReadAddressDB3
+    {
+        [VarComm("DB3.DBX0.0", "心跳")]
+        public bool HeartBeat { get; set; }
+
+        [VarComm("DB3.DBX0.1", "机器人自动运行模式")]
+        public bool RobotAutoRunMode { get; set; }
+
+        [VarComm("DB3.DBX0.2", "机器人正在自动运行")]
+        public bool RobotAutoRunning { get; set; }
+
+        [VarComm("DB3.DBX0.3", "机器人停止运行")]
+        public bool RobotStopped { get; set; }
+
+        [VarComm("DB3.DBX0.4", "机器人正常运行")]
+        public bool RobotRunning { get; set; }
+
+        [VarComm("DB3.DBX0.5", "机器人运行故障")]
+        public bool RobotAlarm { get; set; }
+
+        [VarComm("DB3.DBX0.6", "机器人在Home点")]
+        public bool RobotInHomed { get; set; }
+
+        [VarComm("DB3.DBX1.0", "机器人执行程序号")]
+        public byte RobotRunProgram { get; set; }
+
+        [VarComm("DB3.DBX2.0", "Plc允许工单下发")]
+        public bool[] RecipeAllowIssue { get; set; } = new bool[16];
+
+        [VarComm("DB3.DBX4.0", "Plc工单接收完成")]
+        public bool[] RecipeReceviceComple { get; set; } = new bool[16];
+
+        [VarComm("DB3.DBX6.0", "工单配料完成")]
+        public bool[] RecipeDosingComple { get; set; } = new bool[16];
+
+        [VarComm("DB3.DBX8.0", "允许单个料仓下料")]
+        public bool[] StockBinAllowIssue { get; set; } = new bool[16];
+
+        [VarComm("DB3.DBW10", "配方1桶位置反馈")]
+        public ushort[] Recipe1BarrelPosReserve { get; set; } = new ushort[3];
+
+        [VarComm("DB3.DBW16", "配方2桶位置反馈")]
+        public ushort[] Recipe2BarrelPosReserve { get; set; } = new ushort[3];
+
+        [VarComm("DB3.DBW22", "配方3桶位置反馈")]
+        public ushort[] Recipe3BarrelPosReserve { get; set; } = new ushort[3];
+
+        [VarComm("DB3.DBW28", "配方4桶位置反馈")]
+        public ushort[] Recipe4BarrelPosReserve { get; set; } = new ushort[3];
+
+        [VarComm("DB3.DBW34", "配方5桶位置反馈")]
+        public ushort[] Recipe5BarrelPosReserve { get; set; } = new ushort[3];
+
+        [VarComm("DB3.DBX40.0", "工站1有无托盘")]
+        public bool Station1HaveTray { get; set; }
+
+        [VarComm("DB3.DBX40.1", "工站1传感器信号")]
+        public bool Station1Sensor { get; set; }
+
+        [VarComm("DB3.DBX40.2", "工站1气缸信号")]
+        public bool Station1Cylinder { get; set; }
+
+        [VarComm("DB3.DBX100.7", "机器人抓空桶完成")]
+        public bool RobotTakeEmptyBarrelFinish { get; set; }
+
+        [VarComm("DB3.DBX101.0", "机器人放空桶完成")]
+        public bool RobotPutEmptyBarrelFinish { get; set; }
+
+        [VarComm("DB3.DBX101.1", "机器人抓满桶完成")]
+        public bool RobotTakeFullBarrelFinish { get; set; }
+
+        [VarComm("DB3.DBX101.2", "机器人放满桶完成")]
+        public bool RobotPutFullBarrelFinish { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/HK_PLC/PlcReadAddressDB45.cs b/BPASmartClient.FoodStationTest/Model/HK_PLC/PlcReadAddressDB45.cs
new file mode 100644
index 00000000..3cb088fe
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/HK_PLC/PlcReadAddressDB45.cs
@@ -0,0 +1,52 @@
+namespace BPASmartClient.FoodStationTest.Model.HK_PLC
+{
+    public class PlcReadAddressDB45
+    {
+        /// <summary>
+        /// 通信心跳 DB45.DBX0.0
+        /// </summary>
+        public bool HeartBeat { get; set; }
+        /// <summary>
+        /// 设备运行 DB45.DBX0.1
+        /// </summary>
+        public bool DeviceRun { get; set; }
+        /// <summary>
+        /// 设备停止 DB45.DBX0.2
+        /// </summary>
+        public bool DeviceStop { get; set; }
+        /// <summary>
+        /// 设备急停 DB45.DBX0.3
+        /// </summary>
+        public bool DeviceEStop { get; set; }
+        /// <summary>
+        /// 设备暂停 DB45.DBX0.4
+        /// </summary>
+        public bool DevicePause { get; set; }
+        /// <summary>
+        /// 设备故障 DB45.DBX0.5
+        /// </summary>
+        public bool DeviceAlarm { get; set; }
+        /// <summary>
+        /// 料仓缺料 DB45.DBX0.6
+        /// </summary>
+        public bool StockBin { get; set; }
+        /// <summary>
+        /// 上游缺料 DB45.DBX0.7
+        /// </summary>
+        public bool Top { get; set; }
+        /// <summary>
+        /// 上游缺料 DB45.DBX1.0
+        /// </summary>
+        public bool TopDown { get; set; }
+        /// <summary>
+        /// 系统模式
+        /// </summary>
+        public short Mode { get; set; }
+        /// <summary>
+        /// 报警
+        /// </summary>
+        public bool[] Alarm { get; set; } = new bool[24];
+        public int Standby1 { get; set; }
+        public int Standby2 { get; set; }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs b/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs
new file mode 100644
index 00000000..c6c57767
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs
@@ -0,0 +1,28 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace BPASmartClient.FoodStationTest.Model.Par
+{
+    public class ConnectParMode : ObservableObject
+    {
+        public bool SiemensConnect { get { return _mSiemensConnect; } set { _mSiemensConnect = value; OnPropertyChanged(); } }
+        private bool _mSiemensConnect;
+        public bool WindSendConnect { get { return _mWindSendConnect; } set { _mWindSendConnect = value; OnPropertyChanged(); } }
+        private bool _mWindSendConnect;
+        public bool HKPlcConnect { get { return _mHKPlcConnect; } set { _mHKPlcConnect = value; OnPropertyChanged(); } }
+        private bool _mHKPlcConnect;
+        public bool ShieldStockbinAlarm { get { return _mShieldStockbinAlarm; } set { _mShieldStockbinAlarm = value; OnPropertyChanged(); } }
+        private bool _mShieldStockbinAlarm;
+
+
+        public short AxisLoadSpeed { get { return _mAxisLoadSpeed; } set { _mAxisLoadSpeed = value; OnPropertyChanged(); } }
+        private short _mAxisLoadSpeed;
+        public short AxisMidSpeed { get { return _mAxisMidSpeed; } set { _mAxisMidSpeed = value; OnPropertyChanged(); } }
+        private short _mAxisMidSpeed;
+        public short AxisUnLoadSpeed { get { return _mAxisUnLoadSpeed; } set { _mAxisUnLoadSpeed = value; OnPropertyChanged(); } }
+        private short _mAxisUnLoadSpeed;
+        public float Axis1Speed { get { return _mAxis1Speed; } set { _mAxis1Speed = value; OnPropertyChanged(); } }
+        private float _mAxis1Speed;
+        public float Axis2Speed { get { return _mAxis2Speed; } set { _mAxis2Speed = value; OnPropertyChanged(); } }
+        private float _mAxis2Speed;
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/ProcessControl.cs b/BPASmartClient.FoodStationTest/Model/ProcessControl.cs
new file mode 100644
index 00000000..24223fef
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/ProcessControl.cs
@@ -0,0 +1,1236 @@
+using BPA.Communication;
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.FoodStationTest.Model.GVL;
+using BPASmartClient.FoodStationTest.Model.HK_PLC;
+using BPASmartClient.FoodStationTest.Model.RawMaterial;
+using BPASmartClient.Helper;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Configuration;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class ProcessControl
+    {
+        private volatile static ProcessControl _Instance;
+        public static ProcessControl GetInstance => _Instance ?? (_Instance = new ProcessControl());
+        private ProcessControl() { }
+
+        /// <summary>
+        /// 配方数据
+        /// </summary>
+        public ObservableCollection<RemoteRecipeData> RemoteRecipes = new ObservableCollection<RemoteRecipeData>();
+        /// <summary>
+        /// 原料的名称和料仓的位置对应
+        /// </summary>
+        public Dictionary<string, short> RawMaterialsNamePos = new Dictionary<string, short>();
+        public ObservableCollection<RawMaterialStockBin> RawMaterialsInfo => Json<DevicePar>.Data.rawMaterialStockBin;
+        /// <summary>
+        /// 配方队列
+        /// </summary>
+        public ConcurrentQueue<string> RecipeQueueTray1 = new ConcurrentQueue<string>();
+
+
+        /// <summary>
+        /// 物料集合
+        /// </summary>
+        public Dictionary<int, ConcurrentQueue<string>> RecipeQueueTray { get; set; } = new Dictionary<int, ConcurrentQueue<string>>();
+
+        public ConcurrentQueue<string> RecipeQueueTray2 = new ConcurrentQueue<string>();
+
+
+
+        public HKDeviceStatus HKDevice = new HKDeviceStatus();
+
+        public ObservableCollection<PlcInfos> CommData { get; set; } = new ObservableCollection<PlcInfos>();
+        public ObservableCollection<PlcInfos> ProcessVar { get; set; } = new ObservableCollection<PlcInfos>();
+
+        public DateTime StockBinAlarmTime = DateTime.Now;
+
+        public string? HK_PLC_IP = ConfigurationManager.AppSettings["HKPlc_IP"];
+
+        public void Init()
+        {
+            RecipeQueueTray.TryAdd(0, new ConcurrentQueue<string>());
+            RecipeQueueTray.TryAdd(1, new ConcurrentQueue<string>());
+            RecipeQueueTray.TryAdd(2, new ConcurrentQueue<string>());
+            RecipeQueueTray.TryAdd(3, new ConcurrentQueue<string>());
+            RecipeQueueTray.TryAdd(4, new ConcurrentQueue<string>());
+            PlcVarMonitor();
+            StockBinNameWithPos();
+            RawMaterialNameWithCode();
+            RegisterInit();
+            DeviceConnect();
+            //Json<RemoteRecipeDataColl>.Data.Recipes = TestData.GetInstance.Recipes;//添加测试数据
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                GVL_SmallStation.GetInstance.DisEnableStockAlarm = Json<DevicePar>.Data.deviceConnectPar.ShieldStockbinAlarm;
+                if (HKDevice.IsConnected)
+                {
+                    GVL_SmallStation.GetInstance.HeartBeatToPlc = !GVL_SmallStation.GetInstance.HeartBeatToPlc;
+                    HKDevice.HK_PLC_S7.Write("DB4.DBX0.0", GVL_SmallStation.GetInstance.HeartBeatToPlc);
+                    GVL_SmallStation.GetInstance.HeartBeatFromPlc = HKDevice.HK_PLC_S7.Read<bool>("DB45.DBX0.0").Content;
+                    if (DeviceInquire.GetInstance.devices.Count < 15 && HKDevice.IsConnected && Json<RemoteRecipeDataColl>.Data.Recipes.Count > 0 && GVL_SmallStation.GetInstance.DisEnableStockBinAlarm == false && DateTime.Now.Subtract(StockBinAlarmTime).TotalSeconds >= 60 & !GVL_SmallStation.GetInstance.DisEnableStockAlarm)
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
+                        App.Current.Dispatcher.Invoke(() =>
+                        {
+                            MessageNotify.GetInstance.ShowDialog($"未读取到15个柔性味魔方料仓", DialogType.Error);
+                            StockBinAlarmTime = DateTime.Now;
+                        });
+                        HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
+                    }
+                }
+                Thread.Sleep(200);
+            }), "海科plc通信心跳", true);
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                if (GVL_SmallStation.GetInstance.Order_Cancel)
+                {
+                    CancelOrder();//订单取消,不执行配方流程
+                }
+                else
+                {
+                    ReceviceData();//配方请求
+                    RecipeInfoToHKPLC();//配方配料
+                }
+                Thread.Sleep(10);
+            }), "小料站流程控制", true);
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                RealTimeData();
+
+                Thread.Sleep(10);
+            }), "西门子PLC和小料站PLC的实时数据交互流程", true);
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                HKPlcRead();
+                GetStatus();
+                Thread.Sleep(10);
+            }), "海科PLC实时数据", true);
+        }
+        /// <summary>
+        /// 气缸的传感器值
+        /// </summary>
+        private void GetStatus()
+        {
+            for (int i = 0; i < 8; i++)
+            {
+                GVL_SmallStation.GetInstance.Cylinder_JackInfo[i] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX0." + i).Content;
+            }
+            for (int i = 0; i < 7; i++)
+            {
+                GVL_SmallStation.GetInstance.Cylinder_JackInfo[i + 8] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX1." + i).Content;
+            }
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[20] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX3.6").Content;//进料桶气缸
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[21] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX3.7").Content;//出料筒气缸1
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[22] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.0").Content;//出料筒气缸2
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[23] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.1").Content;//出料筒气缸3
+
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[24] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.2").Content;//托盘1_1气缸
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[25] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.3").Content;//托盘1_2气缸
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[26] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.4").Content;//托盘2_1气缸
+            GVL_SmallStation.GetInstance.Cylinder_JackInfo[27] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.5").Content;//托盘2_2气缸
+        }
+        /// <summary>
+        /// DB块的变量实时值
+        /// </summary>
+        private void HKPlcRead()
+        {
+            if (HKDevice.IsConnected)
+            {
+                foreach (PropertyInfo item in typeof(PlcReadAddressDB3).GetProperties())
+                {
+                    int index = Array.FindIndex(CommData.ToArray(), p => p.Name == item.Name);
+                    if (index >= 0)
+                    {
+                        if (item.PropertyType.IsArray)
+                        {
+                            CommData.ElementAt(index).Value = "";
+                            Array array = (Array)item.GetValue(GVL_SmallStation.GetInstance.plcReadDataDB3, null);
+                            foreach (var values in array)
+                            {
+                                string data = values.ToString();
+                                if (data.ToLower() == "false")
+                                    data = "0";
+                                if (data.ToLower() == "true")
+                                    data = "1";
+                                CommData.ElementAt(index).Value = CommData.ElementAt(index).Value + data + ",";
+                            }
+                        }
+                        else
+                        {
+                            CommData.ElementAt(index).Value = GVL_SmallStation.GetInstance.plcReadDataDB3.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.GetInstance.plcReadDataDB3, null).ToString();
+                        }
+                    }
+                }
+            }
+
+            foreach (PropertyInfo item in typeof(GVL_SmallStation).GetProperties())
+            {
+                int index = Array.FindIndex(ProcessVar.ToArray(), p => p.Name == item.Name);
+                if (index >= 0)
+                {
+                    if (item.PropertyType.IsArray)
+                    {
+                        ProcessVar.ElementAt(index).Value = "";
+                        Array array = (Array)item.GetValue(GVL_SmallStation.GetInstance, null);
+                        foreach (var values in array)
+                        {
+                            string data = values.ToString();
+                            if (data.ToLower() == "false")
+                                data = "0";
+                            if (data.ToLower() == "true")
+                                data = "1";
+                            ProcessVar.ElementAt(index).Value = ProcessVar.ElementAt(index).Value + data + ",";
+                        }
+                    }
+                    else
+                    {
+                        ProcessVar.ElementAt(index).Value = GVL_SmallStation.GetInstance.GetType().GetProperty(item.Name).GetValue(GVL_SmallStation.GetInstance, null).ToString();
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// 小料站和西门子PLC之间的实时数据
+        /// </summary>
+        private void RealTimeData()
+        {
+            if (HKDevice.IsConnected)
+            {
+                //获取系统状态
+                GVL_SmallStation.GetInstance.PlcSystemIsAutoRun = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.0").Content;//系统启停
+                GVL_SmallStation.GetInstance.PlcSystemMode = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.1").Content;//系统模式
+                GVL_SmallStation.GetInstance.PlcSystemIsPause = HKDevice.HK_PLC_S7.Read<bool>("DB44.DBX0.2").Content;//系统暂停
+
+                GVL_SmallStation.GetInstance.Station1HaveTray = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX40.0").Content;//工站1 有货架
+
+                GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[0] = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.0").Content;
+                GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[1] = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.1").Content;
+                GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[2] = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.2").Content;
+                GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[3] = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.3").Content;
+                GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[4] = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX2.4").Content;
+                if (GVL_SmallStation.GetInstance.WindSendDosingComple)
+                {
+                    HKDevice.HK_PLC_S7.Write<bool>("DB4.DBX4.0", true);
+                    GVL_SmallStation.GetInstance.WindSendDosingComple = false;
+                    MessageNotify.GetInstance.ShowRunLog("风送配料完成信号，发给产线plc信号");
+                }
+                if (Json<RemoteRecipeDataColl>.Data.Recipes.Count <= 3)
+                {
+                    GVL_SmallStation.GetInstance.IsAllowSiemensSendRecipe = true;
+                }
+
+                GVL_SmallStation.GetInstance.Station1Sensor = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX40.1").Content;
+                GVL_SmallStation.GetInstance.Station1Cylinder = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX40.2").Content;
+
+                GVL_SmallStation.GetInstance.RobotStatus = HKDevice.HK_PLC_S7.Read<byte>("DB3.DBB0").Content;
+                GVL_SmallStation.GetInstance.RobotProgramNum = HKDevice.HK_PLC_S7.Read<byte>("DB3.DBB1").Content;
+            }
+        }
+        public void CancelOrder()
+        {
+            if (GVL_SmallStation.GetInstance.Order_Cancel) //订单取消
+            {
+                if (!string.IsNullOrEmpty(GVL_SmallStation.GetInstance.Order_CancelRecipeCode))
+                {
+                    string code = GVL_SmallStation.GetInstance.Order_CancelRecipeCode;
+                    int index = Array.FindIndex(Json<RemoteRecipeDataColl>.Data.Recipes.ToArray(), p => p.RecipeCode == code);
+                    int[] cnt = new int[5] { -1, -1, -1, -1, -1 };
+                    int index1 = -1;
+                    for (int i = 0; i < 5; i++)
+                    {
+                        cnt[i] = Array.FindIndex(RecipeQueueTray[i].ToArray(), p => p == code);
+                        if (cnt[i] >= 0)
+                        {
+                            index1 = i;
+                        }
+                    }
+                    switch (GVL_SmallStation.GetInstance.OrderCancelStep)
+                    {
+                        case 0://前提条件判断
+                            if (index == -1)
+                            {
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 30;
+                                MessageNotify.GetInstance.ShowRunLog($"配方中并未找到订单{code}");
+                            }
+                            else
+                            {
+                                if (index1 >= 0)
+                                {
+                                    GVL_SmallStation.GetInstance.OrderCancelStep = 1;
+                                }
+                                else
+                                {
+                                    GVL_SmallStation.GetInstance.OrderCancelStep = 20;
+                                }
+                            }
+                            break;
+
+                        //Case 1-9为
+                        case 1:
+                            if (GVL_SmallStation.GetInstance.RecipeProcessStatus[index] != 0)
+                            {
+                                GVL_SmallStation.GetInstance.RecipeProcessStatus[index] = 0;
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX6." + index1, true);
+                                MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，正在取消订单：{code}");
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 2;
+                            }
+                            else
+                            {
+                                MessageNotify.GetInstance.ShowRunLog($"AGV未到达工站前，未给plc下发配方，取消订单：{code}");
+                                GVL_SmallStation.GetInstance.OrderCancelStep = 3;
+                            }
+                            break;
+                        case 2:
+                            if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX42." + index1).Content)
+                            {
+                                if (GVL_SmallStation.GetInstance.Station1Cylinder == false)
+                                {
+                                    GVL_SmallStation.GetInstance.OrderCancelStep = 3;
+                                    MessageNotify.GetInstance.ShowRunLog($"PLC正在执行配料流程，取消订单：{code}");
+                                }
+                            }
+                            break;
+                        case 3:
+                            // SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 4;
+                            break;
+                        case 4:
+
+                            // SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 9;
+                            MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
+
+                            break;
+                        case 9:
+                            App.Current.Dispatcher.Invoke(() =>
+                            {
+                                Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
+                            });
+                            RecipeQueueTray1.TryDequeue(out code);
+                            GVL_SmallStation.GetInstance.RecipeProcessStatus[index] = 0;
+                            GVL_SmallStation.GetInstance.Order_Cancel = false;
+                            GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 0;
+                            break;
+                        case 20:
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 21;
+                            break;
+                        case 21:
+
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 29;
+                            MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
+
+                            break;
+                        case 29:
+                            App.Current.Dispatcher.Invoke(() =>
+                            {
+                                Json<RemoteRecipeDataColl>.Data.Recipes.RemoveAt(index);
+                            });
+                            GVL_SmallStation.GetInstance.Order_Cancel = false;
+                            GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 0;
+                            break;
+
+                        //30-39为订单还未下发至上位机
+                        case 30:
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 31;
+                            break;
+                        case 31:
+
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 39;
+                            MessageNotify.GetInstance.ShowRunLog($"西门子取消订单完成，订单号：{code}");
+
+                            break;
+                        case 39:
+                            GVL_SmallStation.GetInstance.Order_Cancel = false;
+                            GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
+                            GVL_SmallStation.GetInstance.OrderCancelStep = 0;
+                            break;
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// 将配方添加到配方队列中
+        /// </summary>
+        private void ReceviceData()
+        {
+            RemoteRecipes = Json<RemoteRecipeDataColl>.Data.Recipes;
+            if (RemoteRecipes.Count > 0)
+            {
+                foreach (var data in RemoteRecipes)
+                {
+                    if (data.TrayCode == 1)
+                    {
+                        for (int i = 0; i < 5; i++)
+                        {
+                            if (GVL_SmallStation.GetInstance.NotUseSmallStation)
+                            {
+                                if (RecipeQueueTray[i].Count == 0 && !RecipeQueueTray[0].Contains(data.RecipeCode) && !RecipeQueueTray[1].Contains(data.RecipeCode) && !RecipeQueueTray[2].Contains(data.RecipeCode) && !RecipeQueueTray[3].Contains(data.RecipeCode) && !RecipeQueueTray[4].Contains(data.RecipeCode))
+                                {
+                                    RecipeQueueTray[i].Enqueue(data.RecipeCode);
+                                    MessageNotify.GetInstance.ShowRunLog($"本地配方配料 ，不使用小料配料，配方{data.RecipeCode}，加入配方{i}");
+                                }
+                            }
+                            else if (GVL_SmallStation.GetInstance.PlcAllowIssueRecipe[i])
+                            {
+                                if (RecipeQueueTray[i].Count == 0 && !RecipeQueueTray[0].Contains(data.RecipeCode) && !RecipeQueueTray[1].Contains(data.RecipeCode) && !RecipeQueueTray[2].Contains(data.RecipeCode) && !RecipeQueueTray[3].Contains(data.RecipeCode) && !RecipeQueueTray[4].Contains(data.RecipeCode))
+                                {
+                                    RecipeQueueTray[i].Enqueue(data.RecipeCode);
+                                    MessageNotify.GetInstance.ShowRunLog($"本地配方配料 ，等待plc允许配料，配方{data.RecipeCode}，加入配方{i}");
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (int i = 0; i < 5; i++)
+                {
+                    RecipeQueueTray[i].Clear();
+                    GVL_SmallStation.GetInstance.RecipeProcessStatus[i] = 0;
+                }
+                GVL_SmallStation.GetInstance.WindSendDosingStatus = 0;
+                GVL_SmallStation.GetInstance.WindSendDosing = false;
+            }
+
+        }
+        /// <summary>
+        /// 小料站配料
+        /// </summary>
+        private void RecipeInfoToHKPLC()
+        {
+            if (!GVL_SmallStation.GetInstance.NotUseSmallStation)
+            {
+                for (int i = 0; i < 5; i++)
+                {
+                    switch (GVL_SmallStation.GetInstance.Tray_AGVLogic[i])
+                    {
+                        case 0:
+                            if (GVL_SmallStation.GetInstance.AGV_PutTray1Finish && (RecipeQueueTray[i].Count > 0) && GVL_SmallStation.GetInstance.AGVIsGetTray == false)
+                            {
+                                GVL_SmallStation.GetInstance.AGVIsGetTray = true;
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX8." + i, true);
+                                GVL_SmallStation.GetInstance.AGV_PutTray1Finish = false;
+                                GVL_SmallStation.GetInstance.Tray_AGVLogic[i] = 1;
+                                MessageNotify.GetInstance.ShowRunLog("AGV到位 发送到位信号给plc");
+                            }
+                            break;
+                        case 1:
+                            if (GVL_SmallStation.GetInstance.Station1HaveTray)
+
+                            {
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX8." + i, false);
+                                GVL_SmallStation.GetInstance.Tray_AGVLogic[i] = 2;
+                                MessageNotify.GetInstance.ShowRunLog("托盘1有货架");
+                            }
+                            break;
+                        case 2:
+                            if (GVL_SmallStation.GetInstance.AGV_GetTray1Finish && GVL_SmallStation.GetInstance.RecipeProcessStatus[i] == 0)
+                            {
+                                GVL_SmallStation.GetInstance.AGVIsGetTray = false;
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX10." + i, true);
+                                GVL_SmallStation.GetInstance.Tray_AGVLogic[i] = 3;
+                                MessageNotify.GetInstance.ShowRunLog("AGV取托盘1完成,发送给海科信号后1s后复位");
+                            }
+                            break;
+                        case 3:
+                            if (HKDevice.HK_PLC_S7.Read<bool>("DB4.DBX10." + i).Content)
+                            {
+                                Thread.Sleep(1000);
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX10." + i, false);
+                                GVL_SmallStation.GetInstance.Tray_AGVLogic[i] = 0;
+                                GVL_SmallStation.GetInstance.AGV_GetTray1Finish = false;
+                                MessageNotify.GetInstance.ShowRunLog("AGV取托盘1完成，信号复位");
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+            foreach (var recipe in RecipeQueueTray)
+            {
+                int recipeNum = recipe.Key;
+                if (RecipeQueueTray[recipeNum].Count > 0)
+                {
+                    int index = Array.FindIndex(RemoteRecipes.ToArray(), p => p.RecipeCode == RecipeQueueTray[recipeNum].ElementAt(0));
+                    if (index >= 0 && index < RemoteRecipes.Count)
+                    {
+                        string code = RemoteRecipes.ElementAt(index).RecipeCode;
+                        int trayCode = RemoteRecipes.ElementAt(index).TrayCode;
+                        string recipeName = RemoteRecipes.ElementAt(index).RecipeName;
+                        string windSend = RemoteRecipes.ElementAt(index).ToString();
+                        if (trayCode == 1)
+                        {
+                            if (GVL_SmallStation.GetInstance.NotUseSmallStation)
+                            {
+                                if (GVL_SmallStation.GetInstance.AGV_PutTray1Finish)
+                                {
+                                    Thread.Sleep(5000);
+                                    var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
+                                    if (/*SiemensDevice.IsConnected &&*/ !GVL_SmallStation.GetInstance.IsUseLocalRecipe)
+                                    {
+
+
+                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据反馈给西门子");
+                                    }
+                                    else
+                                    {
+                                        MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据无法反馈给西门子，西门子设备未连接或处于本地配方");
+                                    }
+                                    GVL_SmallStation.GetInstance.WindSendDosing = false;
+                                    App.Current.Dispatcher.Invoke(() =>
+                                    {
+                                        Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
+                                    });
+                                    RecipeQueueTray[recipeNum].TryDequeue(out code);
+                                    GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] = 0;
+                                    GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] = 0;
+                                }
+                            }
+                            else
+                            {
+                                //粉料仓下发配方
+                                if (GVL_SmallStation.GetInstance.IsUseWindSend && GVL_SmallStation.GetInstance.WindSendDosing == false /*&& GVL_SmallStation.GetInstance.Tray_AGVLogic[recipeNum] == 2*/)
+                                {
+
+                                }
+                                else
+                                {
+                                    if (Delay.GetInstance("delayTime").Start(true, 60))
+                                    {
+                                        Delay.GetInstance("delayTime").Start(false, 60);
+                                        MessageNotify.GetInstance.ShowRunLog($"风送设备PLC未连接");
+                                    }
+                                }
+                            }
+                            if (GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] == 0)
+                            {
+                                GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] = 0;
+                                HKDevice.IssueRecipeToPlc(RemoteRecipes.ElementAt(index).RawMaterial, recipeNum);
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX2." + recipeNum, true);
+                                GVL_SmallStation.GetInstance.DosingTime[recipeNum] = DateTime.Now;
+                                GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] = 1;
+                                MessageNotify.GetInstance.ShowRunLog($"托盘1,配方编号{code},配方号{recipeNum + 1}，下发完成");
+                            }
+                            bool recipeReceviceFinish = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX4." + recipeNum).Content;
+                            if (recipeReceviceFinish && GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] == 1)
+                            {
+                                HKDevice.HK_PLC_S7.Write("DB4.DBX2." + recipeNum, false);
+                                GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] = 2;
+                                GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] = 0;
+                                MessageNotify.GetInstance.ShowRunLog($"托盘1,配方编号{code},配方号{recipeNum + 1}，配方接收完成");
+                            }
+                            if (GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] == 2)
+                            {
+                                for (byte i = 1; i < 16; i++)
+                                {
+                                    int indexArr = -1;
+                                    if (GVL_SmallStation.GetInstance.plcReadDataDB3.StockBinAllowIssue[i - 1])
+                                    {
+                                        switch (recipeNum)
+                                        {
+                                            case 0:
+                                                indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe1BarrelPosReserve.ToArray(), p => p == i);
+                                                break;
+                                            case 1:
+                                                indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe2BarrelPosReserve.ToArray(), p => p == i);
+                                                break;
+                                            case 2:
+                                                indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe3BarrelPosReserve.ToArray(), p => p == i);
+                                                break;
+                                            case 3:
+                                                indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe4BarrelPosReserve.ToArray(), p => p == i);
+                                                break;
+                                            case 4:
+                                                indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe5BarrelPosReserve.ToArray(), p => p == i);
+                                                break;
+                                        }
+                                        if (indexArr >= 0 && GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum].Get16bitValue((byte)i) == false)
+                                        {
+                                            int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
+                                            float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;//单位g转换kg
+                                            if (weight <= 0)
+                                            {
+                                                if (i >= 1 && i <= 8)
+                                                {
+                                                    string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX12." + (i - 1), true).IsSuccess.ToString();
+                                                    MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                                }
+                                                else if (i >= 9 && i <= 15)
+                                                {
+                                                    string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX13." + (i - 9), true).IsSuccess.ToString();
+                                                    MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                                }
+                                                GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] = GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum].SetBitValue((byte)i, false);//配料完成设备写成false
+                                                GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] = GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum].SetBitValue((byte)i, true);//配料完成设备写成false
+                                            }
+                                            else
+                                            {
+                                                if (loc_index >= 0)
+                                                {
+                                                    DeviceInquire.GetInstance.GetDevice((int)i)?.Start(weight);//根据料仓编号 启动并写入每个原料重量
+                                                    GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] = GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum].SetBitValue((byte)i, true);//配料完成设备写成false
+                                                }
+                                                else
+                                                {
+                                                    MessageNotify.GetInstance.ShowRunLog($"托盘1，配方编号：{code}，配方号{recipeNum + 1}，{indexArr + 1}号桶，错误没有找到{(int)i}号仓的配方");
+                                                }
+                                            }
+                                            MessageNotify.GetInstance.ShowRunLog($"托盘1，配方编号：{code}，配方号{recipeNum + 1}，{indexArr + 1}号桶，{(int)i}号仓，正在配料");
+                                        }
+                                        else
+                                        {
+                                            //MessageNotify.GetInstance.ShowRunLog($"错误，有允许配料信号，但没有相应的位置 和桶号");
+                                        }
+                                        if ((DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3) && indexArr >= 0 && GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum].Get16bitValue((byte)i))
+                                        {
+                                            int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
+                                            if (res < 0)
+                                            {
+
+                                            }
+                                            else
+                                            {
+                                                Thread.Sleep(GVL_SmallStation.GetInstance.Time);
+                                                RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
+                                                bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
+                                                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成,下料完成重量：{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}");
+                                                float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000);
+                                                int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
+                                                if (iIndex >= 0)
+                                                {
+                                                    if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
+                                                    {
+                                                        HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
+                                                        App.Current.Dispatcher.Invoke(() =>
+                                                        {
+                                                            MessageNotify.GetInstance.ShowDialog($"{i}号仓配料误差过大,设置出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000}g，实际出料重量{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}g，相差{AlarmRange}g，允许误差为{Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange)}g，请联系人工处理", DialogType.Warning);
+                                                            HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
+                                                        });
+                                                    }
+                                                }
+                                                if (i >= 1 && i <= 8)
+                                                {
+                                                    string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX12." + (i - 1), true).IsSuccess.ToString();
+                                                    MessageNotify.GetInstance.ShowRunLog(commInfo);
+                                                }
+                                                else if (i >= 9 && i <= 15)
+                                                {
+                                                    string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX13." + (i - 9), true).IsSuccess.ToString();
+                                                    MessageNotify.GetInstance.ShowRunLog(commInfo1);
+                                                }
+                                                GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] = GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum].SetBitValue((byte)i, false);//配料完成设备写成false
+                                                MessageNotify.GetInstance.ShowRunLog($"配方{recipeNum}，{GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum].ToBinString()}");
+                                            }
+                                        }
+                                    }
+                                }
+                                bool DosingComple = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX6." + recipeNum).Content;
+                                if ((RTrig.GetInstance("配方配料完成").Start(DosingComple)) || (GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] > 0 && DosingComple))
+                                {
+                                    GVL_SmallStation.GetInstance.RecipeDosingCompleNum = GVL_SmallStation.GetInstance.RecipeDosingCompleNum + 1;
+                                    GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] = 0;
+                                    if (GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] > 0)
+                                    {
+                                        for (int i = 1; i < 17; i++)
+                                        {
+                                            if (GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum].Get16bitValue((byte)i))
+                                            {
+                                                MessageNotify.GetInstance.ShowRunLog($"料仓配料完成，但存在料仓未配料:{i}号仓");
+                                            }
+                                        }
+                                    }
+                                    var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
+                                    double a = DateTime.Now.Subtract(GVL_SmallStation.GetInstance.DosingTime[recipeNum]).TotalSeconds;
+                                    foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
+                                    {
+                                        MessageNotify.GetInstance.ShowRunLog($"{item.RawMaterialName},下料重量：{item.Laying_Off_Weight}g");
+                                    }
+
+                                    GVL_SmallStation.GetInstance.WindSendDosing = false;
+                                    App.Current.Dispatcher.Invoke(() =>
+                                    {
+                                        Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
+                                    });
+                                    RecipeQueueTray[recipeNum].TryDequeue(out code);
+                                    GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] = 0;
+                                    GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] = 0;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private void StockBinInit()
+        {
+            for (int i = 1; i < 16; i++)
+            {
+                if (DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3)
+                {
+                    DeviceInquire.GetInstance.GetDevice(i).StatusReset();
+                }
+            }
+        }
+        /// <summary>
+        /// 料仓的位置和原料名称的对应
+        /// </summary>
+        public void StockBinNameWithPos()
+        {
+            RawMaterialsNamePos.Clear();
+            foreach (var material in RawMaterialsInfo)
+            {
+                if (!string.IsNullOrEmpty(material.RawMaterialName))
+                {
+                    if (!RawMaterialsNamePos.ContainsKey(material.RawMaterialName))
+                    {
+                        RawMaterialsNamePos.Add(material.RawMaterialName, (short)material.RawMaterialLocation);
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// PLC的DB3变量列表
+        /// </summary>
+        public void PlcVarMonitor()
+        {
+            foreach (PropertyInfo item in typeof(PlcReadAddressDB3).GetProperties())
+            {
+                if (Attribute.IsDefined(item, typeof(VarCommAttribute)))
+                {
+                    string type = item.PropertyType.ToString();
+                    CommData.Add(new PlcInfos()
+                    {
+                        Count = CommData.Count + 1,
+                        Name = item.Name,
+                        Address = item.GetCustomAttribute<VarCommAttribute>().Address,
+                        Type = type.Substring(type.IndexOf(".") + 1),
+                        Describe = item.GetCustomAttribute<VarCommAttribute>().Describe,
+                        Value = item.GetValue(GVL_SmallStation.GetInstance.plcReadDataDB3).ToString(),
+                    });
+                }
+            }
+
+
+
+            foreach (PropertyInfo item in typeof(GVL_SmallStation).GetProperties())
+            {
+                if (Attribute.IsDefined(item, typeof(VarCommAttribute)))
+                {
+                    string type = item.PropertyType.ToString();
+                    ProcessVar.Add(new PlcInfos()
+                    {
+                        Count = ProcessVar.Count + 1,
+                        Name = item.Name,
+                        Type = type.Substring(type.IndexOf(".") + 1),
+                        Address = item.GetCustomAttribute<VarCommAttribute>().Address,
+                        Describe = item.GetCustomAttribute<VarCommAttribute>().Describe,
+                        Value = item.GetValue(GVL_SmallStation.GetInstance).ToString()
+                    });
+                }
+            }
+        }
+        public void RegisterInit()
+        {
+            //手动控制气缸 DB5.DBX0.0~DB5.DBX4.5
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null)
+                {
+                    if (o.ToString().Contains("升降气缸"))
+                    {
+                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
+                        if (index >= 1 && index <= 15)
+                        {
+                            string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
+                            if (index == 8)
+                                address = "DB5.DBX0.7";
+                            HKDevice.HK_PLC_S7.Write<bool>(address, true);
+                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：true");
+                        }
+                    }
+                    else if (o.ToString().Contains("阻挡气缸"))
+                    {
+                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
+                        if (index >= 1 && index <= 15)
+                        {
+                            string address = "";
+                            if (index == 1)
+                                address = "DB5.DBX1.7";
+                            if (index == 2)
+                                address = "DB5.DBX2.0";
+                            if (index == 3)
+                                address = "DB5.DBX2.1";
+                            if (index == 4)
+                                address = "DB5.DBX2.2";
+                            if (index == 5)
+                                address = "DB5.DBX2.3";
+                            if (index == 6)
+                                address = "DB5.DBX2.4";
+                            if (index == 7)
+                                address = "DB5.DBX2.5";
+                            if (index == 8)
+                                address = "DB5.DBX2.6";
+                            if (index == 9)
+                                address = "DB5.DBX2.7";
+                            if (index == 10)
+                                address = "DB5.DBX3.0";
+                            if (index == 11)
+                                address = "DB5.DBX3.1";
+                            if (index == 12)
+                                address = "DB5.DBX3.2";
+                            if (index == 13)
+                                address = "DB5.DBX3.3";
+                            if (index == 14)
+                                address = "DB5.DBX3.4";
+                            if (index == 15)
+                                address = "DB5.DBX3.5";
+                            HKDevice.HK_PLC_S7.Write<bool>(address, true);
+                        }
+                    }
+                    else if (o.ToString().Contains("进料桶顶升气缸"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.6", false);//默认顶升
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：false");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.7", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：true");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.0", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：true");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸3"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.1", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：true");
+                    }
+                    else if (o.ToString().Contains("托盘气缸1_1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.2", false);//默认伸出
+                    }
+                    else if (o.ToString().Contains("托盘气缸1_2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.3", false);
+                    }
+                    else if (o.ToString().Contains("托盘气缸2_1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.4", false);
+                    }
+                    else if (o.ToString().Contains("托盘气缸2_2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.5", false);
+                    }
+                }
+            }), "ManualOpen", true);//根据下发的配方ID将 托盘的位置信息添加到配方中
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null)
+                {
+                    if (o.ToString().Contains("升降气缸"))
+                    {
+                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
+                        if (index >= 1 && index <= 15)
+                        {
+                            string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
+                            if (index == 8)
+                                address = "DB5.DBX0.7";
+                            HKDevice.HK_PLC_S7.Write<bool>(address, false);
+                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：false");
+                        }
+                    }
+                    else if (o.ToString().Contains("阻挡气缸"))
+                    {
+                        int index = Convert.ToInt16(o.ToString().Substring(o.ToString().Length - 2));
+                        if (index >= 1 && index <= 15)
+                        {
+                            string address = "";
+                            if (index == 1)
+                                address = "DB5.DBX1.7";
+                            if (index == 2)
+                                address = "DB5.DBX2.0";
+                            if (index == 3)
+                                address = "DB5.DBX2.1";
+                            if (index == 4)
+                                address = "DB5.DBX2.2";
+                            if (index == 5)
+                                address = "DB5.DBX2.3";
+                            if (index == 6)
+                                address = "DB5.DBX2.4";
+                            if (index == 7)
+                                address = "DB5.DBX2.5";
+                            if (index == 8)
+                                address = "DB5.DBX2.6";
+                            if (index == 9)
+                                address = "DB5.DBX2.7";
+                            if (index == 10)
+                                address = "DB5.DBX3.0";
+                            if (index == 11)
+                                address = "DB5.DBX3.1";
+                            if (index == 12)
+                                address = "DB5.DBX3.2";
+                            if (index == 13)
+                                address = "DB5.DBX3.3";
+                            if (index == 14)
+                                address = "DB5.DBX3.4";
+                            if (index == 15)
+                                address = "DB5.DBX3.5";
+                            HKDevice.HK_PLC_S7.Write<bool>(address, false);
+                        }
+                    }
+                    else if (o.ToString().Contains("进料桶顶升气缸"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.6", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：true");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX3.7", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：false");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.0", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：false");
+                    }
+                    else if (o.ToString().Contains("出料桶顶升气缸3"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.1", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：false");
+                    }
+                    else if (o.ToString().Contains("托盘气缸1_1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.2", true);
+                    }
+                    else if (o.ToString().Contains("托盘气缸1_2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.3", true);
+                    }
+                    else if (o.ToString().Contains("托盘气缸2_1"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.4", true);
+                    }
+                    else if (o.ToString().Contains("托盘气缸2_2"))
+                    {
+                        HKDevice.HK_PLC_S7.Write("DB5.DBX4.5", true);
+                    }
+                }
+            }), "ManualClose", true);//根据下发的配方ID将 托盘的位置信息添加到配方中
+            //手动控制电机轴 DB5.DBX4.6~DB5.DBX5.2
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", true); }), "StartAxisLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", false); }), "StopAxisLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", true); }), "StartAxisMidCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", false); }), "StopAxisMidCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", true); }), "StartAxisUnLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", false); }), "StopAxisUnLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", true); }), "StartAxis1Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", false); }), "StopAxis1Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", true); }), "StartAxis2Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", false); }), "StopAxis2Command", true);
+
+
+
+            //将本地配方发送到西门子配方里，执行配料
+            ActionManage.GetInstance.Register(new Action<Object>((res) =>
+            {
+                if (res != null && res is RemoteRecipeData rm)
+                {
+                    //Json<RemoteRecipeDataColl>.Data.Recipes.Add(rm);
+                    var newRecipe = new RemoteRecipeData();
+                    newRecipe.RecipeName = rm.RecipeName;
+                    newRecipe.RecipeCode = rm.RecipeCode;
+                    newRecipe.TrayCode = rm.TrayCode;
+
+                    foreach (var item in rm.RawMaterial)
+                    {
+                        newRecipe.RawMaterial.Add(new RemoteRecipeRawMaterial()
+                        {
+                            DeviceIp = item.DeviceIp,
+                            RawMaterialName = item.RawMaterialName,
+                            RawMaterialBarrelNum = item.RawMaterialBarrelNum,
+                            RawMaterialType = item.RawMaterialType,
+                            RawMaterialWeight = item.RawMaterialWeight,
+                            Laying_Off_Weight = item.Laying_Off_Weight,
+                            StockBinRemainingWeight = item.StockBinRemainingWeight,
+                            RawMaterialLocation = item.RawMaterialLocation,
+                            IsDosingComple = item.IsDosingComple
+                        });
+                    }
+
+                    Json<RemoteRecipeDataColl>.Data.Recipes.Add(newRecipe);
+                }
+            }), "LocalSimulationRecipeIssue", true);
+
+            //手动控制系统模式
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", true); }), "SystemStart", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", false); }), "SystemStop", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.2", true); }), "SystemPause", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.2", false); }), "SystemReset", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.1", false); }), "SystemAutoMode", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.1", true); }), "SystemDebugMode", true);
+            //流程控制
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.3", true); }), "ManualSystemReset", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.4", true); }), "CLearRecipeInfo", true);
+            ActionManage.GetInstance.Register(new Action(() =>
+            {
+                Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
+                GVL_SmallStation.GetInstance.SiemensSendRecipeStatus = 0;
+
+                GVL_SmallStation.GetInstance.WindSendDosingStatus = 0;
+                GVL_SmallStation.GetInstance.WindSendDosing = false;
+
+                GVL_SmallStation.GetInstance.Order_Cancel = false;
+                GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
+                GVL_SmallStation.GetInstance.OrderCancelStep = 0;
+
+                for (int i = 0; i < 5; i++)
+                {
+                    RecipeQueueTray[i].Clear();
+                    GVL_SmallStation.GetInstance.RecipeProcessStatus[i] = 0;
+                    GVL_SmallStation.GetInstance.Tray_AGVLogic[i] = 0;
+                }
+                StockBinInit();
+                //for (int i = 0; i < GVL_SmallStation.GetInstance.StockInDosingComple.Length; i++)
+                //{
+                //    GVL_SmallStation.GetInstance.StockInDosingComple[i] = false;
+                //}
+                MessageNotify.GetInstance.ShowRunLog("系统流程复位，等待西门子重新下发订单");
+            }), "BPASystemReset", true);
+
+            //往海科PLC写值
+            ActionManage.GetInstance.Register(new Action<Object>((o) =>
+            {
+                if (o != null && o is HKDeviceWrite data)
+                {
+                    if (data.PlcVarType == PlcVarType.Bool)
+                    {
+                        bool value = (bool)data.Value;
+                        HKDevice.HK_PLC_S7.Write<bool>(data.Address, value);
+                    }
+                    else if (data.PlcVarType == PlcVarType.Byte)
+                    {
+                        byte value = (byte)data.Value;
+                        HKDevice.HK_PLC_S7.Write<byte>(data.Address, value);
+                    }
+                    else if (data.PlcVarType == PlcVarType.Int)
+                    {
+                        short value = (short)data.Value;
+                        HKDevice.HK_PLC_S7.Write<short>(data.Address, value);
+                    }
+                    else if (data.PlcVarType == PlcVarType.Dint)
+                    {
+                        int value = (int)data.Value;
+                        HKDevice.HK_PLC_S7.Write<int>(data.Address, value);
+                    }
+                    else if (data.PlcVarType == PlcVarType.Real)
+                    {
+                        float value = (float)data.Value;
+                        HKDevice.HK_PLC_S7.Write<float>(data.Address, value);
+                    }
+                }
+            }), "PLCWrite", true);
+
+            //电机速度
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is short value)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB47.DBW8", value);
+                }
+            }), "AxisLoadSpeedSet", true);
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is short value)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB47.DBW10", value);
+                }
+            }), "AxisMidSpeedSet", true);
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is short value)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB47.DBW12", value);
+                }
+            }), "AxisUnLoadSpeedSet", true);
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is float value)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB47.DBD0", value);
+                }
+            }), "Axis1SpeedSet", true);
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is float value)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB47.DBD4", value);
+                }
+            }), "Axis2SpeedSet", true);
+
+            //机器人的操作
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is string address)
+                {
+                    HKDevice.HK_PLC_S7.Write(address, true);
+                }
+            }), "RobotSendTrueCommand", true);
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is string address)
+                {
+                    HKDevice.HK_PLC_S7.Write(address, false);
+                }
+            }), "RobotSendFalseCommand", true);
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is short Value)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB4.DBB1", (byte)Value);
+                }
+            }), "RobotSetProgramNum", true);
+
+        }
+        public void DeviceConnect()
+        {
+            try
+            {
+                if (Json<DevicePar>.Data.deviceConnectPar.HKPlcConnect)
+                {
+                    //HKDevice.HK_PLC_S7.Connect(S7.Net.CpuType.S71200, HK_PLC_IP);
+                    HKDevice.HK_PLC_S7.Connect(new BPA.Communication.Base.ConfigurationOptions() { cpuType = CpuType.S71200, IpAddress = HK_PLC_IP });
+                    if (HKDevice.IsConnected)
+                        MessageNotify.GetInstance.ShowRunLog("海科plc连接成功");
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageNotify.GetInstance.ShowAlarmLog("海科plc连接失败，等待重新连接");
+            }
+            finally
+            {
+                HKDevice.Init();
+                MessageNotify.GetInstance.ShowRunLog("海科plc初始化完成");
+            }
+
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                try
+                {
+                    if (!HKDevice.IsConnected && Json<DevicePar>.Data.deviceConnectPar.HKPlcConnect)
+                    {
+                        HKDevice.HK_PLC_S7.Connect(new BPA.Communication.Base.ConfigurationOptions() { cpuType = CpuType.S71200, IpAddress = HK_PLC_IP });
+                        if (HKDevice.IsConnected)
+                            MessageNotify.GetInstance.ShowRunLog("海科PLC重新连接成功");
+                    }
+                }
+                catch (Exception ex)
+                {
+                }
+
+
+                Thread.Sleep(50);
+            }), "设备连接", true);
+        }
+
+        private void DosingDevice(int Index, int DeviceID)
+        {
+            if (RTrig.GetInstance("Tray2StatusDevice" + DeviceID).Start(DeviceInquire.GetInstance.GetDevice(DeviceID).deviceStatus.RunStatus == 3))
+            {
+                MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘2,配方：{RemoteRecipes.ElementAt(Index).RecipeName},{DeviceID}号仓，配料完成");
+                int res = Array.FindIndex(RemoteRecipes.ElementAt(Index).RawMaterial.ToArray(), p => p.RawMaterialLocation == DeviceID);
+                RemoteRecipes.ElementAt(Index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(DeviceID).deviceStatus.CutWeightFeedback;
+                DeviceInquire.GetInstance.GetDevice(DeviceID).StatusReset();
+                if (DeviceID >= 1 && DeviceID <= 8)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (DeviceID - 1), true);
+                }
+                else if (DeviceID >= 9 && DeviceID <= 15)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (DeviceID - 9), true);
+                }
+            }
+        }
+
+        public void RawMaterialNameWithCode()
+        {
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.Clear();
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0001", "色拉油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0002", "一级菜油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0003", "菜籽油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0004", "青花椒油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0005", "卤牛肉丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0006", "冻鸡肉丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0007", "香菇丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0008", "高水分糍粑海椒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0009", "低水分糍粑海椒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0010", "辣豆瓣");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0011", "整豆豉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0012", "豆豉细粒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0013", "卤黄豆");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0014", "野山椒粒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0015", "竹笋丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0016", "香辣酱辣椒酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0017", "芽菜粒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0018", "榨菜丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0019", "盐菜");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0020", "洋葱丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0021", "番茄酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0022", "甜豆瓣");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0023", "甜面酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0024", "芝麻酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0025", "炸花生");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0026", "盐渍青椒丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0027", "备料剁红椒");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0028", "萝卜丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0029", "油芝麻");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0030", "生姜");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0031", "大蒜");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0032", "榨菜酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0033", "炸碗豆");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0034", "大头菜丁");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0035", "酱油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0036", "I+G");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0037", "味精");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0038", "白糖");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0039", "食盐");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0040", "花椒酱");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0041", "调味膏2");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0042", "调味膏5");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0043", "十三香调味膏");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0044", "酱香膏");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0045", "芽菜香料粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0046", "香料Ａ");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0047", "香料Ｄ");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0048", "猪肉精膏");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0049", "调味膏3");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0050", "柠檬酸粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0051", "辣椒红");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0052", "辣椒油树脂");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0053", "水态混和酸");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0054", "加水稀释后防腐剂");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0055", "异维Ｃ钠粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0056", "琼脂粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0057", "香葱油");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0058", "水态甜味剂");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0059", "孜然粉");
+            GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0060", "孜然油");
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/ActionMenu.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/ActionMenu.cs
new file mode 100644
index 00000000..d383bb1d
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/ActionMenu.cs
@@ -0,0 +1,22 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class ActionMenu : ObservableObject
+    {
+        public string CommandParameter { get { return _mCommandParameter; } set { _mCommandParameter = value; OnPropertyChanged(); } }
+        private string _mCommandParameter;
+
+        //public Permission[] permission { get { return _mpermission; } set { _mpermission = value; OnPropertyChanged(); } }
+        //private Permission[] _mpermission;
+
+        public string MenuName { get { return _mMenuName; } set { _mMenuName = value; OnPropertyChanged(); } }
+        private string _mMenuName;
+
+
+        //public string NameSpace { get { return _mNameSpace; } set { _mNameSpace = value; OnPropertyChanged(); } }
+        //private string _mNameSpace;
+
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/AlarmInfo.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/AlarmInfo.cs
new file mode 100644
index 00000000..e6581741
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/AlarmInfo.cs
@@ -0,0 +1,43 @@
+using BPASmartClient.CustomResource.Pages.Model;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class AlarmInfo
+    {
+        /// <summary>
+        /// 1#急停
+        /// </summary>
+        [Alarm("1#急停")]
+        public bool EStop1 { get; set; }
+
+        /// <summary>
+        /// 伺服故障
+        /// </summary>
+        [Alarm("伺服故障")]
+        public bool Servo { get; set; }
+
+        /// <summary>
+        /// 变频器故障
+        /// </summary>
+        [Alarm("变频器故障")]
+        public bool Inverter { get; set; }
+
+        /// <summary>
+        /// 2#急停
+        /// </summary>
+        [Alarm("2#急停")]
+        public bool EStop2 { get; set; }
+
+        /// <summary>
+        /// 料仓上限
+        /// </summary>
+        [Alarm("料仓上限")]
+        public bool SiloUpperLimit { get; set; }
+
+        /// <summary>
+        /// 料仓下限
+        /// </summary>
+        [Alarm("料仓下限")]
+        public bool SiloLowerLimit { get; set; }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/ConveyorServer.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/ConveyorServer.cs
new file mode 100644
index 00000000..0fca193d
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/ConveyorServer.cs
@@ -0,0 +1,10 @@
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class ConveyorServer
+    {
+        public ConveyorServer()
+        {
+
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/CylinderStatusModel.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/CylinderStatusModel.cs
new file mode 100644
index 00000000..5c77f971
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/CylinderStatusModel.cs
@@ -0,0 +1,22 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class CylinderStatusModel : ObservableObject
+    {
+        /// <summary>
+        /// 气缸原点信号
+        /// </summary>
+        public bool HomeStatus { get { return _mHomeStatus; } set { _mHomeStatus = value; OnPropertyChanged(); } }
+        private bool _mHomeStatus;
+
+        /// <summary>
+        /// 气缸到位信号
+        /// </summary>
+        public bool InPlace { get { return _mInPlace; } set { _mInPlace = value; OnPropertyChanged(); } }
+        private bool _mInPlace;
+
+
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceAddress.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceAddress.cs
new file mode 100644
index 00000000..42c831d6
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceAddress.cs
@@ -0,0 +1,114 @@
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class DeviceAddress
+    {
+        /// <summary>
+        /// 设备名称起始地址
+        /// </summary>
+        public static string DeviceName { get; set; } = "LW0";
+
+        /// <summary>
+        /// 料仓重量反馈起始地址
+        /// </summary>
+        public static string WeightFeedback { get; set; } = "LW52";
+
+        /// <summary>
+        /// 重量设置地址
+        /// </summary>
+        public static string WeightSet { get; set; } = "LW21";
+
+        /// <summary>
+        /// 启动信号地址
+        /// </summary>
+        public static string Start { get; set; } = "LW20";
+
+        /// <summary>
+        /// 开盖地址
+        /// </summary>
+        public static string OpenLid { get; set; } = "";
+
+        /// <summary>
+        /// 关盖地址
+        /// </summary>
+        public static string CloseLid { get; set; } = "";
+
+        /// <summary>
+        /// 下料重量反馈地址
+        /// </summary>
+        public static string CutWeightFeedback { get; set; } = "LW54";
+
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        public static string DeviceNum { get; set; } = "LW57";
+
+        /// <summary>
+        /// 设备故障编码
+        /// </summary>
+        public static string DeviceAlarmCode { get; set; } = "LW51";
+
+        /// <summary>
+        /// 原料设备类型
+        /// 1：膏体，2：液体，3：粉体
+        /// </summary>
+        public static string MaterialDeviceType { get; set; } = "LW56";
+
+        /// <summary>
+        /// 设备运行状态地址
+        /// </summary>
+        public static string RunStatus { get; set; } = "LW60";
+
+        /// <summary>
+        /// 出料完成，置位该信号，plc复位运行状态
+        /// </summary>
+        public static string FinfishStatus { get; set; } = "LW40";
+
+        /// <summary>
+        /// 慢加重量
+        /// </summary>
+        public static string SlowlyAddWeight { get; set; } = "LW23";
+
+        /// <summary>
+        /// 提前关阀重量
+        /// </summary>
+        public static string PreCloseValveWeight { get; set; } = "LW25";
+
+        /// <summary>
+        /// 快加速度
+        /// </summary>
+        public static string RapidAcceleration { get; set; } = "LW27";
+
+        /// <summary>
+        /// 慢加速度
+        /// </summary>
+        public static string SlowAcceleration { get; set; } = "LW29";
+
+        /// <summary>
+        /// 伺服手动速度
+        /// </summary>
+        public static string ServoManualSpeed { get; set; } = "LW31";
+
+        /// <summary>
+        /// 料仓上限重量
+        /// </summary>
+        public static string SiloUpperLimitWeight { get; set; } = "LW33";
+
+        /// <summary>
+        /// 料仓下限重量
+        /// </summary>
+        public static string LowerLimitWeightOfSilo { get; set; } = "LW35";
+
+        /// <summary>
+        /// 配料信号反馈
+        /// </summary>
+        public static string DosingStatusFeedback { get; set; } = "LW62";
+
+        /// <summary>
+        /// 搅拌速度
+        /// </summary>
+        public static string StirringSpeed { get; set; } = "LW37";
+    }
+
+
+
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceCurrentStatus.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceCurrentStatus.cs
new file mode 100644
index 00000000..0c9f3dab
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceCurrentStatus.cs
@@ -0,0 +1,25 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class DeviceCurrentStatus : ObservableObject
+    {
+
+        public double Weight { get { return _mWeight; } set { _mWeight = value; OnPropertyChanged(); } }
+        private double _mWeight;
+
+
+        public ushort RunStatus { get { return _mRunStatus; } set { _mRunStatus = value; OnPropertyChanged(); } }
+        private ushort _mRunStatus;
+
+
+        public int DeviceNum { get { return _mDeviceNum; } set { _mDeviceNum = value; OnPropertyChanged(); } }
+        private int _mDeviceNum;
+
+        public string DeviceName { get { return _mDeviceName; } set { _mDeviceName = value; OnPropertyChanged(); } }
+        private string _mDeviceName;
+
+
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceInquire.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceInquire.cs
new file mode 100644
index 00000000..bd98dd2d
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceInquire.cs
@@ -0,0 +1,443 @@
+using BPA.Communication;
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.FoodStationTest.ViewModel;
+using BPASmartClient.Helper;
+using BPASmartClient.Model;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Net.NetworkInformation;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class DeviceInquire
+    {
+        private volatile static DeviceInquire _Instance;
+        public static DeviceInquire GetInstance => _Instance ?? (_Instance = new DeviceInquire());
+        private DeviceInquire() { }
+
+        string IPSegment = "107.107.2.";
+
+        ConcurrentDictionary<string, DeviceStatus> DeviceLists = new ConcurrentDictionary<string, DeviceStatus>();
+        List<string> InvalidIP = new List<string>();//无效 IP 集合
+        List<string> IPLists = new List<string>();//启动 Ping 任务IP集合
+        ConcurrentQueue<string> IPQueues = new ConcurrentQueue<string>();//pincomplete 完成队列
+
+        public ObservableCollection<DeviceCurrentStatus> TopDeviceCurrentStatuses { get; set; } = new ObservableCollection<DeviceCurrentStatus>();
+        public ObservableCollection<DeviceCurrentStatus> BottomDeviceCurrentStatuses { get; set; } = new ObservableCollection<DeviceCurrentStatus>();
+        public ObservableCollection<Devices> devices { get; set; } = new ObservableCollection<Devices>();
+        private void DeviceDataInit()
+        {
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                for (int i = 0; i < DeviceLists.Count; i++)
+                {
+                    string deviceName = DeviceLists.ElementAt(i).Value.DeviceName;
+                    int TopIndex = Array.FindIndex(TopDeviceCurrentStatuses.ToArray(), p => p.DeviceName == deviceName);
+                    int BottomIndex = Array.FindIndex(BottomDeviceCurrentStatuses.ToArray(), p => p.DeviceName == deviceName);
+                    if (TopIndex >= 0 && TopIndex < TopDeviceCurrentStatuses.Count)
+                    {
+                        TopDeviceCurrentStatuses.ElementAt(TopIndex).Weight = DeviceLists.ElementAt(i).Value.deviceStatus.WeightFeedback;
+                        TopDeviceCurrentStatuses.ElementAt(TopIndex).DeviceNum = DeviceLists.ElementAt(i).Value.deviceStatus.DeviceNum;
+                        TopDeviceCurrentStatuses.ElementAt(TopIndex).RunStatus = DeviceLists.ElementAt(i).Value.deviceStatus.RunStatus;
+                    }
+                    if (BottomIndex >= 0 && BottomIndex < BottomDeviceCurrentStatuses.Count)
+                    {
+                        BottomDeviceCurrentStatuses.ElementAt(BottomIndex).Weight = DeviceLists.ElementAt(i).Value.deviceStatus.WeightFeedback;
+                        BottomDeviceCurrentStatuses.ElementAt(BottomIndex).DeviceNum = DeviceLists.ElementAt(i).Value.deviceStatus.DeviceNum;
+                        BottomDeviceCurrentStatuses.ElementAt(BottomIndex).RunStatus = DeviceLists.ElementAt(i).Value.deviceStatus.RunStatus;
+                    }
+                    int deviceIndex = Array.FindIndex(devices.ToArray(), p => p.IpAddress == DeviceLists.ElementAt(i).Key && p.DeviceName != DeviceLists.ElementAt(i).Value.DeviceName);
+                    if (deviceIndex >= 0 && deviceIndex < devices.Count)
+                    {
+                        devices.ElementAt(deviceIndex).DeviceName = DeviceLists.ElementAt(i).Value.DeviceName;
+                    }
+                    if (!ThreadManage.GetInstance().IsContainsKey($"{deviceName} 开始监听"))
+                    {
+                        DeviceLists[DeviceLists.ElementAt(i).Key].Init(deviceName);
+                    }
+                }
+
+                Thread.Sleep(200);
+            }), "设备状态监听", true);
+        }
+        private void TestData()
+        {
+            for (int i = 0; i < 8; i++)
+            {
+                TopDeviceCurrentStatuses.Add(new DeviceCurrentStatus()
+                {
+                    DeviceName = $"测试设备{i + 1}",
+                    DeviceNum = i + 1,
+                    RunStatus = 1,
+                    Weight = new Random().Next(100, 10000) / 100.0
+
+                });
+
+                devices.Add(new Devices()
+                {
+                    DeviceName = $"测试设备{i + 1}",
+                    IpAddress = $"192.168.1.{i + 1}",
+                });
+            }
+
+            for (int i = 8; i < 16; i++)
+            {
+                BottomDeviceCurrentStatuses.Add(new DeviceCurrentStatus()
+                {
+                    DeviceName = $"测试设备{i + 1}",
+                    DeviceNum = i + 1,
+                    RunStatus = 1,
+                    Weight = new Random().Next(100, 10000) / 100.0
+                });
+
+                devices.Add(new Devices()
+                {
+                    DeviceName = $"测试设备{i + 1}",
+                    IpAddress = $"192.168.1.{i + 1}",
+                });
+            }
+        }
+        public void Init()
+        {
+            //AlarmHelper<AlarmInfo>.Init();
+            //AlarmHelper<AlarmInfo>.Alarm.EStop1 = true;
+            //IPSegment = ConfigurationManager.AppSettings["RawMaterial_IP"];
+            //TestData();
+            IpAddressLines();
+            DeviceDataInit();
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                if (IPQueues.Count >= IPLists.Count)
+                    IpAddressLines();
+                Thread.Sleep(5000);
+            }), "配料机设备上线监听", true);
+        }
+
+        public void Rescan()
+        {
+            InvalidIP.Clear();
+        }
+
+        public DeviceStatus GetDevice(string ip)
+        {
+            if (ip != null)
+            {
+                var res = DeviceLists.Values.FirstOrDefault(p => p.IpAddress == ip);
+                if (res != null)
+                    return res;
+            }
+            return new DeviceStatus();
+        }
+        public DeviceStatus GetDevice(int location)
+        {
+            if (location > 0 && location < 16)
+            {
+                var res = DeviceLists.Values.FirstOrDefault(p => p.deviceStatus.DeviceNum == location);
+                if (res != null)
+                    return res;
+            }
+            return new DeviceStatus();
+        }
+
+        public List<DeviceStatus> GetDevice()
+        {
+            List<DeviceStatus> deviceStatuses = new List<DeviceStatus>();
+            foreach (var device in DeviceLists)
+            {
+                deviceStatuses.Add(device.Value);
+            }
+            return deviceStatuses;
+        }
+
+        private void IpAddressLines()
+        {
+            IPLists.Clear();
+            IPQueues.Clear();
+            /* for (int i = 1; i <= 255; i++)
+             {
+                 if (!InvalidIP.Contains($"{IPSegment}{i}") && !DeviceLists.ContainsKey($"{IPSegment}{i}"))
+                 {
+                     IPLists.Add($"{IPSegment}{i}");
+                 }
+             }*/
+            //吉香居特定IP
+            for (int i = 0; i < 15; i++)
+            {
+                IPLists.Add($"{IPSegment}{i + 69}");
+            }
+
+
+            IPLists.ForEach((item) =>
+            {
+                Ping myPing = new Ping();
+                myPing.PingCompleted += new PingCompletedEventHandler(_myPing_PingCompleted);
+                myPing.SendAsync(item, 1000, null);
+            });
+        }
+
+        private void _myPing_PingCompleted(object sender, PingCompletedEventArgs e)
+        {
+            if (e.Reply != null && e.Reply.Status == IPStatus.Success)
+            {
+                string ip = e.Reply.Address.ToString();
+                if (!DeviceLists.ContainsKey(ip))
+                {
+                    DeviceStatus DS = new DeviceStatus();
+                    DS.modbusTcp.IsReconnect = false;
+
+                    DS.modbusTcp.ConnectOk = new Action(() =>
+                    {
+                        string DeviceName = DS.modbusTcp.Read<string>(DeviceAddress.DeviceName, 20).Content.Trim()?.Replace(" ", "");//读取设备名称
+                        if (DeviceName.Length > 0)
+                        {
+                            DeviceLists.TryAdd(ip, DS);
+                            DeviceLists[ip].Init(DeviceName);
+                            DeviceLists[ip].modbusTcp.IsReconnect = false;
+                            App.Current.Dispatcher.Invoke(new Action(() =>
+                            {
+                                //DeviceListViewModel.devices.Add(new Devices()
+                                //{
+                                //    DeviceName = DeviceName,
+                                //    IpAddress = ip
+                                //});//加入连接的（有名称的）设备列表
+
+                                devices.Add(new Devices() { DeviceName = DeviceName, IpAddress = ip });
+
+                                if (TopDeviceCurrentStatuses.Count <= 7)
+                                    TopDeviceCurrentStatuses.Add(new DeviceCurrentStatus() { DeviceName = DeviceName });
+                                else
+                                    BottomDeviceCurrentStatuses.Add(new DeviceCurrentStatus() { DeviceName = DeviceName });
+
+
+                                for (int i = 0; i < Json<LocaPar>.Data.Recipes.Count; i++)
+                                {
+                                    for (int m = 0; m < Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.Count; m++)
+                                    {
+                                        if (Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).DeviceIp == ip)
+                                        {
+                                            Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).RawMaterialName = DeviceName;
+                                        }
+                                    }
+                                }
+                                if (Global.DeviceRawMaterials.Count > 0)
+                                {
+                                    if (Global.DeviceRawMaterials.FirstOrDefault(p => p.RawMaterialName == DeviceName) == null)
+                                    {
+                                        Global.DeviceRawMaterials.Add(new RawMaterialModel() { RawMaterialName = DeviceName, DeviceIp = ip, RawMaterialSource = 1 });
+                                    }
+                                }
+                                else
+                                {
+                                    Global.DeviceRawMaterials.Add(new RawMaterialModel() { RawMaterialName = DeviceName, DeviceIp = ip, RawMaterialSource = 1 });
+                                }
+
+                            }));
+                        }
+                        else
+                        {
+                            //if (!InvalidIP.Contains(ip)) InvalidIP.Add(ip);
+
+                            if (DeviceLists.ContainsKey(ip))
+                            {
+                                DeviceLists[ip].Dispose();
+                                var res11 = DeviceLists[ip];
+                                DeviceLists.TryRemove(ip, out res11);
+                            }
+                        }
+                    });
+
+                    DS.modbusTcp.ConnectFail = new Action(() =>
+                    {
+                        //if (!InvalidIP.Contains(ip)) InvalidIP.Add(ip);
+                        //MessageLog.GetInstance.ShowAlarmLog($"设备{ip}连接失败");
+
+
+                        if (DeviceLists.ContainsKey(ip))
+                        {
+                            DeviceLists[ip].Dispose();
+                            var res11 = DeviceLists[ip];
+                            DeviceLists.TryRemove(ip, out res11);
+                        }
+                    });
+
+                    DS.modbusTcp.Disconnect = new Action(() =>
+                    {
+                        if (InvalidIP.Contains(ip))
+                            InvalidIP.Remove(ip);
+                        var res = devices.FirstOrDefault(P => P.IpAddress == ip);
+                        if (res != null && devices.Contains(res))
+                        {
+                            App.Current.Dispatcher.Invoke(new Action(() =>
+                            {
+                                devices.Remove(res);
+                                var item = Global.DeviceRawMaterials.FirstOrDefault(P => P.RawMaterialName == res.DeviceName);
+                                if (item != null)
+                                    Global.DeviceRawMaterials.Remove(item);
+
+                                var topRes = TopDeviceCurrentStatuses.FirstOrDefault(p => p.DeviceName == res.DeviceName);
+                                var bottomRes = BottomDeviceCurrentStatuses.FirstOrDefault(p => p.DeviceName == res.DeviceName);
+                                if (topRes != null)
+                                    TopDeviceCurrentStatuses.Remove(topRes);
+                                if (bottomRes != null)
+                                    BottomDeviceCurrentStatuses.Remove(bottomRes);
+                            }));
+                        }
+
+                        if (DeviceLists.ContainsKey(ip))
+                        {
+                            DeviceLists[ip].Dispose();
+                            var res11 = DeviceLists[ip];
+                            DeviceLists.TryRemove(ip, out res11);
+                        }
+                    });
+
+                    Task.Run(new Action(() =>
+                    {
+                        DS.modbusTcp.Connect(new BPA.Communication.Base.ConfigurationOptions() { IpAddress = ip, Port = 502 });//PLC连接
+                        IPQueues.Enqueue(e.Reply.Address.ToString());
+                    }));
+                }
+                else
+                {
+                    IPQueues.Enqueue(e.Reply.Address.ToString());
+                }
+            }
+            else
+            {
+                if (e.Reply != null)
+                    IPQueues.Enqueue(e.Reply.Address.ToString());
+            }
+        }
+    }
+
+    public class DeviceStatus
+    {
+
+        #region 对象属性声明
+        public string DeviceName = String.Empty;
+        public string IpAddress = "172.16.0.200";
+        /// <summary>
+        /// 设备状态
+        /// </summary>
+        public RawMaterialDeviceStatus deviceStatus { get; set; } = new RawMaterialDeviceStatus();
+
+
+
+        public ModbusTcp modbusTcp = new ModbusTcp();
+
+        public bool IsConnected => modbusTcp.IsReconnect;
+        #endregion
+
+        public void Init(string DeviceName)
+        {
+
+            this.DeviceName = DeviceName;
+            //AlarmHelper<AlarmInfo>.Init();
+            if (modbusTcp.IsConnected())
+            {
+                ThreadManage.GetInstance().StartLong(new Action(() =>
+                {
+                    if (modbusTcp.IsConnected())
+                    {
+                        deviceStatus.RunStatus = (ushort)this.modbusTcp.Read<ushort>(DeviceAddress.RunStatus).Content; //获取设备运行状态
+                        deviceStatus.WeightFeedback = this.modbusTcp.Read<float>(DeviceAddress.WeightFeedback).Content;//获取设备料仓剩余重量
+                        deviceStatus.NowWeightFeedback = this.modbusTcp.Read<float>(DeviceAddress.CutWeightFeedback).Content;//获取下料重量
+                        deviceStatus.DeviceNum = (ushort)this.modbusTcp.Read<ushort>(DeviceAddress.DeviceNum).Content;//获取设备编号
+                        deviceStatus.DeviceAlarmCode = (ushort)this.modbusTcp.Read<ushort>(DeviceAddress.DeviceAlarmCode).Content;//获取设备故障编码
+                        AlarmHelper<AlarmInfo>.GetInstance(DeviceName).EStop1 = deviceStatus.DeviceAlarmCode.Get16bitValue(1);
+                        AlarmHelper<AlarmInfo>.GetInstance(DeviceName).Servo = deviceStatus.DeviceAlarmCode.Get16bitValue(2);
+                        AlarmHelper<AlarmInfo>.GetInstance(DeviceName).Inverter = deviceStatus.DeviceAlarmCode.Get16bitValue(3);
+                        AlarmHelper<AlarmInfo>.GetInstance(DeviceName).EStop2 = deviceStatus.DeviceAlarmCode.Get16bitValue(7);
+                        AlarmHelper<AlarmInfo>.GetInstance(DeviceName).SiloUpperLimit = deviceStatus.DeviceAlarmCode.Get16bitValue(8);
+                        AlarmHelper<AlarmInfo>.GetInstance(DeviceName).SiloLowerLimit = deviceStatus.DeviceAlarmCode.Get16bitValue(9);
+                        //允许配料即产线气缸抬起，发送给味魔方
+                        if (deviceStatus.DeviceNum >= 1 && deviceStatus.DeviceNum <= 15)
+                        {
+                            if (GVL_SmallStation.GetInstance.plcReadDataDB3.StockBinAllowIssue[deviceStatus.DeviceNum - 1])
+                            {
+                                this.modbusTcp.Write("LW41", (ushort)1);
+                                GVL_SmallStation.GetInstance.StockBinCylinderStatus.SetBitValue((byte)(deviceStatus.DeviceNum), true);
+                            }
+                            else
+                            {
+                                this.modbusTcp.Write("LW41", (ushort)0);
+                                GVL_SmallStation.GetInstance.StockBinCylinderStatus.SetBitValue((byte)(deviceStatus.DeviceNum), false);
+                            }
+                        }
+                        Thread.Sleep(10);
+                    }
+                }), $"{DeviceName} 开始监听", true);
+            }
+        }
+
+        public void SetDeviceName(string name)
+        {
+            this.modbusTcp.Write(DeviceAddress.DeviceName, new ushort[20]);
+            this.modbusTcp.Write<string>(DeviceAddress.DeviceName, name);
+        }
+
+        /// <summary>
+        /// 开盖
+        /// </summary>
+        public void OpenLid()
+        {
+            //modbusTcp.Write(DeviceAddress.OpenLid, (ushort)1);
+        }
+        /// <summary>
+        /// 关盖
+        /// </summary>
+        public void CloseLid()
+        {
+            //modbusTcp.Write(DeviceAddress.CloseLid, (ushort)1);
+        }
+
+        public bool StatusReset()
+        {
+            return this.modbusTcp.Write(DeviceAddress.FinfishStatus, (ushort)1).IsSuccess;
+            //var res = modbusTcp.Read(DeviceAddress.RunStatus);
+        }
+
+        public void Dispose()
+        {
+            ThreadManage.GetInstance().StopTask($"{DeviceName} 开始监听");
+        }
+
+
+        public void Start(float Value)
+        {
+
+            if (modbusTcp.IsConnected())
+            {
+                var res = Json<DevicePar>.Data.deviceParModels.FirstOrDefault(p => p.MaterialName == DeviceName);
+                if (res != null)
+                {
+                    modbusTcp.Write<float>(DeviceAddress.SlowlyAddWeight, res.SlowlyAddWeight);
+                    modbusTcp.Write<float>(DeviceAddress.PreCloseValveWeight, res.PreCloseValveWeight);
+                    modbusTcp.Write<uint>(DeviceAddress.RapidAcceleration, (uint)res.RapidAcceleration);
+                    modbusTcp.Write<uint>(DeviceAddress.SlowAcceleration, (uint)res.SlowAcceleration);
+                    modbusTcp.Write<uint>(DeviceAddress.ServoManualSpeed, (uint)res.ServoManualSpeed);
+                    modbusTcp.Write<uint>(DeviceAddress.SiloUpperLimitWeight, (uint)res.SiloUpperLimitWeight);
+                    modbusTcp.Write<uint>(DeviceAddress.LowerLimitWeightOfSilo, (uint)res.LowerLimitWeightOfSilo);
+                    modbusTcp.Write<uint>(DeviceAddress.StirringSpeed, (uint)res.StirringSpeed * 100);
+                    MessageNotify.GetInstance.ShowRunLog($"{res.MaterialName},参数下发完成");
+                }
+                modbusTcp.Write<float>(DeviceAddress.WeightSet, Value);//写入原料重量
+                if (!modbusTcp.Write(DeviceAddress.Start, (ushort)1).IsSuccess)//设备启动写入
+                {
+                    MessageNotify.GetInstance.ShowRunLog($"{DeviceName},设置重量：{Value}，启动信号写入失败");
+                }
+                MessageNotify.GetInstance.ShowRunLog($"{DeviceName},设置重量：{Value}，柔性味魔方开始配料");
+            }
+
+
+
+
+
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/DevicePar.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/DevicePar.cs
new file mode 100644
index 00000000..927e0316
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/DevicePar.cs
@@ -0,0 +1,18 @@
+using BPASmartClient.FoodStationTest.Model.Bom;
+using BPASmartClient.FoodStationTest.Model.Par;
+using BPASmartClient.FoodStationTest.Model.RawMaterial;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class DevicePar : ObservableObject
+    {
+        public ObservableCollection<DeviceParMode> deviceParModels { get; set; } = new ObservableCollection<DeviceParMode>();
+        public ConnectParMode deviceConnectPar { get { return _mdeviceConnectPar; } set { _mdeviceConnectPar = value; OnPropertyChanged(); } }
+        private ConnectParMode _mdeviceConnectPar = new ConnectParMode();
+        public ObservableCollection<RawMaterialStockBin> rawMaterialStockBin { get; set; } = new ObservableCollection<RawMaterialStockBin>();
+        public ObservableCollection<BomMaterial> BomMaterial { get; set; } = new ObservableCollection<BomMaterial>();
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceParModel.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceParModel.cs
new file mode 100644
index 00000000..b0eb4f6d
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceParModel.cs
@@ -0,0 +1,73 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class DeviceParMode : ObservableObject
+    {
+
+        /// <summary>
+        /// 原料名称
+        /// </summary>
+        public string MaterialName { get { return _mMaterialName; } set { _mMaterialName = value; OnPropertyChanged(); } }
+        private string _mMaterialName = string.Empty;
+
+        /// <summary>
+        /// 慢加重量
+        /// </summary>
+        public float SlowlyAddWeight { get { return _mSlowlyAddWeight; } set { _mSlowlyAddWeight = value; OnPropertyChanged(); } }
+        private float _mSlowlyAddWeight;
+
+        /// <summary>
+        /// 提前关阀重量
+        /// </summary>
+        public float PreCloseValveWeight { get { return _mPreCloseValveWeight; } set { _mPreCloseValveWeight = value; OnPropertyChanged(); } }
+        private float _mPreCloseValveWeight;
+
+        /// <summary>
+        /// 快加速度
+        /// </summary>
+        public int RapidAcceleration { get { return _mRapidAcceleration; } set { _mRapidAcceleration = value; OnPropertyChanged(); } }
+        private int _mRapidAcceleration;
+
+        /// <summary>
+        /// 慢加速度
+        /// </summary>
+        public int SlowAcceleration { get { return _mSlowAcceleration; } set { _mSlowAcceleration = value; OnPropertyChanged(); } }
+        private int _mSlowAcceleration;
+
+        /// <summary>
+        /// 伺服手动速度
+        /// </summary>
+        public int ServoManualSpeed { get { return _mServoManualSpeed; } set { _mServoManualSpeed = value; OnPropertyChanged(); } }
+        private int _mServoManualSpeed;
+
+        /// <summary>
+        /// 料仓上限重量
+        /// </summary>
+        public int SiloUpperLimitWeight { get { return _mSiloUpperLimitWeight; } set { _mSiloUpperLimitWeight = value; OnPropertyChanged(); } }
+        private int _mSiloUpperLimitWeight;
+
+        /// <summary>
+        /// 料仓下限重量
+        /// </summary>
+        public int LowerLimitWeightOfSilo { get { return _mLowerLimitWeightOfSilo; } set { _mLowerLimitWeightOfSilo = value; OnPropertyChanged(); } }
+        private int _mLowerLimitWeightOfSilo;
+
+        /// <summary>
+        /// 搅拌速度
+        /// </summary>
+        public int StirringSpeed { get { return _mStirringSpeed; } set { _mStirringSpeed = value; OnPropertyChanged(); } }
+        private int _mStirringSpeed;
+
+        public float ErrorRange { get { return _mErrorRange; } set { _mErrorRange = value; OnPropertyChanged(); } }
+        private float _mErrorRange;
+
+        /// <summary>
+        /// 是否重复
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public bool IsRedundant { get { return _mIsRedundant; } set { _mIsRedundant = value; OnPropertyChanged(); } }
+        private bool _mIsRedundant;
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/GlobalData.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/GlobalData.cs
new file mode 100644
index 00000000..f29e3e2f
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/GlobalData.cs
@@ -0,0 +1,7 @@
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class GlobalData
+    {
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/LocaPar.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/LocaPar.cs
new file mode 100644
index 00000000..0599917b
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/LocaPar.cs
@@ -0,0 +1,13 @@
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class LocaPar
+    {
+        public ObservableCollection<RecipeModel> Recipes { get; set; } = new ObservableCollection<RecipeModel>();
+        /// <summary>
+        /// 配方完成数目。
+        /// </summary>
+        public int RecipeDosingCompleNum { get; set; } = 0;
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialColl.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialColl.cs
new file mode 100644
index 00000000..9c13ebe6
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialColl.cs
@@ -0,0 +1,94 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace BPASmartClient.FoodStationTest.Model.RawMaterial
+{
+    public class RawMaterialColl : ObservableObject
+    {
+        /// <summary>
+        /// 原料设备IP
+        /// </summary>
+        public string DeviceIp { get; set; }
+
+        /// <summary>
+        /// 原料名称
+        /// </summary>
+        public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } }
+        private string _mRawMaterialName;
+
+        /// <summary>
+        /// 原料重量设置
+        /// </summary>
+        public uint RawMaterialWeight { get { return _mRawMaterialWeight; } set { _mRawMaterialWeight = value; OnPropertyChanged(); } }
+        private uint _mRawMaterialWeight;
+
+
+        /// <summary>
+        /// 原料来源
+        /// 0：本地
+        /// 1：设备
+        /// </summary>
+        public ushort RawMaterialSource { get { return _mRawMaterialSource; } set { _mRawMaterialSource = value; OnPropertyChanged(); } }
+        private ushort _mRawMaterialSource;
+
+        /// <summary>
+        /// 原料类型 MW18
+        /// 1：液体
+        /// 2：膏体
+        /// 3：粉体
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public ushort RawMaterialType { get { return _mRawMaterialType; } set { _mRawMaterialType = value; OnPropertyChanged(); } }
+        private ushort _mRawMaterialType;
+
+        /// <summary>
+        /// 料仓重量反馈 MD40
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public float WeightFeedback { get { return _mWeightFeedback; } set { _mWeightFeedback = value; OnPropertyChanged(); } }
+        private float _mWeightFeedback;
+
+        /// <summary>
+        /// 上限反馈
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public bool UpLimtFeedback { get { return _mUpLimtFeedback; } set { _mUpLimtFeedback = value; OnPropertyChanged(); } }
+        private bool _mUpLimtFeedback;
+
+        /// <summary>
+        /// 下限反馈 
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public bool DownLimtFeedback { get { return _mDownLimtFeedback; } set { _mDownLimtFeedback = value; OnPropertyChanged(); } }
+        private bool _mDownLimtFeedback;
+
+        /// <summary>
+        /// 下料重量反馈   MD52
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public float UpLimtWeightFeedback { get { return _mUpLimtWeightFeedback; } set { _mUpLimtWeightFeedback = value; OnPropertyChanged(); } }
+        private float _mUpLimtWeightFeedback;
+
+
+        /// <summary>
+        /// 原料ID
+        /// </summary>
+        public string RawMaterialId { get { return _mRawMaterialId; } set { _mRawMaterialId = value; OnPropertyChanged(); } }
+        private string _mRawMaterialId;
+
+        /// <summary>
+        /// 原料设备执行状态
+        /// 1：等待配料
+        /// 2：下料中
+        /// 3：下料完成
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public ushort RecipeStatus { get { return _mRecipeStatus; } set { _mRecipeStatus = value; OnPropertyChanged(); } }
+        private ushort _mRecipeStatus = 1;
+
+        /// <summary>
+        /// 原料对应的桶号
+        /// </summary>
+        public ushort BarrelNum { get { return _mBarrelNum; } set { _mBarrelNum = value; OnPropertyChanged(); } }
+        private ushort _mBarrelNum = 1;
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialDeviceStatus.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialDeviceStatus.cs
new file mode 100644
index 00000000..beb410de
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialDeviceStatus.cs
@@ -0,0 +1,59 @@
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class RawMaterialDeviceStatus
+    {
+
+        /// <summary>
+        /// 原料类型 
+        /// 1：膏体
+        /// 2：液体
+        /// 3：粉体
+        /// </summary>
+        public ushort RawMaterialType { get; set; }
+
+        /// <summary>
+        /// 料仓重量反馈 
+        /// </summary>
+        public float WeightFeedback { get; set; }
+
+        /// <summary>
+        /// 当前出料重量反馈 
+        /// </summary>
+        public float NowWeightFeedback { get; set; }
+
+        /// <summary>
+        /// 上限反馈
+        /// </summary>
+        public bool UpLimitFeedback { get; set; }
+
+        /// <summary>
+        /// 下限反馈 
+        /// </summary>
+        public bool DownLimitFeedback { get; set; }
+
+        /// <summary>
+        /// 下料重量反馈   
+        /// </summary>
+        public float CutWeightFeedback { get; set; }
+
+        /// <summary>
+        /// 设备运行状态
+        /// 0：未知
+        /// 1：等待配料
+        /// 2：配料中
+        /// 3：配料完成
+        /// </summary>
+        public ushort RunStatus { get; set; }
+
+        /// <summary>
+        /// 设备故障编码
+        /// </summary>
+        public ushort DeviceAlarmCode { get; set; }
+
+        /// <summary>
+        /// 设备料仓编号
+        /// </summary>
+        public ushort DeviceNum { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialStockBin.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialStockBin.cs
new file mode 100644
index 00000000..6a9195d9
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialStockBin.cs
@@ -0,0 +1,24 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace BPASmartClient.FoodStationTest.Model.RawMaterial
+{
+    public class RawMaterialStockBin : ObservableObject
+    {
+
+        public short RawMaterialCount { get { return _mRawMaterialCount; } set { _mRawMaterialCount = value; OnPropertyChanged(); } }
+        private short _mRawMaterialCount;
+
+        /// <summary>
+        /// 原料名称
+        /// </summary>
+        public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } }
+        private string _mRawMaterialName;
+
+
+        /// <summary>
+        /// 原料对应料仓的位置
+        /// </summary>
+        public int RawMaterialLocation { get { return _mRawMaterialLocation; } set { _mRawMaterialLocation = value; OnPropertyChanged(); } }
+        private int _mRawMaterialLocation;
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeModel.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeModel.cs
new file mode 100644
index 00000000..8832c5f5
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeModel.cs
@@ -0,0 +1,50 @@
+using BPASmartClient.Model;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System.Collections.ObjectModel;
+using System.Threading;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    /// <summary>
+    /// 配方模块
+    /// </summary>
+    public class RecipeModel : ObservableObject
+    {
+        [Newtonsoft.Json.JsonIgnore]
+        public bool IsEnable { get { return _mIsEnable; } set { _mIsEnable = value; OnPropertyChanged(); } }
+        private bool _mIsEnable = true;
+
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public int SerialNum { get { return _mSerialNum; } set { _mSerialNum = value; OnPropertyChanged(); } }
+        private int _mSerialNum;
+
+        /// <summary>
+        /// 配方名称
+        /// </summary>
+        public string RecipeName { get { return _mRecipeName; } set { _mRecipeName = value; OnPropertyChanged(); } }
+        private string _mRecipeName;
+
+        /// <summary>
+        /// 配方编码
+        /// </summary>
+        public string RecipCode { get { return _mRecipCode; } set { _mRecipCode = value; OnPropertyChanged(); } }
+        private string _mRecipCode;
+
+        [Newtonsoft.Json.JsonIgnore]
+        public AutoResetEvent Are { get; set; } = new AutoResetEvent(false);
+
+        /// <summary>
+        /// 托盘编号
+        /// </summary>
+        public int TrayCode { get { return _mTrayCode; } set { _mTrayCode = value; OnPropertyChanged(); } }
+        private int _mTrayCode;
+
+        /// <summary>
+        /// 原料集合
+        /// </summary>
+        public ObservableCollection<RawMaterialModel> RawMaterials { get; set; } = new ObservableCollection<RawMaterialModel>();
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeProcess.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeProcess.cs
new file mode 100644
index 00000000..695340f8
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeProcess.cs
@@ -0,0 +1,15 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class RecipeProcess : ObservableObject
+    {
+        public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } }
+        private string _mRawMaterialName;
+
+
+        public int RawMaterialStatus { get { return _mRawMaterialStatus; } set { _mRawMaterialStatus = value; OnPropertyChanged(); } }
+        private int _mRawMaterialStatus;
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/Recipe/LocalRecipeDataColl.cs b/BPASmartClient.FoodStationTest/Model/Recipe/LocalRecipeDataColl.cs
new file mode 100644
index 00000000..608fa8c9
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/Recipe/LocalRecipeDataColl.cs
@@ -0,0 +1,13 @@
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    internal class LocalRecipeDataColl
+    {
+        public ObservableCollection<RemoteRecipeData> Recipes { get; set; } = new ObservableCollection<RemoteRecipeData>();
+        /// <summary>
+        /// 筛选后的配方显示集合。
+        /// </summary>
+        public ObservableCollection<RemoteRecipeData> SelectedRecipes { get; set; } = new ObservableCollection<RemoteRecipeData>();
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeData.cs b/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeData.cs
new file mode 100644
index 00000000..cbc58eb3
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeData.cs
@@ -0,0 +1,31 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class RemoteRecipeData : ObservableObject
+    {
+        /// <summary>
+        /// 配方名称
+        /// </summary>
+        public string RecipeName { get { return _mRecipeName; } set { _mRecipeName = value; OnPropertyChanged(); } }
+        private string _mRecipeName;
+
+        /// <summary>
+        /// 配方ID
+        /// </summary>
+        public string RecipeCode { get { return _mRecipeCode; } set { _mRecipeCode = value; OnPropertyChanged(); } }
+        private string _mRecipeCode;
+
+        /// <summary>
+        /// 托盘编号
+        /// </summary>
+        public int TrayCode { get { return _mTrayCode; } set { _mTrayCode = value; OnPropertyChanged(); } }
+        private int _mTrayCode;
+
+        /// <summary>
+        /// 原料数据
+        /// </summary>
+        public ObservableCollection<RemoteRecipeRawMaterial> RawMaterial { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>();
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeDataColl.cs b/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeDataColl.cs
new file mode 100644
index 00000000..fbfd101c
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeDataColl.cs
@@ -0,0 +1,11 @@
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class RemoteRecipeDataColl
+    {
+        public ObservableCollection<RemoteRecipeData> Recipes { get; set; } = new ObservableCollection<RemoteRecipeData>();
+        public int RecipesStatus { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeRawMaterial.cs b/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeRawMaterial.cs
new file mode 100644
index 00000000..dcf20e57
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeRawMaterial.cs
@@ -0,0 +1,49 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class RemoteRecipeRawMaterial : ObservableObject
+    {
+        public int DeviceIp { get { return _mIp; } set { _mIp = value; } }
+        private int _mIp;
+
+        public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } }
+        private string _mRawMaterialName;
+
+        /// <summary>
+        /// 原料对应的桶号
+        /// </summary>
+        public short RawMaterialBarrelNum { get { return _mRawMaterialBarrelNum; } set { _mRawMaterialBarrelNum = value; OnPropertyChanged(); } }
+        private short _mRawMaterialBarrelNum;
+
+        public string RawMaterialType { get { return _mRawMaterialType; } set { _mRawMaterialType = value; OnPropertyChanged(); } }
+        private string _mRawMaterialType;
+
+        /// <summary>
+        /// 需要原料重量
+        /// </summary>
+        public float RawMaterialWeight { get { return _mRawMaterialWeight; } set { _mRawMaterialWeight = value; OnPropertyChanged(); } }
+        private float _mRawMaterialWeight;
+
+        /// <summary>
+        /// 实际的下料中重量
+        /// </summary>
+        public float Laying_Off_Weight { get { return _mLaying_Off_Weight; } set { _mLaying_Off_Weight = value; } }
+        private float _mLaying_Off_Weight;
+
+        /// <summary>
+        /// 料仓剩余重量
+        /// </summary>
+        public float StockBinRemainingWeight { get { return _mStockBinRemainingWeight; } set { _mStockBinRemainingWeight = value; } }
+        private float _mStockBinRemainingWeight;
+
+        /// <summary>
+        /// 原料对应料仓的位置
+        /// </summary>
+        public int RawMaterialLocation { get { return _mRawMaterialLocation; } set { _mRawMaterialLocation = value; OnPropertyChanged(); } }
+        private int _mRawMaterialLocation;
+
+        public bool IsDosingComple { get { return _mIsDosingComple; } set { _mIsDosingComple = value; OnPropertyChanged(); } }
+        private bool _mIsDosingComple;
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/TestData.cs b/BPASmartClient.FoodStationTest/Model/TestData.cs
new file mode 100644
index 00000000..403c5e53
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/TestData.cs
@@ -0,0 +1,105 @@
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class TestData
+    {
+        public volatile static TestData Instance;
+        public static TestData GetInstance => Instance ?? (Instance = new TestData());
+        public ObservableCollection<RemoteRecipeData> Recipes { get; set; } = new ObservableCollection<RemoteRecipeData>();
+        public ObservableCollection<RemoteRecipeRawMaterial> RawMaterials { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>();
+        public TestData()
+        {
+            string recipeName = "配方1";
+            string recipeCode = "10001";
+            int Traycode = 1;
+
+            float RawmaterialWeight = 10;
+            short RawMaterialbarrelNum = 1;
+            int RawMaterialLocation = 5;
+
+            float RawmaterialWeight1 = 20;
+            short RawMaterialbarrelNum1 = 2;
+            int RawMaterialLocation1 = 7;
+
+            float RawmaterialWeight2 = 30;
+            short RawMaterialbarrelNum2 = 3;
+            int RawMaterialLocation2 = 9;
+            RawMaterials.Add(new RemoteRecipeRawMaterial()
+            {
+                DeviceIp = RawMaterials.Count + 1,
+                RawMaterialWeight = RawmaterialWeight,
+                RawMaterialBarrelNum = RawMaterialbarrelNum,
+                RawMaterialLocation = RawMaterialLocation
+            });
+            RawMaterials.Add(new RemoteRecipeRawMaterial()
+            {
+                DeviceIp = RawMaterials.Count + 1,
+                RawMaterialWeight = RawmaterialWeight1,
+                RawMaterialBarrelNum = RawMaterialbarrelNum1,
+                RawMaterialLocation = RawMaterialLocation1
+            });
+            RawMaterials.Add(new RemoteRecipeRawMaterial()
+            {
+                DeviceIp = RawMaterials.Count + 1,
+                RawMaterialWeight = RawmaterialWeight2,
+                RawMaterialBarrelNum = RawMaterialbarrelNum2,
+                RawMaterialLocation = RawMaterialLocation2
+            });
+
+            Recipes.Add(new Model.RemoteRecipeData()
+            {
+                RecipeName = recipeName,
+                RecipeCode = recipeCode,
+                TrayCode = Traycode,
+                RawMaterial = RawMaterials
+            });
+
+            RawMaterials.Clear();
+            string recipeName_2 = "配方2";
+            string recipeCode_2 = "20001";
+            int Traycode_2 = 3;
+
+            float RawmaterialWeight_2 = 10;
+            short RawMaterialbarrelNum_2 = 1;
+            int RawMaterialLocation_2 = 5;
+
+            float RawmaterialWeight1_2 = 20;
+            short RawMaterialbarrelNum1_2 = 2;
+            int RawMaterialLocation1_2 = 7;
+
+            float RawmaterialWeight2_2 = 30;
+            short RawMaterialbarrelNum2_2 = 3;
+            int RawMaterialLocation2_2 = 9;
+            RawMaterials.Add(new RemoteRecipeRawMaterial()
+            {
+                DeviceIp = RawMaterials.Count + 1,
+                RawMaterialWeight = RawmaterialWeight_2,
+                RawMaterialBarrelNum = RawMaterialbarrelNum_2,
+                RawMaterialLocation = RawMaterialLocation_2
+            });
+            RawMaterials.Add(new RemoteRecipeRawMaterial()
+            {
+                DeviceIp = RawMaterials.Count + 1,
+                RawMaterialWeight = RawmaterialWeight1_2,
+                RawMaterialBarrelNum = RawMaterialbarrelNum1_2,
+                RawMaterialLocation = RawMaterialLocation1_2
+            });
+            RawMaterials.Add(new RemoteRecipeRawMaterial()
+            {
+                DeviceIp = RawMaterials.Count + 1,
+                RawMaterialWeight = RawmaterialWeight2_2,
+                RawMaterialBarrelNum = RawMaterialbarrelNum2_2,
+                RawMaterialLocation = RawMaterialLocation2_2
+            });
+
+            Recipes.Add(new Model.RemoteRecipeData()
+            {
+                RecipeName = recipeName_2,
+                RecipeCode = recipeCode_2,
+                TrayCode = Traycode_2,
+                RawMaterial = RawMaterials
+            });
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Model/VarMonitor.cs b/BPASmartClient.FoodStationTest/Model/VarMonitor.cs
new file mode 100644
index 00000000..1ddd09ab
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Model/VarMonitor.cs
@@ -0,0 +1,26 @@
+namespace BPASmartClient.FoodStationTest.Model
+{
+    public class VarMonitor
+    {
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public int SerialNum { get; set; }
+        /// <summary>
+        /// 变量地址
+        /// </summary>
+        public string Address { get; set; }
+        /// <summary>
+        /// 变量描述
+        /// </summary>
+        public string Describe { get; set; }
+        /// <summary>
+        /// 变量值当前值
+        /// </summary>
+        public string NowValue { get; set; }
+        /// <summary>
+        /// 变量值设定值
+        /// </summary>
+        public string SetValue { get; set; }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/Resource/MyStyle.xaml b/BPASmartClient.FoodStationTest/Resource/MyStyle.xaml
new file mode 100644
index 00000000..ccebff1e
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/Resource/MyStyle.xaml
@@ -0,0 +1,113 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:con="clr-namespace:BPASmartClient.FoodStationTest.Converter">
+
+    <SolidColorBrush x:Key="tabColor" Color="#FF2AB2E7" />
+    <!--<SolidColorBrush x:Key="bordColor" Color="#33ffffff" />-->
+    <SolidColorBrush x:Key="bordColor" Color="#552AB2E7" />
+    <con:DataTableRedundantConverter x:Key="tabConvert" />
+
+
+    <Style x:Key="RowRadioButtonStyle" TargetType="{x:Type RadioButton}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RadioButton}">
+                    <Border
+                        x:Name="NvaBor"
+                        Background="Transparent"
+                        BorderBrush="#FF2AB2E7"
+                        BorderThickness="0">
+                        <ContentControl
+                            Margin="10,4"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            HorizontalContentAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Content="{TemplateBinding Content}"
+                            FontSize="16" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
+                            <Setter TargetName="NvaBor" Property="BorderThickness" Value="0" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsChecked" Value="false" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.Setters>
+                                <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
+                            </MultiTrigger.Setters>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="InputTextboxStyle" TargetType="TextBox">
+        <Setter Property="Margin" Value="5,0,0,0" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Width" Value="150" />
+        <Setter Property="Height" Value="40" />
+        <Setter Property="CaretBrush" Value="{StaticResource TitleBorderColor}" />
+        <Setter Property="Foreground" Value="{StaticResource TitleBorderColor}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+
+    <Style x:Key="ControlButtonStyle" TargetType="Button">
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="#FFF53F62" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+        <Setter Property="FontFamily" Value="楷体" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border
+                        Name="TitleBarBr"
+                        BorderBrush="#00c2f4"
+                        BorderThickness="0"
+                        CornerRadius="0"
+                        Opacity="0.8">
+
+                        <ContentPresenter
+                            Margin="{TemplateBinding Margin}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        <Border.Background>
+                            <ImageBrush
+                                ImageSource="/BPASmartClient.CustomResource;component/Image/组合边框1.1.png"
+                                Opacity="0.8"
+                                Stretch="Fill" />
+                        </Border.Background>
+
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="TitleBarBr" Property="Opacity" Value="1" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TitleTextblockStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Foreground" Value="{StaticResource tabColor}" />
+        <Setter Property="FontFamily" Value="楷体" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+    </Style>
+
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BPASmartClient.FoodStationTest/View/BomOfMaterialView.xaml b/BPASmartClient.FoodStationTest/View/BomOfMaterialView.xaml
new file mode 100644
index 00000000..871a4972
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/BomOfMaterialView.xaml
@@ -0,0 +1,377 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.BomOfMaterialView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:con="clr-namespace:BPASmartClient.FoodStationTest.Converter"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
+    <UserControl.DataContext>
+        <vm:BomOfMaterialViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.FoodStationTest;component/Resource/MyStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    <!--<UserControl.Resources>
+        <SolidColorBrush x:Key="tabColor" Color="#FF2AB2E7" />
+    -->
+    <!--<SolidColorBrush x:Key="bordColor" Color="#33ffffff" />-->
+    <!--
+        <SolidColorBrush x:Key="bordColor" Color="#332AB2E7" />
+        <con:DataTableRedundantConverter x:Key="tabConvert" />
+
+        <Style x:Key="RowRadioButtonStyle" TargetType="{x:Type RadioButton}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type RadioButton}">
+                        <Border
+                            x:Name="NvaBor"
+                            Background="Transparent"
+                            BorderBrush="#FF2AB2E7"
+                            BorderThickness="0">
+                            <ContentControl
+                                Margin="10,4"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Content="{TemplateBinding Content}"
+                                FontSize="16" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
+                                <Setter TargetName="NvaBor" Property="BorderThickness" Value="0" />
+                            </Trigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsChecked" Value="false" />
+                                    <Condition Property="IsMouseOver" Value="True" />
+                                </MultiTrigger.Conditions>
+                                <MultiTrigger.Setters>
+                                    <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
+                                </MultiTrigger.Setters>
+                            </MultiTrigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="InputTextboxStyle" TargetType="TextBox">
+            <Setter Property="Margin" Value="5,0,0,0" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="Width" Value="150" />
+            <Setter Property="Height" Value="40" />
+            <Setter Property="CaretBrush" Value="{StaticResource TitleBorderColor}" />
+            <Setter Property="Foreground" Value="{StaticResource TitleBorderColor}" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="14" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+
+        <Style x:Key="ControlButtonStyle" TargetType="Button">
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="Foreground" Value="#FFF53F62" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+            <Setter Property="FontFamily" Value="楷体" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border
+                            Name="TitleBarBr"
+                            BorderBrush="#00c2f4"
+                            BorderThickness="0"
+                            CornerRadius="0"
+                            Opacity="0.8">
+
+                            <ContentPresenter
+                                Margin="{TemplateBinding Margin}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                            <Border.Background>
+                                <ImageBrush
+                                    ImageSource="/BPASmartClient.CustomResource;component/Image/组合边框1.1.png"
+                                    Opacity="0.8"
+                                    Stretch="Fill" />
+                            </Border.Background>
+
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="TitleBarBr" Property="Opacity" Value="1" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="TitleTextblockStyle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="16" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Foreground" Value="{StaticResource tabColor}" />
+            <Setter Property="FontFamily" Value="楷体" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+        </Style>
+
+    </UserControl.Resources>-->
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="60" />
+            <RowDefinition Height="50" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <!--#region 表格标题栏设置-->
+        <Grid>
+            <StackPanel
+                Margin="0,0,10,0"
+                HorizontalAlignment="Right"
+                Orientation="Horizontal">
+                <Button
+                    Width="200"
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding GetBomMaterialData}"
+                    Content="拉取本地数据"
+                    FontSize="28"
+                    Foreground="DeepSkyBlue"
+                    Style="{StaticResource ImageButtonStyle}" />
+                <Button
+                    Width="200"
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding DeleteAllMaterial}"
+                    Content="删除所有数据"
+                    FontSize="28"
+                    Foreground="DeepSkyBlue"
+                    Style="{StaticResource ImageButtonStyle}" />
+                <Button
+                    Width="200"
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding AddMaterial}"
+                    Content="新增数据"
+                    FontSize="28"
+                    Foreground="DeepSkyBlue"
+                    Style="{StaticResource ImageButtonStyle}" />
+                <Button
+                    Width="200"
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding SaveMaterials}"
+                    Content="保存参数"
+                    FontSize="28"
+                    Foreground="DeepSkyBlue"
+                    Style="{StaticResource ImageButtonStyle}" />
+            </StackPanel>
+
+        </Grid>
+        <Grid
+            Grid.Row="1"
+            Margin="0,10,17,0"
+            Background="#ff0C255F">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock
+                Grid.Column="0"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="序号" />
+
+            <TextBlock
+                Grid.Column="1"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="原料编号" />
+
+            <TextBlock
+                Grid.Column="2"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="原料名称" />
+
+            <TextBlock
+                Grid.Column="3"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="操作" />
+
+            <Border
+                Grid.Column="0"
+                Grid.ColumnSpan="4"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,1,1,1" />
+            <Border
+                Grid.Column="1"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,0,1,0" />
+            <Border
+                Grid.Column="3"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,0,1,0" />
+
+
+
+            <!--<Grid Grid.Column="0">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="24"
+                    Foreground="Aqua"
+                    Text="序号" />
+            -->
+            <!--<Border BorderThickness="1,1,1,1" Cursor="SizeWE"
+                    BorderBrush="{StaticResource bordColor}"  />-->
+            <!--
+            </Grid>
+            <TextBlock
+                Grid.Column="1"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="24"
+                Foreground="Aqua"
+                Text="原料编号" />
+            <TextBlock
+                Grid.Column="2"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="24"
+                Foreground="Aqua"
+                Text="原料名称" />
+            <TextBlock
+                Grid.Column="3"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="24"
+                Foreground="Aqua"
+                Text="操作" />-->
+        </Grid>
+        <Grid Grid.Row="2">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Visible">
+                <ItemsControl Foreground="DeepSkyBlue" ItemsSource="{Binding RawMaterialInfo}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid Name="gr">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+
+                                <TextBlock
+                                    Grid.Column="0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    Text="{Binding Count}" />
+
+                                <TextBox
+                                    Grid.Column="1"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding MaterialCode}" />
+
+                                <TextBox
+                                    Grid.Column="2"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding MaterialName}" />
+
+                                <Button
+                                    Grid.Column="3"
+                                    Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                    CommandParameter="{Binding RawMaterialLocation}"
+                                    Content="删除"
+                                    FontSize="16"
+                                    Style="{StaticResource ControlButtonStyle}" />
+
+                                <Border
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="4"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,1" />
+                                <Border
+                                    Grid.Column="1"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,0" />
+                                <Border
+                                    Grid.Column="3"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,0" />
+
+
+                                <!--<Grid Grid.Column="0" Margin="5">
+                                    <TextBlock
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding Count}" />
+                                </Grid>
+                                <Grid Grid.Column="1" Margin="5">
+                                    <TextBox
+                                        Width="50"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding MaterialCode}" />
+                                </Grid>
+                                <Grid Grid.Column="2" Margin="5">
+                                    <TextBox
+                                        Width="200"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding MaterialName}" />
+                                </Grid>
+                                <Grid Grid.Column="3" Margin="5">
+                                    <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                                        <pry:IcoButton
+                                            Margin="3,4,4,0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Background="#11F53F62"
+                                            BorderThickness="0"
+                                            Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                            CommandParameter="{Binding Count}"
+                                            Content="删除"
+                                            EnterBackground="#22F53F62"
+                                            Foreground="#FFF53F62"
+                                            IcoText="&#xe68e;"
+                                            Style="{StaticResource IcoButtonStyle}" />
+                                    </StackPanel>
+                                </Grid>-->
+                            </Grid>
+
+                            <DataTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                </Trigger>
+                            </DataTemplate.Triggers>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/BomOfMaterialView.xaml.cs b/BPASmartClient.FoodStationTest/View/BomOfMaterialView.xaml.cs
new file mode 100644
index 00000000..ff36f35f
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/BomOfMaterialView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// HKPlcCommMonitor.xaml 的交互逻辑
+    /// </summary>
+    public partial class BomOfMaterialView : UserControl
+    {
+        public BomOfMaterialView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/ChangeDeviceNameView.xaml b/BPASmartClient.FoodStationTest/View/ChangeDeviceNameView.xaml
new file mode 100644
index 00000000..b23e44ab
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/ChangeDeviceNameView.xaml
@@ -0,0 +1,122 @@
+<Window
+    x:Class="BPASmartClient.FoodStationTest.View.ChangeDeviceNameView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    Title="ChangeDeviceNameView"
+    Width="400"
+    Height="200"
+    AllowsTransparency="True"
+    Background="{x:Null}"
+    Topmost="True"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
+
+    <Window.DataContext>
+        <vm:ChangeDeviceNameViewModel />
+    </Window.DataContext>
+
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+
+                <ResourceDictionary>
+                    <!--#region ListBox样式-->
+                    <Style x:Key="ListBoxItemStyle1" TargetType="{x:Type ListBoxItem}">
+                        <Setter Property="OverridesDefaultStyle" Value="True" />
+                        <Setter Property="SnapsToDevicePixels" Value="True" />
+                        <Setter Property="BorderBrush" Value="{x:Null}" />
+                        <Setter Property="Foreground" Value="White" />
+                        <Setter Property="FontSize" Value="20" />
+                        <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                                    <Border x:Name="border" CornerRadius="8">
+                                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                    </Border>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                    <!--#endregion-->
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
+
+    <Border
+        Name="br"
+        Background="#FF0B2F5F"
+        BorderThickness="1">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition Height="0.5*" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <StackPanel
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
+                <TextBlock
+                    Margin="10,0,0,0"
+                    Background="Transparent"
+                    FontSize="20"
+                    Foreground="#FF2AB2E7"
+                    Text="请输入新设备名称：" />
+
+                <TextBox
+                    Grid.Column="1"
+                    Width="200"
+                    Height="30"
+                    Margin="0,0,7,0"
+                    FontSize="16"
+                    Text="{Binding DeviceName}" />
+
+            </StackPanel>
+
+            <TextBlock
+                Grid.Row="1"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Background="Transparent"
+                FontSize="16"
+                Foreground="Red"
+                Text="{Binding ErrorInfo}" />
+
+            <Grid Grid.Row="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+
+                <Button
+                    Grid.Column="1"
+                    Width="148"
+                    Height="30"
+                    Margin="0,0,7,0"
+                    Command="{Binding ConfirmCommand}"
+                    Content="确认" />
+
+                <Button
+                    Name="btClose"
+                    Width="148"
+                    Height="30"
+                    Command="{Binding CancleCommand}"
+                    Content="取消" />
+
+            </Grid>
+
+        </Grid>
+    </Border>
+
+</Window>
diff --git a/BPASmartClient.FoodStationTest/View/ChangeDeviceNameView.xaml.cs b/BPASmartClient.FoodStationTest/View/ChangeDeviceNameView.xaml.cs
new file mode 100644
index 00000000..8552e6d9
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/ChangeDeviceNameView.xaml.cs
@@ -0,0 +1,21 @@
+using BPASmartClient.Helper;
+using System;
+using System.Windows;
+using System.Windows.Input;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// ChangeDeviceNameView.xaml 的交互逻辑
+    /// </summary>
+    public partial class ChangeDeviceNameView : Window
+    {
+        public ChangeDeviceNameView()
+        {
+            InitializeComponent();
+            ActionManage.GetInstance.CancelRegister("ChangeDeviceNameViewClose");
+            ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "ChangeDeviceNameViewClose");
+            this.br.MouseLeftButtonDown += (o, e) => { if (e.LeftButton == MouseButtonState.Pressed) this.DragMove(); };
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/DeviceListView.xaml b/BPASmartClient.FoodStationTest/View/DeviceListView.xaml
new file mode 100644
index 00000000..9f568287
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/DeviceListView.xaml
@@ -0,0 +1,195 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.DeviceListView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:control="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:DeviceListViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <Style x:Key="UserItemContainerStyle" TargetType="ListBoxItem">
+            <Style.Resources>
+                <!--  SelectedItem with focus  -->
+                <SolidColorBrush
+                    x:Key="{x:Static SystemColors.HighlightBrushKey}"
+                    Opacity=".4"
+                    Color="White" />
+                <!--  SelectedItem without focus  -->
+                <SolidColorBrush
+                    x:Key="{x:Static SystemColors.ControlBrushKey}"
+                    Opacity=".4"
+                    Color="White" />
+            </Style.Resources>
+            <!--  设置触发器  -->
+            <Style.Triggers>
+                <Trigger Property="IsMouseOver" Value="true">
+                    <Setter Property="Background" Value="White" />
+                    <Setter Property="Foreground" Value="White" />
+                </Trigger>
+                <Trigger Property="IsFocused" Value="true">
+                    <Setter Property="Background" Value="White" />
+                    <Setter Property="Foreground" Value="White" />
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+    </UserControl.Resources>
+
+    <Grid Margin="-5,0,5,0">
+
+        <Grid>
+            <ListView
+                Grid.Column="1"
+                Margin="10"
+                Background="Transparent"
+                BorderBrush="#00BEFA"
+                BorderThickness="0"
+                ItemsSource="{Binding devices}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <!--<UniformGrid
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Columns="8" />-->
+                        <WrapPanel Orientation="Horizontal" />
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <Border
+                            Name="ShadowElement"
+                            Width="180"
+                            Height="150"
+                            Margin="10"
+                            VerticalAlignment="Top"
+                            BorderBrush="#00BEFA"
+                            BorderThickness="0"
+                            ClipToBounds="True"
+                            CornerRadius="0">
+                            <Border.Background>
+                                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/蓝色背景.png" />
+                            </Border.Background>
+
+                            <Grid Margin="20,0,20,0">
+
+                                <!--<Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>-->
+
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+
+                                <TextBlock
+                                    Grid.Row="0"
+                                    Grid.ColumnSpan="2"
+                                    Margin="0,10,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="20"
+                                    Foreground="#00BEFA"
+                                    Text="{Binding DeviceName}" />
+
+                                <StackPanel
+                                    Grid.Row="1"
+                                    VerticalAlignment="Center"
+                                    Orientation="Horizontal">
+                                    <TextBlock
+                                        Grid.Row="1"
+                                        FontSize="14"
+                                        Foreground="#aa00BEFA"
+                                        Text="设备IP：" />
+                                    <TextBlock
+                                        Grid.Row="1"
+                                        FontSize="14"
+                                        Foreground="#aa00BEFA"
+                                        Text="{Binding IpAddress}" />
+                                </StackPanel>
+
+                                <Button
+                                    Grid.Row="2"
+                                    Width="130"
+                                    Height="30"
+                                    Margin="0,0,0,0"
+                                    VerticalAlignment="Top"
+                                    Command="{Binding DataContext.ChangeNameCommand, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                    CommandParameter="{Binding IpAddress}"
+                                    Content="修改原料名称"
+                                    FontSize="16"
+                                    IsEnabled="{Binding IsEnable}"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                
+                                <WrapPanel Grid.Row="3">
+                                    <Button
+                                        Width="65"
+                                        Height="30"
+                                        Margin="0,0,0,0"
+                                        VerticalAlignment="Top"
+                                        Command="{Binding DataContext.Open, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding IpAddress}"
+                                        Content="开盖"
+                                        FontSize="16"
+                                        IsEnabled="{Binding IsEnable}"
+                                        Style="{StaticResource ImageButtonStyle}" />
+                                    <Button
+                                        Width="65"
+                                        Height="30"
+                                        Margin="10,0,0,0"
+                                        VerticalAlignment="Top"
+                                        Command="{Binding DataContext.Close, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding IpAddress}"
+                                        Content="关盖"
+                                        FontSize="16"
+                                        IsEnabled="{Binding IsEnable}"
+                                        Style="{StaticResource ImageButtonStyle}" />
+                                </WrapPanel>
+                                
+
+                                <!--<Button
+                                    Grid.Row="1"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="2"
+                                    Foreground="#00BEFA"
+                                    Width="130"
+                                    Height="30"
+                                    Margin="0,0,0,10"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Bottom"
+                                    Command="{Binding DataContext.ChangeNameCommand, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                    CommandParameter="{Binding IpAddress}"
+                                    Content="修改原料名称"
+                                    IsEnabled="{Binding IsEnable}">
+                                    <Button.Background>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/系统名称.png" />
+                                    </Button.Background>
+                                </Button>-->
+
+
+                            </Grid>
+                        </Border>
+
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/DeviceListView.xaml.cs b/BPASmartClient.FoodStationTest/View/DeviceListView.xaml.cs
new file mode 100644
index 00000000..9ad43036
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/DeviceListView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// DeviceListView.xaml 的交互逻辑
+    /// </summary>
+    public partial class DeviceListView : UserControl
+    {
+        public DeviceListView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/DeviceMaterialParView.xaml b/BPASmartClient.FoodStationTest/View/DeviceMaterialParView.xaml
new file mode 100644
index 00000000..b8a1628f
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/DeviceMaterialParView.xaml
@@ -0,0 +1,284 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.DeviceMaterialParView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:con="clr-namespace:BPASmartClient.FoodStationTest.Converter"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:DeviceMaterialParViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.FoodStationTest;component/Resource/MyStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40" />
+            <RowDefinition Height="40" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+            <Button
+                Width="150"
+                Height="40"
+                Margin="10,0,10,0"
+                Command="{Binding AddCommand}"
+                Content="添加原料参数"
+                FontSize="20"
+                Style="{StaticResource ImageButtonStyle}" />
+            <Button
+                Width="150"
+                Height="40"
+                Margin="10,0,10,0"
+                Command="{Binding SaveCommand}"
+                Content="保存参数"
+                FontSize="20"
+                Style="{StaticResource ImageButtonStyle}" />
+        </StackPanel>
+
+        <!--#region 表格标题栏设置-->
+        <Grid
+            Grid.Row="1"
+            Margin="0,10,0,0"
+            Background="#ff0C255F">
+
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+
+
+            <TextBlock
+                Grid.Column="0"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="原料名称" />
+
+            <Grid Grid.Column="1">
+                <TextBlock Style="{StaticResource TitleTextblockStyle}" Text="慢加重量（g）" />
+                <Border
+                    BorderBrush="{StaticResource bordColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>
+
+            <TextBlock
+                Grid.Column="2"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="提前关阀重量" />
+
+            <Grid Grid.Column="3">
+                <TextBlock Style="{StaticResource TitleTextblockStyle}" Text="快加速度" />
+                <Border
+                    BorderBrush="{StaticResource bordColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>
+
+            <TextBlock
+                Grid.Column="4"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="慢加速度" />
+
+            <Grid Grid.Column="5">
+                <TextBlock Style="{StaticResource TitleTextblockStyle}" Text="伺服手动速度" />
+                <Border
+                    BorderBrush="{StaticResource bordColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>
+
+            <TextBlock
+                Grid.Column="6"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="料仓上限重量" />
+
+            <Grid Grid.Column="7">
+                <TextBlock Style="{StaticResource TitleTextblockStyle}" Text="料仓下限重量" />
+                <Border
+                    BorderBrush="{StaticResource bordColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>
+
+            <TextBlock
+                Grid.Column="8"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="搅拌速度" />
+
+            <Grid Grid.Column="9">
+                <TextBlock Style="{StaticResource TitleTextblockStyle}" Text="精度误差阈值(±g)" />
+                <Border
+                    BorderBrush="{StaticResource bordColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>
+            <Grid Grid.Column="10">
+                <TextBlock Style="{StaticResource TitleTextblockStyle}" Text="功能操作" />
+                <Border
+                    BorderBrush="{StaticResource bordColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+            </Grid>
+            <Border
+                Grid.ColumnSpan="11"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,0,1,0" />
+
+        </Grid>
+        <!--#endregion-->
+
+        <Grid Grid.Row="2">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                <ItemsControl ItemsSource="{Binding deviceParModels}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid Name="gr" Height="30">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+
+                                <TextBox
+                                    Grid.Column="0"
+                                    Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding MaterialName}" />
+
+                                <Grid Grid.Column="1">
+                                    <TextBox
+                                        Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
+                                        Style="{StaticResource InputTextboxStyle}"
+                                        Text="{Binding SlowlyAddWeight}" />
+                                    <Border
+                                        BorderBrush="{StaticResource bordColor}"
+                                        BorderThickness="1,0,1,0"
+                                        Cursor="SizeWE" />
+                                </Grid>
+
+                                <TextBox
+                                    Grid.Column="2"
+                                    Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding PreCloseValveWeight}" />
+
+                                <Grid Grid.Column="3">
+                                    <TextBox
+                                        Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
+                                        Style="{StaticResource InputTextboxStyle}"
+                                        Text="{Binding RapidAcceleration}" />
+                                    <Border
+                                        BorderBrush="{StaticResource bordColor}"
+                                        BorderThickness="1,0,1,0"
+                                        Cursor="SizeWE" />
+                                </Grid>
+
+                                <TextBox
+                                    Grid.Column="4"
+                                    Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding SlowAcceleration}" />
+
+                                <Grid Grid.Column="5">
+                                    <TextBox
+                                        Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
+                                        Style="{StaticResource InputTextboxStyle}"
+                                        Text="{Binding ServoManualSpeed}" />
+                                    <Border
+                                        BorderBrush="{StaticResource bordColor}"
+                                        BorderThickness="1,0,1,0"
+                                        Cursor="SizeWE" />
+                                </Grid>
+
+                                <TextBox
+                                    Grid.Column="6"
+                                    Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding SiloUpperLimitWeight}" />
+
+                                <Grid Grid.Column="7">
+                                    <TextBox
+                                        Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
+                                        Style="{StaticResource InputTextboxStyle}"
+                                        Text="{Binding LowerLimitWeightOfSilo}" />
+                                    <Border
+                                        BorderBrush="{StaticResource bordColor}"
+                                        BorderThickness="1,0,1,0"
+                                        Cursor="SizeWE" />
+                                </Grid>
+
+                                <TextBox
+                                    Grid.Column="8"
+                                    Foreground="{Binding IsRedundant, Converter={StaticResource tabConvert}}"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding StirringSpeed}" />
+
+                                <Grid Grid.Column="9">
+                                    <TextBox
+                                        Foreground="Red"
+                                        Style="{StaticResource InputTextboxStyle}"
+                                        Text="{Binding ErrorRange}" />
+                                    <Border
+                                        BorderBrush="{StaticResource bordColor}"
+                                        BorderThickness="1,0,1,0"
+                                        Cursor="SizeWE" />
+                                </Grid>
+
+                                <Button
+                                    Grid.Column="10"
+                                    Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                    CommandParameter="{Binding MaterialName}"
+                                    Content="删除"
+                                    FontSize="16"
+                                    Style="{StaticResource ControlButtonStyle}" />
+
+                                <Border
+                                    Grid.ColumnSpan="11"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,1" />
+
+                            </Grid>
+                            <DataTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                </Trigger>
+                            </DataTemplate.Triggers>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </Grid>
+
+
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/DeviceMaterialParView.xaml.cs b/BPASmartClient.FoodStationTest/View/DeviceMaterialParView.xaml.cs
new file mode 100644
index 00000000..c45a7598
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/DeviceMaterialParView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// DeviceMaterialParView.xaml 的交互逻辑
+    /// </summary>
+    public partial class DeviceMaterialParView : UserControl
+    {
+        public DeviceMaterialParView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/HardwareStatusView.xaml b/BPASmartClient.FoodStationTest/View/HardwareStatusView.xaml
new file mode 100644
index 00000000..96133824
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/HardwareStatusView.xaml
@@ -0,0 +1,232 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.HardwareStatusView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:control="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:HardwareStatusViewModel />
+    </UserControl.DataContext>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="0.5*" />
+            <RowDefinition />
+            <RowDefinition Height="0.5*" />
+        </Grid.RowDefinitions>
+
+        <!--#region 顶部料仓-->
+        <Grid Name="TopGrid">
+            <ListView
+                Height="{Binding ElementName=TopGrid, Path=ActualHeight}"
+                VerticalAlignment="Center"
+                Background="Transparent"
+                BorderThickness="0"
+                ItemsSource="{Binding TopDeviceCurrentStatuses}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <!--<WrapPanel Orientation="Horizontal" IsItemsHost="True"/>-->
+                        <UniformGrid
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Columns="8"
+                            Rows="1" />
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <Border Margin="5" Background="Transparent">
+                            <Grid Height="220">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+
+                                <TextBlock
+                                    Margin="0,0,0,35"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Bottom"
+                                    FontSize="25"
+                                    Foreground="#ffccd61f"
+                                    Text="{Binding DeviceName}" />
+
+                                <StackPanel
+                                    Grid.Row="1"
+                                    Margin="0,10,0,0"
+                                    HorizontalAlignment="Center"
+                                    Orientation="Horizontal">
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text="{Binding Weight}" />
+
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text=" kg" />
+                                </StackPanel>
+
+                                <StackPanel
+                                    Grid.Row="1"
+                                    Margin="0,40,0,0"
+                                    HorizontalAlignment="Center"
+                                    Orientation="Horizontal">
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text="{Binding DeviceNum}" />
+
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text=" 号仓" />
+                                </StackPanel>
+                                
+                                <StackPanel
+                                    Grid.Row="1"
+                                    Margin="0,70,0,0"
+                                    HorizontalAlignment="Center"
+                                    Orientation="Horizontal">
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text="运行状态：" />
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text="{Binding RunStatus}" />
+
+                                </StackPanel>
+                                <Image
+                                    Grid.RowSpan="2"
+                                    Source="/BPASmartClient.CustomResource;component/Image/光柱.png"
+                                    Stretch="Fill" />
+
+                            </Grid>
+                        </Border>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+        </Grid>
+        <!--#endregion-->
+
+        <Grid x:Name="gr" Grid.Row="1">
+            <pry:ConveyorBelt
+                Grid.Row="1"
+                Width="{Binding ElementName=gr, Path=ActualWidth}"
+                Height="{Binding ElementName=gr, Path=ActualHeight}"
+                Margin="10,0,400,0"
+                ConveyorBeltWidth="70"
+                Direction="0"
+                StrokeBrush="#00BEFA"
+                StrokeDashArray="1.5 1.5"
+                StrokeFillBrush="#00BEFA"
+                StrokeThickness="2" />
+        </Grid>
+
+        <!--#region 底部料仓-->
+        <Grid Grid.Row="2">
+            <ListView
+                VerticalAlignment="Center"
+                Background="Transparent"
+                BorderThickness="0"
+                ItemsSource="{Binding BottomDeviceCurrentStatuses}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <UniformGrid
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Columns="8"
+                            Rows="1" />
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <Border Margin="5" Background="Transparent">
+                            <Grid Height="220">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+
+                                <TextBlock
+                                    Margin="0,0,0,35"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Bottom"
+                                    FontSize="25"
+                                    Foreground="#ffccd61f"
+                                    Text="{Binding DeviceName}" />
+
+                                <StackPanel
+                                    Grid.Row="1"
+                                    Margin="0,10,0,0"
+                                    HorizontalAlignment="Center"
+                                    Orientation="Horizontal">
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text="{Binding Weight}" />
+
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text=" kg" />
+                                </StackPanel>
+
+
+                                <StackPanel
+                                    Grid.Row="1"
+                                    Margin="0,40,0,0"
+                                    HorizontalAlignment="Center"
+                                    Orientation="Horizontal">
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text="{Binding DeviceNum}" />
+
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text=" 号仓" />
+                                </StackPanel>
+                                <StackPanel
+                                    Grid.Row="1"
+                                    Margin="0,70,0,0"
+                                    HorizontalAlignment="Center"
+                                    Orientation="Horizontal">
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text="运行状态：" />
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text="{Binding RunStatus}" />
+                                </StackPanel>
+                                <Image
+                                    Grid.RowSpan="2"
+                                    Source="/BPASmartClient.CustomResource;component/Image/光柱.png"
+                                    Stretch="Fill" />
+
+                            </Grid>
+                        </Border>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+        </Grid>
+        <!--#endregion-->
+
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/HardwareStatusView.xaml.cs b/BPASmartClient.FoodStationTest/View/HardwareStatusView.xaml.cs
new file mode 100644
index 00000000..1ef2bddc
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/HardwareStatusView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// HardwareStatusView.xaml 的交互逻辑
+    /// </summary>
+    public partial class HardwareStatusView : UserControl
+    {
+        public HardwareStatusView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/ManualCommView.xaml b/BPASmartClient.FoodStationTest/View/ManualCommView.xaml
new file mode 100644
index 00000000..f9da5368
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/ManualCommView.xaml
@@ -0,0 +1,174 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.ManualCommView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="850"
+    d:DesignWidth="1200"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:ManualCommViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <Style x:Key="radioButtonStyle" TargetType="RadioButton">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="RadioButton">
+                        <Grid Name="gr" Opacity="0.8">
+                            <ContentControl
+                                Margin="{TemplateBinding Margin}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Content="{TemplateBinding Content}"
+                                FontSize="{TemplateBinding FontSize}"
+                                Foreground="{TemplateBinding Foreground}" />
+                            <Image
+                                Name="image"
+                                Source="/BPASmartClient.CustomResource;component/Image/边框线.png"
+                                Stretch="Fill" />
+
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="False">
+                                <Setter TargetName="image" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/边框线.png" />
+                            </Trigger>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter TargetName="image" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/透明背景.png" />
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="gr" Property="Opacity" Value="1" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Resources>
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <!--#region 表格标题栏设置-->
+        <Grid
+            Grid.Row="0"
+            Margin="0,10,0,0"
+            Background="#ff0C255F">
+
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="3*"/>
+                <ColumnDefinition Width="4*"/>
+                <ColumnDefinition Width="2*"/>
+                <ColumnDefinition Width="2*"/>
+                <ColumnDefinition Width="2*"/>
+            </Grid.ColumnDefinitions>
+            <Grid Grid.Column="0">
+                <TextBlock Text="序号"  HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"/>
+                <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
+            </Grid>
+            <TextBlock  Grid.Column="1" Text="地址" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <Grid Grid.Column="2">
+                <TextBlock Text="描述"  HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+                <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
+            </Grid>
+            <TextBlock Grid.Column="3" Text="当前值" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"  />
+            <Grid Grid.Column="4">
+                <TextBlock  Text="设定值" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+                <Border BorderThickness="1,0,1,0"  Cursor="SizeWE" />
+            </Grid>
+            <TextBlock Grid.Column="5" Text="功能操作" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,0" />
+        </Grid>
+        <Grid Grid.Row="1">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"  >
+                <ItemsControl ItemsSource="{Binding PlcInfo}" Foreground="Aqua">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid Name="gr" >
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="3*"/>
+                                    <ColumnDefinition Width="4*"/>
+                                    <ColumnDefinition Width="2*"/>
+                                    <ColumnDefinition Width="2*"/>
+                                    <ColumnDefinition Width="2*"/>
+                                </Grid.ColumnDefinitions>
+                                <Grid Grid.Column="0">
+                                    <TextBlock
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding SerialNum}" />
+                                    <Border
+                                        BorderThickness="1,0,1,0"
+                                        Cursor="SizeWE" />
+                                </Grid>
+                                <TextBlock
+                                    Grid.Column="1"
+                                    HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                    Text="{Binding Address }" />
+
+                                <Grid Grid.Column="2">
+                                    <TextBlock
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding Describe}" />
+                                    <Border
+                                        BorderThickness="1,0,1,0"
+                                        Cursor="SizeWE" />
+                                </Grid>
+
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                    Grid.Column="3"
+                                    Text="{Binding NowValue}" />
+                                <Grid Grid.Column="4">
+                                    <TextBox
+                                        Text="{Binding SetValue}" />
+                                    <Border
+                                            BorderThickness="1,0,1,0"
+                                            Cursor="SizeWE" />
+                                </Grid>
+                                <Grid Grid.Column="5">
+                                    <pry:IcoButton 
+                                        Command="{Binding DataContext.SetParCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding Address}"
+                                        Grid.Column="0"
+                                        Margin="40,5,40,5"
+                                        Content="设置"
+                                        FontSize="20"
+                                        Foreground="Aqua"
+                                        Style="{StaticResource IcoButtonStyle}" /> 
+                                    <Border
+                                            BorderThickness="1,0,1,0"
+                                            Cursor="SizeWE" />
+                                </Grid>
+
+                                <Border
+                                    Grid.ColumnSpan="10"
+                                    BorderThickness="1,0,1,1" />
+
+                            </Grid>
+                            <DataTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                </Trigger>
+                            </DataTemplate.Triggers>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/ManualCommView.xaml.cs b/BPASmartClient.FoodStationTest/View/ManualCommView.xaml.cs
new file mode 100644
index 00000000..796ae612
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/ManualCommView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// DeviceMaterialParView.xaml 的交互逻辑
+    /// </summary>
+    public partial class ManualCommView : UserControl
+    {
+        public ManualCommView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/ManualControlView.xaml b/BPASmartClient.FoodStationTest/View/ManualControlView.xaml
new file mode 100644
index 00000000..8c36c644
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/ManualControlView.xaml
@@ -0,0 +1,628 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.ManualControlView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="850"
+    d:DesignWidth="1200"
+    mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <Style x:Key="radioButtonStyle" TargetType="RadioButton">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="RadioButton">
+                        <Grid Name="gr" Opacity="0.8">
+                            <ContentControl
+                                Margin="{TemplateBinding Margin}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Content="{TemplateBinding Content}"
+                                FontSize="{TemplateBinding FontSize}"
+                                Foreground="{TemplateBinding Foreground}" />
+                            <Image
+                                Name="image"
+                                Source="/BPASmartClient.CustomResource;component/Image/边框线.png"
+                                Stretch="Fill" />
+
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="False">
+                                <Setter TargetName="image" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/边框线.png" />
+                            </Trigger>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter TargetName="image" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/透明背景.png" />
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="gr" Property="Opacity" Value="1" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Resources>
+
+    <UserControl.DataContext>
+        <vm:ManualControlViewModel />
+    </UserControl.DataContext>
+
+    <Grid Margin="8">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2*" />
+            <RowDefinition Height="2*" />
+            <RowDefinition Height="3*" />
+            <RowDefinition Height="2*" />
+        </Grid.RowDefinitions>
+        <Grid
+            Name="jiu"
+            Grid.Row="0"
+            Margin="5">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="20" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <pry:ImageBorder
+                Grid.RowSpan="2"
+                Width="{Binding ElementName=tp, Path=ActualWidth}"
+                Height="{Binding ElementName=tp, Path=ActualHeight}" />
+
+            <Image
+                Margin="2,3,0,0"
+                HorizontalAlignment="Left"
+                Source="/BPASmartClient.CustomResource;component/Image/标签.png" />
+            <TextBlock
+                Margin="10,0,0,0"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="Aqua"
+                Text="总控制" />
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="5*" />
+                    <ColumnDefinition Width="5*" />
+                </Grid.ColumnDefinitions>
+                <Grid Grid.Column="0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Grid>
+                        <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock
+                                FontSize="24"
+                                Foreground="Aqua"
+                                Text="当前系统模式：" />
+                            <TextBlock
+                                FontSize="24"
+                                Foreground="Aqua"
+                                Text="{Binding SystemMode}" />
+                        </WrapPanel>
+                    </Grid>
+                    <Grid Grid.Row="1" Grid.Column="0">
+                        <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock
+                                FontSize="24"
+                                Foreground="Aqua"
+                                Text="当前系统状态：" />
+                            <TextBlock
+                                FontSize="24"
+                                Foreground="Aqua"
+                                Text="{Binding SystemStatus}" />
+                        </WrapPanel>
+                    </Grid>
+
+                    <RadioButton
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Margin="15"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Command="{Binding AutoMode}"
+                        Content="Auto模式"
+                        FontSize="20"
+                        Foreground="Aqua"
+                        IsChecked="{Binding AutoModeStatus}" />
+                    <RadioButton
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="15"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Command="{Binding DebugMode}"
+                        Content="Debug模式"
+                        FontSize="20"
+                        Foreground="Aqua"
+                        IsChecked="{Binding ManualMode}" />
+                </Grid>
+
+                <Grid Grid.Column="3">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <pry:IcoButton
+                        Grid.Column="0"
+                        Margin="5,30"
+                        Command="{Binding SystemStartCommand}"
+                        Content="启动"
+                        FontSize="40"
+                        Foreground="Aqua"
+                        Style="{StaticResource IcoButtonStyle}" />
+                    <pry:IcoButton
+                        Grid.Column="1"
+                        Margin="5,30"
+                        Command="{Binding SystemStopCommand}"
+                        Content="停止"
+                        FontSize="40"
+                        Foreground="Aqua"
+                        Style="{StaticResource IcoButtonStyle}" />
+                    <pry:IcoButton
+                        Grid.Column="2"
+                        Margin="5,30"
+                        Command="{Binding SystemPauseCommand}"
+                        Content="暂停"
+                        FontSize="40"
+                        Foreground="Aqua"
+                        Style="{StaticResource IcoButtonStyle}" />
+                    <pry:IcoButton
+                        Grid.Column="3"
+                        Margin="5,30"
+                        Command="{Binding SystemResetCommand}"
+                        Content="恢复"
+                        FontSize="40"
+                        Foreground="Aqua"
+                        Style="{StaticResource IcoButtonStyle}" />
+                </Grid>
+            </Grid>
+        </Grid>
+        <Grid
+            Name="zd"
+            Grid.Row="1"
+            Margin="5">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="40" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <pry:ImageBorder
+                Grid.RowSpan="2"
+                Width="{Binding ElementName=zd, Path=ActualWidth}"
+                Height="{Binding ElementName=zd, Path=ActualHeight}" />
+
+            <Image
+                Margin="2,3,0,0"
+                HorizontalAlignment="Left"
+                Source="/BPASmartClient.CustomResource;component/Image/标签.png" />
+            <TextBlock
+                Margin="10,0,0,0"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="Aqua"
+                Text="线体控制" />
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <TextBlock
+                        Grid.ColumnSpan="2"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Text="进桶侧调速电机" />
+                    <pry:IcoButton
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="10"
+                        Command="{Binding StartAxisLoadCommand}"
+                        Content="启动"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Style="{StaticResource IcoButtonStyle}" />
+                    <pry:IcoButton
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="10"
+                        Command="{Binding StopAxisLoadCommand}"
+                        Content="停止"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Style="{StaticResource IcoButtonStyle}" />
+                </Grid>
+
+
+                <Border BorderThickness="1,0,1,0" />
+                <Grid Grid.Column="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <TextBlock
+                        Grid.ColumnSpan="2"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Text="过渡段调速电机" />
+                    <pry:IcoButton
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="10"
+                        Command="{Binding StartAxisMidCommand}"
+                        Content="启动"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Style="{StaticResource IcoButtonStyle}" />
+                    <pry:IcoButton
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="10"
+                        Command="{Binding StopAxisMidCommand}"
+                        Content="停止"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Style="{StaticResource IcoButtonStyle}" />
+                </Grid>
+                <Grid Grid.Column="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <TextBlock
+                        Grid.ColumnSpan="2"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Text="出桶侧调速电机" />
+                    <pry:IcoButton
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="10"
+                        Command="{Binding StartAxisUnLoadCommand}"
+                        Content="启动"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Style="{StaticResource IcoButtonStyle}" />
+                    <pry:IcoButton
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="10"
+                        Command="{Binding StopAxisUnLoadCommand}"
+                        Content="停止"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Style="{StaticResource IcoButtonStyle}" />
+                </Grid>
+                <Border BorderThickness="1,0,1,0" />
+                <Grid Grid.Column="3">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <TextBlock
+                        Grid.ColumnSpan="2"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Text="伺服1调速电机" />
+                    <pry:IcoButton
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="10"
+                        Command="{Binding StartAxis1Command}"
+                        Content="启动"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Style="{StaticResource IcoButtonStyle}" />
+                    <pry:IcoButton
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="10"
+                        Command="{Binding StopAxis1Command}"
+                        Content="停止"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Style="{StaticResource IcoButtonStyle}" />
+                </Grid>
+                <Grid Grid.Column="4">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <TextBlock
+                        Grid.ColumnSpan="2"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Text="伺服2调速电机" />
+                    <pry:IcoButton
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="10"
+                        Command="{Binding StartAxis2Command}"
+                        Content="启动"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Style="{StaticResource IcoButtonStyle}" />
+                    <pry:IcoButton
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="10"
+                        Command="{Binding StopAxis2Command}"
+                        Content="停止"
+                        FontSize="16"
+                        Foreground="Aqua"
+                        Style="{StaticResource IcoButtonStyle}" />
+                </Grid>
+            </Grid>
+        </Grid>
+        <!--#region 升降气缸-->
+        <Grid
+            Name="cy"
+            Grid.Row="2"
+            Margin="5">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="40" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <pry:ImageBorder
+                Grid.RowSpan="2"
+                Width="{Binding ElementName=cy, Path=ActualWidth}"
+                Height="{Binding ElementName=cy, Path=ActualHeight}" />
+
+            <Image
+                Margin="2,3,0,0"
+                HorizontalAlignment="Left"
+                Source="/BPASmartClient.CustomResource;component/Image/标签.png" />
+            <TextBlock
+                Margin="10,0,0,0"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="Aqua"
+                Text="升降气缸控制" />
+            <ListView
+                Grid.Row="1"
+                Background="Transparent"
+                BorderBrush="#00BEFA"
+                BorderThickness="0"
+                ItemsSource="{Binding cylinderModels}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <UniformGrid
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Columns="8" />
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <Grid
+                            Width="200"
+                            Height="100"
+                            Margin="0,0,0,15"
+                            Background="Transparent">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="30" />
+                                <RowDefinition />
+                                <RowDefinition Height="30" />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="0.5*" />
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock
+                                Grid.Column="1"
+                                Grid.ColumnSpan="2"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Foreground="Aqua"
+                                Text="{Binding Name}" />
+
+                            <pry:Cylinder
+                                Grid.Row="1"
+                                Grid.ColumnSpan="3"
+                                Width="200"
+                                Height="50"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                LeftTogIsChecked="{Binding LeftTog}"
+                                RightTogIsChecked="{Binding RightTog}" />
+
+                            <RadioButton
+                                Grid.Row="2"
+                                Grid.Column="1"
+                                Command="{Binding DataContext.Open, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                CommandParameter="{Binding Name}"
+                                Content="伸出"
+                                Foreground="Aqua"
+                                IsChecked="True"
+                                Style="{StaticResource radioButtonStyle}" />
+
+                            <RadioButton
+                                Grid.Row="2"
+                                Grid.Column="2"
+                                Command="{Binding DataContext.Close, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                CommandParameter="{Binding Name}"
+                                Content="缩回"
+                                Foreground="Aqua"
+                                IsChecked="False"
+                                Style="{StaticResource radioButtonStyle}" />
+                        </Grid>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+        </Grid>
+        <!--#endregion-->
+
+        <!--#region 阻挡气缸-->
+
+        <!--#endregion-->
+
+        <!--#region 托盘气缸-->
+        <Grid
+            Name="tp"
+            Grid.Row="3"
+            Margin="5">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="40" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <pry:ImageBorder
+                Grid.RowSpan="2"
+                Width="{Binding ElementName=tp, Path=ActualWidth}"
+                Height="{Binding ElementName=tp, Path=ActualHeight}" />
+
+            <Image
+                Margin="2,3,0,0"
+                HorizontalAlignment="Left"
+                Source="/BPASmartClient.CustomResource;component/Image/标签.png" />
+            <TextBlock
+                Margin="10,0,0,0"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="Aqua"
+                Text="托盘气缸控制" />
+            <ListView
+                Grid.Row="2"
+                Margin="10"
+                Background="Transparent"
+                BorderBrush="#00BEFA"
+                BorderThickness="0"
+                ItemsSource="{Binding PalletCylinders}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <UniformGrid
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Columns="8" />
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <Grid
+                            Width="200"
+                            Height="100"
+                            Margin="0,0,0,15"
+                            Background="Transparent">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="30" />
+                                <RowDefinition />
+                                <RowDefinition Height="30" />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="0.5*" />
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock
+                                Grid.Column="1"
+                                Grid.ColumnSpan="2"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Foreground="Aqua"
+                                Text="{Binding Name}" />
+
+                            <pry:Cylinder
+                                Grid.Row="1"
+                                Grid.ColumnSpan="3"
+                                Width="200"
+                                Height="50"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                LeftTogIsChecked="{Binding LeftTog}"
+                                RightTogIsChecked="{Binding RightTog}" />
+
+                            <RadioButton
+                                Grid.Row="2"
+                                Grid.Column="1"
+                                Command="{Binding DataContext.Open, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                CommandParameter="{Binding Name}"
+                                Content="伸出"
+                                Foreground="Aqua"
+                                IsChecked="True"
+                                Style="{StaticResource radioButtonStyle}" />
+
+                            <RadioButton
+                                Grid.Row="2"
+                                Grid.Column="2"
+                                Command="{Binding DataContext.Close, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                CommandParameter="{Binding Name}"
+                                Content="缩回"
+                                Foreground="Aqua"
+                                IsChecked="False"
+                                Style="{StaticResource radioButtonStyle}" />
+                        </Grid>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+        </Grid>
+        <!--#endregion-->
+
+
+
+
+
+
+
+
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/ManualControlView.xaml.cs b/BPASmartClient.FoodStationTest/View/ManualControlView.xaml.cs
new file mode 100644
index 00000000..1fb0a342
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/ManualControlView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// ManualControlView.xaml 的交互逻辑
+    /// </summary>
+    public partial class ManualControlView : UserControl
+    {
+        public ManualControlView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/ManualFlowView.xaml b/BPASmartClient.FoodStationTest/View/ManualFlowView.xaml
new file mode 100644
index 00000000..d0669cf9
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/ManualFlowView.xaml
@@ -0,0 +1,507 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.ManualFlowView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
+    <UserControl.DataContext>
+        <vm:ManualFlowViewModel />
+
+    </UserControl.DataContext>
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="100" />
+            <RowDefinition Height="100" />
+            <RowDefinition Height="1*" />
+        </Grid.RowDefinitions>
+        <!--#region 表格标题栏设置-->
+        <Grid>
+            <StackPanel
+                HorizontalAlignment="left"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
+                <Button
+                    Name="test1"
+                    Width="200"
+                    Height="40"
+                    Margin="5"
+                    Panel.ZIndex="0"
+                    Command="{Binding Test1Command}"
+                    Content="AGV送托盘完成"
+                    FontSize="20"
+                    Style="{StaticResource ImageButtonStyle}"
+                    Visibility="{Binding VisibilityBtn1}" />
+                <Button
+                    Name="test2"
+                    Width="200"
+                    Height="40"
+                    Margin="5"
+                    Panel.ZIndex="0"
+                    Command="{Binding Test2Command}"
+                    Content="粉料仓配料完成"
+                    FontSize="20"
+                    Style="{StaticResource ImageButtonStyle}"
+                    Visibility="{Binding VisibilityBtn2}" />
+                <Button
+                    Name="test3"
+                    Width="200"
+                    Height="40"
+                    Margin="5"
+                    Panel.ZIndex="0"
+                    Command="{Binding Test3Command}"
+                    Content="AGV取托盘完成"
+                    FontSize="20"
+                    Style="{StaticResource ImageButtonStyle}"
+                    Visibility="{Binding VisibilityBtn3}" />
+                <TextBlock
+                    Width="100"
+                    Margin="10"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="25"
+                    Foreground="#FF2AB2E7" />
+                <!--<Button
+                    Width="200"
+                    Height="40"
+                    Margin="5"
+                    Panel.ZIndex="0"
+                    Command="{Binding Test5Command}"
+                    Content="粉料仓提升到位"
+                    FontSize="20"
+                    Style="{StaticResource ImageButtonStyle}" />-->
+                <Button
+                    Width="200"
+                    Height="40"
+                    Margin="5"
+                    Command="{Binding BPAResetCommand}"
+                    Content="上位机初始化"
+                    FontSize="20"
+                    Style="{StaticResource ImageButtonStyle}" />
+            </StackPanel>
+        </Grid>
+        <Grid Grid.Row="1">
+            <StackPanel
+                HorizontalAlignment="left"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
+                <Button
+                    Width="200"
+                    Height="40"
+                    Margin="5,0,5,0"
+                    Panel.ZIndex="0"
+                    Command="{Binding SystemReset}"
+                    Content="PLC系统复位"
+                    FontSize="20"
+                    Style="{StaticResource ImageButtonStyle}" />
+                <Button
+                    Width="200"
+                    Height="40"
+                    Margin="5,0,5,0"
+                    Panel.ZIndex="0"
+                    Command="{Binding CLearRecipeInfo}"
+                    Content="PLC配方清零"
+                    FontSize="20"
+                    Style="{StaticResource ImageButtonStyle}" />
+                <WrapPanel Margin="400,0">
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="订单号：" />
+                    <TextBox
+                        Width="300"
+                        Margin="5"
+                        VerticalAlignment="Center"
+                        FontSize="24"
+                        Text="{Binding CancelRecipeCode}" />
+                    <Button
+                        Width="120"
+                        Height="40"
+                        Margin="5"
+                        Command="{Binding CancelRecipeCommand}"
+                        Content="取消订单"
+                        FontSize="20"
+                        Style="{StaticResource ImageButtonStyle}" />
+                </WrapPanel>
+            </StackPanel>
+
+
+        </Grid>
+        <Grid Grid.Row="2">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+
+                <StackPanel Grid.Column="1" Orientation="Vertical">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="海科plc心跳：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Heartbeat}" />
+                    </StackPanel>
+                </StackPanel>
+                <WrapPanel Grid.Row="0">
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="西门子 连接状态：" />
+                    <TextBlock
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding SiemensIsConnect}" />
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="海科plc连接状态：" />
+                    <TextBlock
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding HKPlcIsConnect}" />
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="风送plc连接状态：" />
+                    <TextBlock
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding WindSendIsConnect}" />
+                </WrapPanel>
+                <WrapPanel Grid.Row="2">
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="当前下发配方状态：" />
+                    <TextBlock
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding OrderStatus}" />
+                </WrapPanel>
+                <WrapPanel Grid.Row="0" Grid.Column="2">
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="柔性味魔方配料完成，延迟复位时间：" />
+                    <TextBox
+                        Width="150"
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding time}" />
+                    <TextBlock
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="ms" />
+                    <Button
+                        Width="100"
+                        Height="40"
+                        Margin="5,0,5,0"
+                        Panel.ZIndex="0"
+                        Command="{Binding TimeSet}"
+                        Content="设置"
+                        FontSize="20"
+                        Style="{StaticResource ImageButtonStyle}" />
+                </WrapPanel>
+                <WrapPanel
+                    Grid.Row="3"
+                    Grid.RowSpan="2"
+                    Grid.Column="0">
+                    <TextBlock
+                        Width="200"
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="当前配料状态：" />
+                    <WrapPanel>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方1：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe1DosingStatus}" />
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方2：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe2DosingStatus}" />
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方3：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe3DosingStatus}" />
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方4：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe4DosingStatus}" />
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方5：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe5DosingStatus}" />
+                    </WrapPanel>
+                </WrapPanel>
+                <WrapPanel
+                    Grid.Row="3"
+                    Grid.RowSpan="2"
+                    Grid.Column="1">
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="配料情况：" />
+                    <WrapPanel>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方1：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe1DosingComplete}" />
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方2：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe2DosingComplete}" />
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方3：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe3DosingComplete}" />
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方4：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe4DosingComplete}" />
+                    </WrapPanel>
+                    <WrapPanel>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="配方5：" />
+                        <TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="25"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding Recipe5DosingComplete}" />
+                    </WrapPanel>
+                </WrapPanel>
+                <WrapPanel Grid.Row="1" Grid.Column="2">
+                    <!--<ComboBox
+                        x:Name="cmbList"
+                        Width="70"
+                        VerticalAlignment="Center"
+                        BorderBrush="#FF074B92"
+                        BorderThickness="1"
+                        FontFamily="楷体"
+                        FontSize="14"
+                        Foreground="LightGray"
+                        IsEditable="False"
+                        MouseLeave="ComboBox_MouseLeave"
+                        Style="{StaticResource ComboBoxStyle}"
+                        Text="{Binding RawMaterialName}"/>-->
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="料仓号:" />
+                    <TextBox
+                        Width="50"
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding StockbinDosingCompleNum}" />
+                    <Button
+                        Width="200"
+                        Height="40"
+                        Margin="5,0,5,0"
+                        Panel.ZIndex="0"
+                        Command="{Binding StockbinDosingComple}"
+                        Content="小料料仓配料完成"
+                        FontSize="20"
+                        Style="{StaticResource ImageButtonStyle}" />
+                    <Button
+                        Width="400"
+                        Height="40"
+                        Margin="10"
+                        HorizontalAlignment="Right"
+                        Panel.ZIndex="0"
+                        Command="{Binding StockbinDosingCompleClear}"
+                        Content="清除所有小料料仓配料完成信号"
+                        FontSize="20"
+                        Style="{StaticResource ImageButtonStyle}" />
+                </WrapPanel>
+                <WrapPanel Grid.Row="2" Grid.Column="2">
+                    <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="配方制作完成数目:" />
+                    <TextBlock
+                        Width="150"
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding RecipeDosingCompleNum}" />
+                    <Button
+                        Width="400"
+                        Height="40"
+                        Margin="5,0,5,0"
+                        Panel.ZIndex="0"
+                        Command="{Binding CompletedNumResetCommand}"
+                        Content="完成数目清零"
+                        FontSize="20"
+                        Style="{StaticResource ImageButtonStyle}" />
+                </WrapPanel>
+            </Grid>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/ManualFlowView.xaml.cs b/BPASmartClient.FoodStationTest/View/ManualFlowView.xaml.cs
new file mode 100644
index 00000000..f53642c2
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/ManualFlowView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// HKPlcCommMonitor.xaml 的交互逻辑
+    /// </summary>
+    public partial class ManualFlowView : UserControl
+    {
+        public ManualFlowView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/NewLocalRecipeView.xaml b/BPASmartClient.FoodStationTest/View/NewLocalRecipeView.xaml
new file mode 100644
index 00000000..eaae9691
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/NewLocalRecipeView.xaml
@@ -0,0 +1,412 @@
+<Window
+    x:Class="BPASmartClient.FoodStationTest.View.NewLocalRecipeView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    Title="NewRemoteRecipeView"
+    Width="900"
+    Height="700"
+    AllowsTransparency="True"
+    Background="{x:Null}"
+    Topmost="True"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
+
+    <Window.DataContext>
+        <vm:NewLocalRecipeViewModel />
+    </Window.DataContext>
+
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+
+                <ResourceDictionary>
+                    <!--#region ListBox样式-->
+                    <Style x:Key="ListBoxItemStyle1" TargetType="{x:Type ListBoxItem}">
+                        <Setter Property="OverridesDefaultStyle" Value="True" />
+                        <Setter Property="SnapsToDevicePixels" Value="True" />
+                        <Setter Property="BorderBrush" Value="{x:Null}" />
+                        <Setter Property="Foreground" Value="White" />
+                        <Setter Property="FontSize" Value="20" />
+                        <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                                    <Border x:Name="border" CornerRadius="8">
+                                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                    </Border>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                    <!--#endregion-->
+
+
+                    <Style x:Key="tbStyle" TargetType="TextBox">
+                        <Setter Property="BorderThickness" Value="0" />
+                        <Setter Property="Foreground" Value="DeepSkyBlue" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                        <Setter Property="CaretBrush" Value="Orange" />
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="Margin" Value="5,0,0,0" />
+                        <Setter Property="FontSize" Value="18" />
+                    </Style>
+
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
+
+    <Border
+        Name="br"
+        BorderBrush="#0CADF5"
+        BorderThickness="0">
+        <Border.Background>
+            <!--<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" />-->
+            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹框/z4.png" />
+            <!--<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹窗2.png" />-->
+        </Border.Background>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="50" />
+                <RowDefinition Height="150" />
+                <RowDefinition Height="10" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <TextBlock
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Foreground="DeepSkyBlue"
+                Text="配方编辑" />
+
+            <Button
+                Name="Close"
+                Width="50"
+                HorizontalAlignment="Right"
+                Content="&#xe679;"
+                FontSize="25"
+                Foreground="Red"
+                Style="{StaticResource TitleBarStyle}" />
+
+
+            <!--#region 信息录入-->
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+
+                <Grid Grid.Column="0" Margin="5,0">
+                    <Grid.Background>
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹框/ch.png" />
+                    </Grid.Background>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        HorizontalAlignment="Right"
+                        Background="Transparent"
+                        FontSize="18"
+                        Foreground="DeepSkyBlue"
+                        Text="配方名称：" />
+                    <TextBox
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Grid.ColumnSpan="3"
+                        Height="30"
+                        Margin="0,0,11,0"
+                        FontSize="16"
+                        Foreground="DeepSkyBlue"
+                        Text="{Binding RecipeName}" />
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        HorizontalAlignment="Right"
+                        Background="Transparent"
+                        FontSize="18"
+                        Foreground="DeepSkyBlue"
+                        Text="托盘编号：" />
+                    <TextBox
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Width="100"
+                        Height="30"
+                        HorizontalAlignment="Left"
+                        FontSize="16"
+                        Foreground="DeepSkyBlue"
+                        Text="{Binding TrayNum}" />
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="2"
+                        HorizontalAlignment="Right"
+                        Background="Transparent"
+                        FontSize="18"
+                        Foreground="DeepSkyBlue"
+                        Text="配方编码：" />
+                    <TextBox
+                        Grid.Row="1"
+                        Grid.Column="3"
+                        Width="100"
+                        Height="30"
+                        HorizontalAlignment="Left"
+                        FontSize="16"
+                        Foreground="DeepSkyBlue"
+                        Text="{Binding RecipeCode}" />
+
+                </Grid>
+
+                <Grid Grid.Column="1" Margin="5,0">
+                    <Grid.Background>
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹框/ch.png" />
+                    </Grid.Background>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+
+                    <Button
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Height="35"
+                        Margin="20,0"
+                        Command="{Binding SaveCommand}"
+                        Content="保存配方"
+                        FontSize="16"
+                        Style="{StaticResource ImageButtonStyle}" />
+
+                    <Button
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Height="35"
+                        Margin="20,0"
+                        Command="{Binding AddCommand}"
+                        Content="添加小料"
+                        FontSize="16"
+                        Style="{StaticResource ImageButtonStyle}" />
+                    <Button
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Height="35"
+                        Margin="20,0"
+                        Command="{Binding AddFLCommand}"
+                        Content="添加粉料"
+                        FontSize="16"
+                        Style="{StaticResource ImageButtonStyle}" />
+
+                </Grid>
+
+            </Grid>
+            <!--#endregion-->
+
+            <!--#region 表格显示-->
+            <Grid
+                Grid.Row="3"
+                Grid.RowSpan="2"
+                Margin="5">
+                <Grid.Background>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹框/bh.png" Stretch="Fill" />
+                </Grid.Background>
+
+                <Grid Margin="15,35,15,10">
+
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="40" />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+
+                    <!--#region 表格标题栏设置-->
+                    <Grid
+                        Grid.Row="0"
+                        Margin="0,10,0,0"
+                        Background="#ff0C255F">
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition Width="0.4*" />
+                            <ColumnDefinition Width="0.4*" />
+                            <ColumnDefinition Width="0.4*" />
+                            <ColumnDefinition Width="0.4*" />
+                            <ColumnDefinition Width="0.4*" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            FontSize="16"
+                            Text="原料名称" />
+
+                        <TextBlock
+                            Grid.Column="1"
+                            HorizontalAlignment="Center"
+                            FontSize="16"
+                            Text="原料类型" />
+
+                        <TextBlock
+                            Grid.Column="2"
+                            HorizontalAlignment="Center"
+                            FontSize="16"
+                            Text="原料位置" />
+
+                        <TextBlock
+                            Grid.Column="3"
+                            HorizontalAlignment="Center"
+                            FontSize="16"
+                            Text="原料桶号" />
+
+                        <TextBlock
+                            Grid.Column="4"
+                            HorizontalAlignment="Center"
+                            FontSize="16"
+                            Text="重量(kg)" />
+
+                        <TextBlock
+                            Grid.Column="5"
+                            HorizontalAlignment="Center"
+                            FontSize="16"
+                            Text="功能操作" />
+
+                        <Border
+                            Grid.ColumnSpan="6"
+                            BorderBrush="#8800bfff"
+                            BorderThickness="1" />
+                        <Border
+                            Grid.Column="1"
+                            BorderBrush="#8800bfff"
+                            BorderThickness="1,0,1,0" />
+                        <Border
+                            Grid.Column="3"
+                            BorderBrush="#8800bfff"
+                            BorderThickness="1,0,1,0" />
+                        <Border
+                            Grid.Column="5"
+                            BorderBrush="#8800bfff"
+                            BorderThickness="1,0,1,0" />
+                    </Grid>
+
+                    <!--  表格信息显示  -->
+                    <Grid Grid.Row="1">
+                        <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                            <ItemsControl ItemsSource="{Binding AllRawMaterial}">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid Name="gr">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition />
+                                                <ColumnDefinition Width="0.4*" />
+                                                <ColumnDefinition Width="0.4*" />
+                                                <ColumnDefinition Width="0.4*" />
+                                                <ColumnDefinition Width="0.4*" />
+                                                <ColumnDefinition Width="0.4*" />
+                                            </Grid.ColumnDefinitions>
+
+                                            <TextBlock
+                                                Margin="5,0,0,0"
+                                                FontFamily="楷体"
+                                                FontSize="18"
+                                                Foreground="DeepSkyBlue"
+                                                Text="{Binding RawMaterialName}" />
+
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                Margin="5,0,0,0"
+                                                FontFamily="楷体"
+                                                FontSize="18"
+                                                Foreground="DeepSkyBlue"
+                                                Text="{Binding RawMaterialType}" />
+
+                                            <TextBox
+                                                Grid.Column="2"
+                                                Style="{StaticResource tbStyle}"
+                                                Text="{Binding RawMaterialLocation}" />
+
+                                            <TextBox
+                                                Grid.Column="3"
+                                                Style="{StaticResource tbStyle}"
+                                                Text="{Binding RawMaterialBarrelNum}" />
+
+                                            <TextBox
+                                                Grid.Column="4"
+                                                Style="{StaticResource tbStyle}"
+                                                Text="{Binding RawMaterialWeight}" />
+
+                                            <Button
+                                                Grid.Column="5"
+                                                Height="25"
+                                                Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                                CommandParameter="{Binding RawMaterialName}"
+                                                Content="删除"
+                                                FontSize="16"
+                                                Style="{StaticResource ControlButtonStyle}" />
+
+                                            <!--<Button
+                                                Grid.Column="5"
+                                                Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                                CommandParameter="{Binding RawMaterialLocation}"
+                                                Content="删除"
+                                                FontSize="16" />-->
+
+                                            <Border
+                                                Grid.ColumnSpan="6"
+                                                BorderBrush="#8800bfff"
+                                                BorderThickness="1,0,1,1" />
+
+                                            <Border
+                                                Grid.Column="1"
+                                                BorderBrush="#8800bfff"
+                                                BorderThickness="1,0,1,0" />
+
+                                            <Border
+                                                Grid.Column="3"
+                                                BorderBrush="#8800bfff"
+                                                BorderThickness="1,0,1,0" />
+
+                                            <Border
+                                                Grid.Column="5"
+                                                BorderBrush="#8800bfff"
+                                                BorderThickness="1,0,1,0" />
+
+                                        </Grid>
+                                        <DataTemplate.Triggers>
+                                            <Trigger Property="IsMouseOver" Value="true">
+                                                <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                            </Trigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </ScrollViewer>
+                    </Grid>
+
+                </Grid>
+
+            </Grid>
+            <!--#endregion-->
+
+
+        </Grid>
+    </Border>
+</Window>
diff --git a/BPASmartClient.FoodStationTest/View/NewLocalRecipeView.xaml.cs b/BPASmartClient.FoodStationTest/View/NewLocalRecipeView.xaml.cs
new file mode 100644
index 00000000..781093ba
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/NewLocalRecipeView.xaml.cs
@@ -0,0 +1,24 @@
+using BPASmartClient.Helper;
+using System;
+using System.Windows;
+using System.Windows.Input;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// DeviceMaterialParView.xaml 的交互逻辑
+    /// </summary>
+    public partial class NewLocalRecipeView : Window
+    {
+        public NewLocalRecipeView()
+        {
+            InitializeComponent();
+            this.Close.Click += (o, e) => { this.Close(); };
+            this.br.MouseLeftButtonDown += (o, e) => { if (e.LeftButton == MouseButtonState.Pressed) this.DragMove(); };
+            //ActionManage.GetInstance.CancelRegister("CloseNewRemoteRecipeView");
+            ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "CloseNewRemoteRecipeView", true);
+        }
+
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/NewMaterialView.xaml b/BPASmartClient.FoodStationTest/View/NewMaterialView.xaml
new file mode 100644
index 00000000..2050fd1c
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/NewMaterialView.xaml
@@ -0,0 +1,175 @@
+<Window
+    x:Class="BPASmartClient.FoodStationTest.View.NewMaterialView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    Title="NewMateritalView"
+    Width="600"
+    Height="600"
+    AllowsTransparency="True"
+    Background="{x:Null}"
+    Topmost="True"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
+    <Window.DataContext>
+        <vm:NewMaterialViewModel />
+    </Window.DataContext>
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+
+                <ResourceDictionary>
+
+                    <!--#region ListBox样式-->
+                    <Style x:Key="ListBoxItemStyle1" TargetType="{x:Type ListBoxItem}">
+                        <Setter Property="OverridesDefaultStyle" Value="True" />
+                        <Setter Property="SnapsToDevicePixels" Value="True" />
+                        <Setter Property="BorderBrush" Value="{x:Null}" />
+                        <Setter Property="Foreground" Value="White" />
+                        <Setter Property="FontSize" Value="20" />
+                        <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                                    <Border x:Name="border" CornerRadius="8">
+                                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                    </Border>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                    <!--#endregion-->
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
+
+    <Border Name="br" BorderThickness="1">
+        <Border.Background>
+            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" />
+        </Border.Background>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="5" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="40" />
+                <RowDefinition Height="5" />
+                <RowDefinition Height="5*" />
+            </Grid.RowDefinitions>
+            <StackPanel
+                Grid.Row="1"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
+                <TextBlock
+                    Margin="10,0,0,0"
+                    Background="Transparent"
+                    FontSize="20"
+                    Foreground="#FF2AB2E7"
+                    Text="请输入原料名称：" />
+
+
+
+                <TextBox
+                    Grid.Column="1"
+                    Width="200"
+                    Height="30"
+                    Margin="10"
+                    FontSize="16"
+                    Text="{Binding MaterialName}" />
+
+                <Button
+                    Width="80"
+                    Height="30"
+                    Margin="10"
+                    Command="{Binding SaveCommand}"
+                    Content="保存"
+                    Cursor="Hand" />
+                <Button
+                    Name="btClose"
+                    Width="80"
+                    Height="30"
+                    Margin="10"
+                    Click="btClose_Click"
+                    Content="取消" />
+
+            </StackPanel>
+            <TextBlock
+                Grid.Row="2"
+                Margin="0,0,5,0"
+                HorizontalAlignment="Center"
+                Background="Transparent"
+                FontSize="16"
+                Foreground="Red"
+                Text="{Binding ErrorInfo}" />
+            <Grid Grid.Row="4">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="40" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    FontSize="25"
+                    Foreground="#FF2AB2E7"
+                    Text="本地原料" />
+                <Border
+                    Grid.Row="1"
+                    Margin="100,10"
+                    BorderBrush="#FF2AB2E7"
+                    BorderThickness="1">
+                    <ScrollViewer
+                        Grid.Row="1"
+                        BorderBrush="#FF2AB2E7"
+                        BorderThickness="1">
+                        <ItemsControl Margin="10" ItemsSource="{Binding Materials}">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <RadioButton GroupName="all">
+                                        <RadioButton.Template>
+                                            <ControlTemplate TargetType="RadioButton">
+                                                <Grid Name="gr" Height="40">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="2*" />
+                                                        <ColumnDefinition Width="*" />
+                                                    </Grid.ColumnDefinitions>
+                                                    <TextBlock
+                                                        Name="tb"
+                                                        Grid.Column="0"
+                                                        Width="150"
+                                                        Height="29"
+                                                        Margin="3,1"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        FontSize="20"
+                                                        Text="{Binding RawMaterialName}" />
+
+                                                    <Button
+                                                        Grid.Column="1"
+                                                        Margin="10,0,10,0"
+                                                        Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                                        CommandParameter="{Binding RawMaterialId}"
+                                                        Content="删除" />
+                                                </Grid>
+
+
+                                            </ControlTemplate>
+                                        </RadioButton.Template>
+                                    </RadioButton>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                    </ScrollViewer>
+                </Border>
+            </Grid>
+
+        </Grid>
+
+    </Border>
+</Window>
diff --git a/BPASmartClient.FoodStationTest/View/NewMaterialView.xaml.cs b/BPASmartClient.FoodStationTest/View/NewMaterialView.xaml.cs
new file mode 100644
index 00000000..3c3030af
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/NewMaterialView.xaml.cs
@@ -0,0 +1,23 @@
+using System.Windows;
+using System.Windows.Input;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// NewMateritalView.xaml 的交互逻辑
+    /// </summary>
+    public partial class NewMaterialView : Window
+    {
+        public NewMaterialView()
+        {
+            InitializeComponent();
+            this.btClose.Click += (o, e) => { this.Close(); };
+            this.br.MouseLeftButtonDown += (o, e) => { if (e.LeftButton == MouseButtonState.Pressed) this.DragMove(); };
+        }
+
+        private void btClose_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/NewRecipeView.xaml b/BPASmartClient.FoodStationTest/View/NewRecipeView.xaml
new file mode 100644
index 00000000..07d583da
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/NewRecipeView.xaml
@@ -0,0 +1,238 @@
+<Window
+    x:Class="BPASmartClient.FoodStationTest.View.NewRecipeView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    Title="NewRecipeView"
+    Width="550"
+    Height="450"
+    AllowsTransparency="True"
+    Background="{x:Null}"
+    Topmost="True"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
+
+    <Window.DataContext>
+        <vm:NewRecipeViewModel />
+    </Window.DataContext>
+
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+
+                <ResourceDictionary>
+                    <!--#region ListBox样式-->
+                    <Style x:Key="ListBoxItemStyle1" TargetType="{x:Type ListBoxItem}">
+                        <Setter Property="OverridesDefaultStyle" Value="True" />
+                        <Setter Property="SnapsToDevicePixels" Value="True" />
+                        <Setter Property="BorderBrush" Value="{x:Null}" />
+                        <Setter Property="Foreground" Value="White" />
+                        <Setter Property="FontSize" Value="20" />
+                        <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                                    <Border x:Name="border" CornerRadius="8">
+                                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                    </Border>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                    <!--#endregion-->
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
+
+    <Border
+        Name="br"
+        BorderBrush="#0CADF5"
+        BorderThickness="2">
+        <Border.Background>
+            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" />
+            <!--<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹窗2.png" />-->
+        </Border.Background>
+        <Grid>
+
+            <!--<Grid.Background>
+                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹窗.png" />
+            </Grid.Background>-->
+
+            <Grid.RowDefinitions>
+                <RowDefinition Height="5" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <!--<Button
+                Name="btClose"
+                Margin="0,0,5,0"
+                Padding="10,5"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Background="Transparent"
+                BorderThickness="0"
+                Content="X"
+                FontSize="18"
+                Foreground="White" />
+
+            <Border BorderBrush="#88DDDDDD" BorderThickness="0,0,0,1" />-->
+
+            <Grid Grid.Row="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="40" />
+                    <RowDefinition Height="40" />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+
+                <TextBlock
+                    Margin="10,0,0,0"
+                    Background="Transparent"
+                    FontSize="20"
+                    Foreground="#FF2AB2E7"
+                    Text="请输入配方名称：" />
+
+                <TextBlock
+                    Margin="0,0,10,0"
+                    HorizontalAlignment="Right"
+                    Background="Transparent"
+                    FontSize="16"
+                    Foreground="Red"
+                    Text="{Binding ErrorInfo}" />
+
+                <StackPanel
+                    Grid.Row="1"
+                    Margin="10,0,0,0"
+                    Orientation="Horizontal">
+
+                    <TextBox
+                        Grid.Column="1"
+                        Width="200"
+                        Height="30"
+                        Margin="0,0,7,0"
+                        FontSize="16"
+                        Text="{Binding RecipeName}" />
+
+                    <Button
+                        Width="148"
+                        Height="30"
+                        Margin="0,0,7,0"
+                        Command="{Binding AddCommand}"
+                        Content="添加原料"
+                        Cursor="Hand" />
+
+                    <Button
+                        Width="80"
+                        Height="30"
+                        Command="{Binding SaveCommand}"
+                        Content="确认" />
+
+                    <Button
+                        Name="btClose"
+                        Width="80"
+                        Height="30"
+                        Margin="7,0,0,0"
+                        Content="取消" />
+
+                </StackPanel>
+
+                <ScrollViewer
+                    Grid.Row="2"
+                    Margin="5"
+                    HorizontalScrollBarVisibility="Hidden"
+                    VerticalScrollBarVisibility="Hidden">
+                    <ItemsControl ItemsSource="{Binding RawMaterials}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <RadioButton GroupName="all">
+                                    <RadioButton.Template>
+                                        <ControlTemplate TargetType="RadioButton">
+                                            <Grid Name="gr" Height="40">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition />
+                                                    <ColumnDefinition />
+                                                    <ColumnDefinition Width="0.5*" />
+                                                </Grid.ColumnDefinitions>
+
+                                                <ComboBox
+                                                    Name="cb"
+                                                    Grid.Column="0"
+                                                    Margin="3,1"
+                                                    VerticalAlignment="Center"
+                                                    BorderBrush="#FF074B92"
+                                                    BorderThickness="1"
+                                                    FontFamily="楷体"
+                                                    FontSize="20"
+                                                    Foreground="#FF2AB2E7"
+                                                    IsEditable="False"
+                                                    ItemsSource="{Binding DataContext.RawMaterialNames, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                                    SelectedIndex="{Binding SelectIndex}"
+                                                    Style="{StaticResource ComboBoxStyle}"
+                                                    Text="{Binding RawMaterialName}" />
+
+                                                <!--<TextBox
+                                                    Name="cb"
+                                                    Grid.Column="0"
+                                                    Margin="3,1"
+                                                    VerticalAlignment="Center"
+                                                    BorderBrush="#FF074B92"
+                                                    BorderThickness="1"
+                                                    FontFamily="楷体"
+                                                    FontSize="20"
+                                                    Foreground="#FF2AB2E7"
+                                                    Text="{Binding RawMaterialName}" />-->
+                                                <StackPanel
+                                                    Grid.Column="1"
+                                                    VerticalAlignment="Center"
+                                                    Orientation="Horizontal">
+                                                    <TextBox
+                                                        Name="tb"
+                                                        Grid.Column="1"
+                                                        Width="150"
+                                                        Height="29"
+                                                        Margin="3,1"
+                                                        VerticalAlignment="Center"
+                                                        FontSize="20"
+                                                        Text="{Binding RawMaterialWeight}" />
+
+                                                    <TextBlock
+                                                        Grid.Column="1"
+                                                        Margin="0,0,8,4"
+                                                        HorizontalAlignment="Right"
+                                                        VerticalAlignment="Center"
+                                                        FontSize="20"
+                                                        Text="g" />
+
+                                                </StackPanel>
+
+                                                <Button
+                                                    Grid.Column="2"
+                                                    Width="80"
+                                                    Margin="25,0,0,0"
+                                                    Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                                    CommandParameter="{Binding RawMaterialId}"
+                                                    Content="删除" />
+
+                                            </Grid>
+
+
+                                        </ControlTemplate>
+                                    </RadioButton.Template>
+                                </RadioButton>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </ScrollViewer>
+
+            </Grid>
+
+        </Grid>
+    </Border>
+</Window>
diff --git a/BPASmartClient.FoodStationTest/View/NewRecipeView.xaml.cs b/BPASmartClient.FoodStationTest/View/NewRecipeView.xaml.cs
new file mode 100644
index 00000000..59e7af2e
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/NewRecipeView.xaml.cs
@@ -0,0 +1,22 @@
+using BPASmartClient.Helper;
+using System;
+using System.Windows;
+using System.Windows.Input;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// NewRecipeView.xaml 的交互逻辑
+    /// </summary>
+    public partial class NewRecipeView : Window
+    {
+        public NewRecipeView()
+        {
+            InitializeComponent();
+            this.btClose.Click += (o, e) => { this.Close(); };
+            this.br.MouseLeftButtonDown += (o, e) => { if (e.LeftButton == MouseButtonState.Pressed) this.DragMove(); };
+            ActionManage.GetInstance.CancelRegister("CloseNewRecipeView");
+            ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "CloseNewRecipeView");
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/PlcVarMonitorView.xaml b/BPASmartClient.FoodStationTest/View/PlcVarMonitorView.xaml
new file mode 100644
index 00000000..d3060d0e
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/PlcVarMonitorView.xaml
@@ -0,0 +1,202 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.PlcVarMonitorView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
+    <UserControl.DataContext>
+        <vm:PlcVarMonitorViewModel />
+    </UserControl.DataContext>
+    <Border BorderBrush="{StaticResource bordColor}" BorderThickness="0">
+        <Grid Margin="0,10">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="60" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="8*" />
+                    <ColumnDefinition Width="4*" />
+                    <ColumnDefinition Width="4*" />
+                    <ColumnDefinition Width="8*" />
+                    <ColumnDefinition Width="5*" />
+                    <ColumnDefinition Width="17" />
+                </Grid.ColumnDefinitions>
+                <Grid>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="序号" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
+                </Grid>
+                <Grid Grid.Column="1">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="名称" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
+                </Grid>
+                <Grid Grid.Column="2">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="地址" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
+                </Grid>
+                <Grid Grid.Column="3">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="类型" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
+                </Grid>
+                <Grid Grid.Column="4">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="描述" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
+                </Grid>
+                <Grid Grid.Column="5">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="当前值" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
+                </Grid>
+            </Grid>
+            <Grid Grid.Row="1">
+                <ScrollViewer>
+                    <ItemsControl Foreground="Aqua" ItemsSource="{Binding plcInfos}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Grid Name="gr" Height="30">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="3*" />
+                                        <ColumnDefinition Width="8*" />
+                                        <ColumnDefinition Width="4*" />
+                                        <ColumnDefinition Width="4*" />
+                                        <ColumnDefinition Width="8*" />
+                                        <ColumnDefinition Width="5*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid>
+                                        <TextBlock
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Count}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
+                                    </Grid>
+                                    <Grid Grid.Column="1">
+                                        <TextBlock
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Name}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
+                                    </Grid>
+                                    <Grid Grid.Column="2">
+                                        <TextBlock
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Address}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
+                                    </Grid>
+                                    <Grid Grid.Column="3">
+                                        <TextBlock
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Type}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
+                                    </Grid>
+                                    <Grid Grid.Column="4">
+                                        <TextBlock
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Describe}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
+                                    </Grid>
+                                    <Grid Grid.Column="5">
+                                        <TextBlock
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Value}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
+                                    </Grid>
+                                </Grid>
+                                <DataTemplate.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="true">
+                                        <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                    </Trigger>
+                                </DataTemplate.Triggers>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </ScrollViewer>
+            </Grid>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/PlcVarMonitorView.xaml.cs b/BPASmartClient.FoodStationTest/View/PlcVarMonitorView.xaml.cs
new file mode 100644
index 00000000..ba63ed6c
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/PlcVarMonitorView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// PlcVarMonitor.xaml 的交互逻辑
+    /// </summary>
+    public partial class PlcVarMonitorView : UserControl
+    {
+        public PlcVarMonitorView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/ProcessMonitorView.xaml b/BPASmartClient.FoodStationTest/View/ProcessMonitorView.xaml
new file mode 100644
index 00000000..50354f63
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/ProcessMonitorView.xaml
@@ -0,0 +1,177 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.ProcessMonitorView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
+    <UserControl.DataContext>
+        <vm:ProcessMonitorViewModel />
+    </UserControl.DataContext>
+    <Border BorderBrush="{StaticResource bordColor}" BorderThickness="0">
+        <Grid Margin="0,10">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="60" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="4*" />
+                    <ColumnDefinition Width="4*" />
+                    <ColumnDefinition Width="12*" />
+                    <ColumnDefinition Width="6*" />
+                    <ColumnDefinition Width="17" />
+                </Grid.ColumnDefinitions>
+                <Grid>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="序号" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
+                </Grid>
+                <Grid Grid.Column="1">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="名称" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
+                </Grid>
+                <Grid Grid.Column="2">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="类型" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
+                </Grid>
+                <Grid Grid.Column="3">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="描述" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
+                </Grid>
+                <Grid Grid.Column="4">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="32"
+                        Foreground="Aqua"
+                        Text="当前值" />
+                    <Border
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,0,0"
+                        Cursor="SizeWE" />
+                </Grid>
+            </Grid>
+            <Grid Grid.Row="1">
+                <ScrollViewer>
+                    <ItemsControl Foreground="Aqua" ItemsSource="{Binding plcInfos}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="2*" />
+                                        <ColumnDefinition Width="4*" />
+                                        <ColumnDefinition Width="4*" />
+                                        <ColumnDefinition Width="12*" />
+                                        <ColumnDefinition Width="6*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid>
+                                        <TextBlock
+                                            Margin="5"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Count}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
+                                    </Grid>
+                                    <Grid Grid.Column="1">
+                                        <TextBlock
+                                            Margin="5"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Name}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
+                                    </Grid>
+                                    <Grid Grid.Column="2">
+                                        <TextBlock
+                                            Margin="5"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Type}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
+                                    </Grid>
+                                    <Grid Grid.Column="3">
+                                        <TextBlock
+                                            Margin="5"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="14"
+                                            Foreground="Aqua"
+                                            Text="{Binding Describe}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
+                                    </Grid>
+                                    <Grid Grid.Column="4">
+                                        <TextBlock
+                                            Margin="5"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="16"
+                                            Foreground="Aqua"
+                                            Text="{Binding Value}" />
+                                        <Border
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1"
+                                            Cursor="SizeWE" />
+                                    </Grid>
+                                </Grid>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </ScrollViewer>
+            </Grid>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/ProcessMonitorView.xaml.cs b/BPASmartClient.FoodStationTest/View/ProcessMonitorView.xaml.cs
new file mode 100644
index 00000000..67e28b19
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/ProcessMonitorView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// ProcessMonitorView.xaml 的交互逻辑
+    /// </summary>
+    public partial class ProcessMonitorView : UserControl
+    {
+        public ProcessMonitorView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/RecipeControlView.xaml b/BPASmartClient.FoodStationTest/View/RecipeControlView.xaml
new file mode 100644
index 00000000..0a1cf89e
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/RecipeControlView.xaml
@@ -0,0 +1,802 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.RecipeControlView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:con="clr-namespace:BPASmartClient.FoodStationTest.Converter"
+    xmlns:control="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="800"
+    d:DesignWidth="1400"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:RecipeControlViewModel x:Name="bingSource" />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+
+        <con:RunStatusConvert x:Key="RunStatusConvert" />
+        <con:EnbleConvert x:Key="EnbleConvert" />
+        <con:IntToSourceConvert x:Key="IntToSourceConvert" />
+
+        <Style x:Key="UserItemContainerStyle" TargetType="ListBoxItem">
+            <Style.Resources>
+                <!--  SelectedItem with focus  -->
+                <SolidColorBrush
+                    x:Key="{x:Static SystemColors.HighlightBrushKey}"
+                    Opacity=".4"
+                    Color="White" />
+                <!--  SelectedItem without focus  -->
+                <SolidColorBrush
+                    x:Key="{x:Static SystemColors.ControlBrushKey}"
+                    Opacity=".4"
+                    Color="White" />
+            </Style.Resources>
+            <!--  设置触发器  -->
+            <Style.Triggers>
+                <Trigger Property="IsMouseOver" Value="true">
+                    <Setter Property="Background" Value="White" />
+                    <Setter Property="Foreground" Value="White" />
+                </Trigger>
+                <Trigger Property="IsFocused" Value="true">
+                    <Setter Property="Background" Value="White" />
+                    <Setter Property="Foreground" Value="White" />
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+
+        <Style x:Key="RadioState" TargetType="RadioButton">
+            <Setter Property="Margin" Value="1" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="#ddd" />
+            <Setter Property="VerticalContentAlignment" Value="Bottom" />
+            <Setter Property="Margin" Value="2,5" />
+            <Setter Property="FontSize" Value="16" />
+            <Setter Property="FontFamily" Value="Consolas" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="RadioButton">
+                        <Border
+                            Name="radiobutton"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="5"
+                            Opacity="0.85">
+                            <Grid>
+                                <!--<Border
+                                    x:Name="back_border"
+                                    BorderBrush="Black"
+                                    BorderThickness="0"
+                                    CornerRadius="1">
+                                    <Border.Effect>
+                                        <BlurEffect KernelType="Gaussian" Radius="2" />
+                                    </Border.Effect>
+                                </Border>
+                                <Border
+                                    x:Name="fore_border"
+                                    Margin="2"
+                                    BorderBrush="White"
+                                    BorderThickness="0"
+                                    CornerRadius="{Binding ElementName=button, Path=CornerRadius}"
+                                    Opacity="0.7">
+                                    <Border.Effect>
+                                        <BlurEffect KernelType="Gaussian" Radius="2" />
+                                    </Border.Effect>
+                                </Border>-->
+
+
+                                <ContentPresenter
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding Content}"
+                                    TextBlock.FontFamily="{TemplateBinding FontFamily}"
+                                    TextBlock.FontSize="{TemplateBinding FontSize}"
+                                    TextBlock.Foreground="{TemplateBinding Foreground}" />
+
+                                <Image
+                                    Name="im"
+                                    Source="/BPASmartClient.CustomResource;component/Image/按钮/组 8.png"
+                                    Stretch="Fill" />
+                            </Grid>
+                        </Border>
+
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="True">
+                                <!--<Setter TargetName="back_border" Property="BorderThickness" Value="1,0,1,1" />
+                                <Setter TargetName="back_border" Property="CornerRadius" Value="5" />
+                                <Setter TargetName="fore_border" Property="BorderThickness" Value="0,2,0,0" />
+                                <Setter Property="Background" Value=" #4169E1" />-->
+                                <Setter TargetName="im" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/按钮/组 7.png" />
+
+                            </Trigger>
+
+                            <Trigger Property="IsChecked" Value="False">
+                                <Setter TargetName="im" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/按钮/组 8.png" />
+                            </Trigger>
+
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <!--<Setter TargetName="back_border" Property="BorderBrush" Value="white" />
+                                <Setter TargetName="back_border" Property="BorderThickness" Value="1,1,1,1" />-->
+                                <Setter TargetName="radiobutton" Property="Opacity" Value="1" />
+                                <!--<Setter TargetName="im" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/按钮背景蓝色.png" />-->
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+
+                </Setter.Value>
+
+            </Setter>
+
+        </Style>
+        <Style x:Key="materialMakingButton" TargetType="Button">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="FontSize" Value="16" />
+            <Setter Property="Foreground" Value="#CD5555" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate>
+                        <Border
+                            x:Name="brState"
+                            Padding="2"
+                            BorderBrush="White"
+                            BorderThickness="0">
+                            <TextBlock
+                                x:Name="txState"
+                                Margin="1"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Text="{Binding RecipeStatus, Converter={StaticResource RunStatusConvert}}" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsEnabled" Value="True">
+                                <Setter TargetName="brState" Property="BorderThickness" Value="0" />
+                                <Setter TargetName="brState" Property="CornerRadius" Value="5" />
+                                <Setter TargetName="brState" Property="Background" Value="#F0FFFF" />
+                                <Setter TargetName="txState" Property="Foreground" Value="#CD5555" />
+                            </Trigger>
+                            <DataTrigger Binding="{Binding RecipeStatus}" Value="3">
+                                <Setter TargetName="brState" Property="Background" Value="#F0FFFF" />
+                                <Setter TargetName="txState" Property="Foreground" Value="#3CB371" />
+                            </DataTrigger>
+                            <DataTrigger Binding="{Binding RecipeStatus}" Value="2">
+                                <Setter TargetName="txState" Property="Foreground" Value="Aqua" />
+                            </DataTrigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsMouseOver" Value="True" />
+                                    <Condition Property="IsEnabled" Value="True" />
+                                </MultiTrigger.Conditions>
+                                <Setter TargetName="txState" Property="FontSize" Value="17 " />
+                            </MultiTrigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+
+                </Setter.Value>
+            </Setter>
+            <Style.Triggers />
+
+        </Style>
+
+        <DataTemplate x:Key="TreeItemTemplate" DataType="TreeViewItem">
+            <Grid Height="28" Margin="50,0,0,0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <TextBlock
+                    Margin="10,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Foreground="#aa2AB2E7"
+                    Text="原料:" />
+                <TextBlock
+                    Grid.Column="1"
+                    Margin="10,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Foreground="#aa2AB2E7"
+                    Text="{Binding RawMaterialName}" />
+            </Grid>
+        </DataTemplate>
+
+        <Style x:Key="recipeTreeItem" TargetType="TreeViewItem">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="IsExpanded" Value="True" />
+            <Setter Property="HeaderTemplate">
+                <Setter.Value>
+                    <HierarchicalDataTemplate ItemTemplate="{StaticResource TreeItemTemplate}" ItemsSource="{Binding RawMaterials, Mode=TwoWay}">
+                        <StackPanel
+                            Height="28"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Orientation="Horizontal">
+                            <TextBlock
+                                Margin="5,0,0,0"
+                                VerticalAlignment="Center"
+                                FontSize="15"
+                                Foreground="#FF2AB2E7"
+                                Text="配方：" />
+                            <TextBlock
+                                Margin="5,0,0,0"
+                                VerticalAlignment="Center"
+                                FontSize="15"
+                                Foreground="#FF2AB2E7"
+                                Text="{Binding RecipeName}" />
+                        </StackPanel>
+                    </HierarchicalDataTemplate>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type TreeViewItem}">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <Border
+                                x:Name="Bd"
+                                Grid.Column="0"
+                                Padding="{TemplateBinding Padding}"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}">
+                                <ContentPresenter
+                                    x:Name="PART_Header"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    ContentSource="Header" />
+                            </Border>
+                            <ItemsPresenter
+                                x:Name="ItemsHost"
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="2"
+                                Visibility="Collapsed" />
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="SelectionStates">
+                                    <VisualState x:Name="Selected">
+                                        <Storyboard>
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
+                                                <EasingColorKeyFrame KeyTime="0" Value="Transparent" />
+                                            </ColorAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
+
+                                    <VisualState x:Name="Unselected" />
+                                    <VisualState x:Name="SelectedInactive">
+                                        <Storyboard>
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
+                                                <EasingColorKeyFrame KeyTime="0" Value="Transparent" />
+                                            </ColorAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
+                                </VisualStateGroup>
+                                <VisualStateGroup x:Name="ExpansionStates">
+                                    <VisualState x:Name="Expanded">
+                                        <Storyboard>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="Collapsed" />
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="HasHeader" Value="false" />
+                                    <Condition Property="Width" Value="Auto" />
+                                </MultiTrigger.Conditions>
+                                <Setter TargetName="PART_Header" Property="MinWidth" Value="75" />
+                            </MultiTrigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="HasHeader" Value="false" />
+                                    <Condition Property="Height" Value="Auto" />
+                                </MultiTrigger.Conditions>
+                                <Setter TargetName="PART_Header" Property="MinHeight" Value="19" />
+                            </MultiTrigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+    </UserControl.Resources>
+
+    <Grid Margin="20">
+
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="0.25*" />
+        </Grid.ColumnDefinitions>
+
+        <Grid Name="ggr" Margin="10">
+
+            <pry:ImageBorder Width="{Binding ElementName=ggr, Path=ActualWidth}" Height="{Binding ElementName=ggr, Path=ActualHeight}" />
+
+            <ListBox
+                Margin="5"
+                VerticalAlignment="Top"
+                Background="Transparent"
+                BorderThickness="0"
+                ItemsSource="{Binding Recipes}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                <ListBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <UniformGrid
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Columns="6" />
+                    </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
+
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+
+                        <Grid
+                            Name="tt"
+                            Height="220"
+                            Margin="5">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="30" />
+                                <RowDefinition Height="20" />
+                                <RowDefinition Height="128" />
+                                <RowDefinition Height="2" />
+                                <RowDefinition Height="40" />
+                            </Grid.RowDefinitions>
+
+                            <Image
+                                Grid.RowSpan="5"
+                                Source="/BPASmartClient.CustomResource;component/Image/配方背景/竖背景框.png"
+                                Stretch="Fill" />
+
+                            <TextBlock
+                                Grid.Row="0"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontSize="18"
+                                Foreground="#FF2AB2E7"
+                                Text="{Binding RecipeName}" />
+
+                            <TextBlock
+                                Grid.Row="1"
+                                Margin="5,0,0,0"
+                                VerticalAlignment="Top"
+                                Foreground="#FF2AB2E7"
+                                Text="配方信息：" />
+
+                            <ScrollViewer
+                                Grid.Row="2"
+                                VerticalAlignment="Top"
+                                Background="Transparent"
+                                HorizontalScrollBarVisibility="Hidden"
+                                VerticalScrollBarVisibility="Hidden">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="auto" />
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+
+                                    <ItemsControl ItemsSource="{Binding RawMaterials}">
+                                        <ItemsControl.ItemTemplate>
+                                            <DataTemplate>
+                                                <Grid>
+                                                    <TextBlock
+                                                        Grid.Row="1"
+                                                        Margin="5,0,0,0"
+                                                        HorizontalAlignment="Right"
+                                                        VerticalAlignment="Center"
+                                                        Foreground="#aa2AB2E7"
+                                                        Text="{Binding RawMaterialName}" />
+                                                </Grid>
+                                            </DataTemplate>
+                                        </ItemsControl.ItemTemplate>
+                                    </ItemsControl>
+
+                                    <ItemsControl Grid.Column="1" ItemsSource="{Binding RawMaterials}">
+                                        <ItemsControl.ItemTemplate>
+                                            <DataTemplate>
+                                                <StackPanel Orientation="Horizontal">
+
+                                                    <TextBlock
+                                                        Margin="5,0,0,0"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        Foreground="#aa2AB2E7"
+                                                        Text=":" />
+
+                                                    <TextBlock
+                                                        Margin="5,0,0,0"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        Foreground="#aa2AB2E7"
+                                                        Text="{Binding RawMaterialWeight}" />
+
+                                                    <TextBlock
+                                                        Margin="5,0,0,0"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        Foreground="#aa2AB2E7"
+                                                        Text="g" />
+
+                                                </StackPanel>
+                                            </DataTemplate>
+                                        </ItemsControl.ItemTemplate>
+                                    </ItemsControl>
+
+                                </Grid>
+
+                            </ScrollViewer>
+
+                            <!--<Grid
+                            Grid.Row="3"
+                            Height="2"
+                            VerticalAlignment="Bottom">
+                            <Grid.Background>
+                                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/直线.png" Stretch="Fill" />
+                            </Grid.Background>
+                        </Grid>-->
+
+                            <Image
+                                Grid.Row="3"
+                                Width="{Binding ElementName=tt, Path=ActualWidth}"
+                                Height="2"
+                                VerticalAlignment="Bottom"
+                                Source="/BPASmartClient.CustomResource;component/Image/直线.png"
+                                Stretch="Fill" />
+
+                            <Grid
+                                Name="gr"
+                                Grid.Row="4"
+                                Height="30"
+                                Margin="0,0,0,10"
+                                VerticalAlignment="Bottom"
+                                Background="Transparent">
+                                <!--<Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>-->
+
+                                <!--<Image
+                                Height="2"
+                                Grid.ColumnSpan="2"
+                                Width="{Binding ElementName=gr, Path=ActualWidth}"
+                                VerticalAlignment="Top"
+                                Source="/BPASmartClient.CustomResource;component/Image/直线.png" />-->
+
+                                <pry:IcoButton
+                                    Width="{Binding ElementName=gr, Path=ActualWidth}"
+                                    Height="{Binding ElementName=gr, Path=ActualHeight}"
+                                    Margin="4,4,4,0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Background="#222bd06f"
+                                    BorderThickness="0"
+                                    Command="{Binding DataContext.StartCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
+                                    CommandParameter="{Binding RecipeName}"
+                                    Content="配方下发"
+                                    EnterBackground="#332bd06f"
+                                    FontStyle="Normal"
+                                    Foreground="#ff2bd06f"
+                                    IcoText="&#xe6cf;"
+                                    IsEnabled="{Binding IsEnable}"
+                                    Style="{StaticResource IcoButtonStyle}" />
+
+                                <!--<pry:IcoButton
+                                    Width="{Binding ElementName=gr, Path=ActualWidth}"
+                                    Height="{Binding ElementName=gr, Path=ActualHeight}"
+                                    Margin="4,4,3,0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Background="#11F53F62"
+                                    BorderThickness="0"
+                                    Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
+                                    CommandParameter="{Binding RecipCode}"
+                                    Content="删除"
+                                    EnterBackground="#22F53F62"
+                                    FontStyle="Normal"
+                                    Foreground="#FFF53F62"
+                                    IcoText="&#xe68e;"
+                                    Style="{StaticResource IcoButtonStyle}" />
+
+                                <pry:IcoButton
+                                    Grid.Column="1"
+                                    Width="{Binding ElementName=gr, Path=ActualWidth}"
+                                    Height="{Binding ElementName=gr, Path=ActualHeight}"
+                                    Margin="3,4,4,0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Background="#112AB2E7"
+                                    BorderThickness="0"
+                                    Command="{Binding DataContext.DetailsCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
+                                    CommandParameter="{Binding RecipCode}"
+                                    Content="编辑"
+                                    EnterBackground="#222AB2E7"
+                                    Foreground="#FF2AB2E7"
+                                    IcoText="&#xe636;"
+                                    Style="{StaticResource IcoButtonStyle}" />-->
+
+                            </Grid>
+                            <!--</StackPanel>-->
+                        </Grid>
+
+                        <!--<Grid Name="tt" Margin="5">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="auto" />
+                                <RowDefinition Height="auto" />
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+
+                            <Image
+                                Grid.RowSpan="4"
+                                Source="/BPASmartClient.CustomResource;component/Image/配方背景/竖背景框.png"
+                                Stretch="Fill" />
+
+                            <TextBlock
+                                Grid.Row="0"
+                                Margin="2,5,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontSize="18"
+                                Foreground="#FF2AB2E7"
+                                Text="{Binding RecipeName}" />
+
+
+                            <TextBlock
+                                Grid.Row="1"
+                                Margin="5,0,0,5"
+                                Foreground="#ffc000"
+                                Text="配方信息：" />
+
+                            <ScrollViewer
+                                Grid.Row="2"
+                                HorizontalScrollBarVisibility="Hidden"
+                                VerticalScrollBarVisibility="Hidden">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="auto" />
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+
+                                    <ItemsControl ItemsSource="{Binding RawMaterials}">
+                                        <ItemsControl.ItemTemplate>
+                                            <DataTemplate>
+                                                <Grid>
+                                                    <TextBlock
+                                                        Grid.Row="1"
+                                                        Margin="5,0,0,0"
+                                                        HorizontalAlignment="Right"
+                                                        VerticalAlignment="Center"
+                                                        Foreground="#aaffc000"
+                                                        Text="{Binding RawMaterialName}" />
+                                                </Grid>
+                                            </DataTemplate>
+                                        </ItemsControl.ItemTemplate>
+                                    </ItemsControl>
+
+                                    <ItemsControl Grid.Column="1" ItemsSource="{Binding RawMaterials}">
+                                        <ItemsControl.ItemTemplate>
+                                            <DataTemplate>
+                                                <StackPanel Orientation="Horizontal">
+
+                                                    <TextBlock
+                                                        Margin="5,0,0,0"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        Foreground="#aaffc000"
+                                                        Text=":" />
+
+                                                    <TextBlock
+                                                        Margin="5,0,0,0"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        Foreground="#aaffc000"
+                                                        Text="{Binding RawMaterialWeight}" />
+
+                                                    <TextBlock
+                                                        Margin="5,0,0,0"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        Foreground="#aaffc000"
+                                                        Text="g" />
+
+                                                </StackPanel>
+                                            </DataTemplate>
+                                        </ItemsControl.ItemTemplate>
+                                    </ItemsControl>
+
+                                </Grid>
+
+                            </ScrollViewer>
+
+
+
+                            <Grid
+                                Name="grb"
+                                Grid.Row="3"
+                                Height="30"
+                                Margin="0,0,0,10"
+                                VerticalAlignment="Bottom"
+                                Background="Transparent">
+
+                                <Image
+                                    Width="{Binding ElementName=grb, Path=ActualWidth}"
+                                    VerticalAlignment="Top"
+                                    StretchDirection="Both"
+                                    Source="/BPASmartClient.CustomResource;component/Image/直线.png" />
+
+                                <pry:IcoButton
+                                    Width="{Binding ElementName=grb, Path=ActualWidth}"
+                                    Height="{Binding ElementName=grb, Path=ActualHeight}"
+                                    Margin="4,4,4,0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Background="#222bd06f"
+                                    BorderThickness="0"
+                                    Command="{Binding DataContext.StartCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
+                                    CommandParameter="{Binding RecipeName}"
+                                    Content="配方下发"
+                                    EnterBackground="#332bd06f"
+                                    FontStyle="Normal"
+                                    Foreground="#ff2bd06f"
+                                    IcoText="&#xe6cf;"
+                                    IsEnabled="{Binding IsEnable}"
+                                    Style="{StaticResource IcoButtonStyle}" />
+
+
+                            </Grid>
+
+                        </Grid>-->
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+
+        </Grid>
+
+        <Grid
+            Name="gr"
+            Grid.Column="1"
+            Margin="10">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="50" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <pry:ImageBorder
+                Grid.RowSpan="2"
+                Width="{Binding ElementName=gr, Path=ActualWidth}"
+                Height="{Binding ElementName=gr, Path=ActualHeight}" />
+
+            <Grid Margin="5">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <RadioButton
+                    Click="RadioButtonWait_Click"
+                    Command="{Binding ChangeRecipeStateCommand}"
+                    Content="等待中"
+                    GroupName="state"
+                    IsChecked="True"
+                    Style="{DynamicResource RadioState}" />
+                <RadioButton
+                    Grid.Column="1"
+                    Click="RadioButtonMaking_Click"
+                    Content="执行中"
+                    GroupName="state"
+                    Style="{DynamicResource RadioState}" />
+                <RadioButton
+                    Grid.Column="2"
+                    Click="RadioButtonCompelete_Click"
+                    Content="已完成"
+                    GroupName="state"
+                    Style="{DynamicResource RadioState}" />
+
+            </Grid>
+
+
+            <ScrollViewer
+                Grid.Row="1"
+                HorizontalScrollBarVisibility="Hidden"
+                VerticalScrollBarVisibility="Hidden">
+                <Border>
+                    <Grid Grid.Row="1">
+                        <Grid x:Name="repiceListMaking" Margin="5">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="30" />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <TextBlock
+                                Margin="10,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                FontSize="18"
+                                Foreground="#FF2AB2E7"
+                                Text="{Binding CurrentRecipeName}" />
+                            <ItemsControl
+                                Grid.Row="1"
+                                Margin="50,0"
+                                ItemsSource="{Binding recipeProcesses}">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid Margin="5">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition />
+                                                <ColumnDefinition Width="16" />
+                                                <ColumnDefinition />
+                                            </Grid.ColumnDefinitions>
+                                            <TextBlock
+                                                Margin="10,0,5,0"
+                                                HorizontalAlignment="Left"
+                                                VerticalAlignment="Center"
+                                                FontSize="15"
+                                                Foreground="#AA2AB2E7"
+                                                Text="{Binding RawMaterialName}"
+                                                ToolTip="{Binding RawMaterialSource, Converter={StaticResource IntToSourceConvert}}" />
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                Margin="0,0,5,0"
+                                                HorizontalAlignment="Left"
+                                                VerticalAlignment="Center"
+                                                FontSize="15"
+                                                Foreground="#AA2AB2E7"
+                                                Text=":" />
+                                            <Button
+                                                Grid.Column="2"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Command="{Binding DataContext.ChangeRecipeStateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                                CommandParameter="{Binding RawMaterialId}"
+                                                Content="{Binding RecipeStatus, Converter={StaticResource RunStatusConvert}}"
+                                                IsEnabled="{Binding RawMaterialSource, Converter={StaticResource EnbleConvert}}"
+                                                Style="{StaticResource materialMakingButton}" />
+                                        </Grid>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+
+                            </ItemsControl>
+
+                        </Grid>
+                        <!--<TreeView x:Name="repiceListMaking"   ItemsSource="{Binding RecipeProcesse}"
+                                  ScrollViewer.VerticalScrollBarVisibility="Disabled" HorizontalAlignment="Stretch" Background="Wheat"  ItemContainerStyle="{StaticResource recipeTreeItem}">
+                        </TreeView>-->
+
+                        <!--  等待和已完成  -->
+
+                        <TreeView
+                            x:Name="repiceList"
+                            HorizontalAlignment="Stretch"
+                            Background="Transparent"
+                            BorderThickness="0"
+                            ItemContainerStyle="{StaticResource recipeTreeItem}"
+                            ItemsSource="{Binding UserTreeWait}"
+                            ScrollViewer.VerticalScrollBarVisibility="Visible" />
+
+
+
+
+                    </Grid>
+                </Border>
+            </ScrollViewer>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/RecipeControlView.xaml.cs b/BPASmartClient.FoodStationTest/View/RecipeControlView.xaml.cs
new file mode 100644
index 00000000..c25811b8
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/RecipeControlView.xaml.cs
@@ -0,0 +1,44 @@
+using BPASmartClient.FoodStationTest.ViewModel;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// RecipeControlView.xaml 的交互逻辑
+    /// </summary>
+    public partial class RecipeControlView : UserControl
+    {
+        public RecipeControlView()
+        {
+            InitializeComponent();
+            RadioButtonWait_Click(null, null);
+        }
+
+
+
+
+        private void RadioButtonCompelete_Click(object sender, RoutedEventArgs e)
+        {
+            repiceList.ItemsSource = RecipeControlViewModel.UserTreeCompelete;
+            repiceList.Visibility = Visibility.Visible;
+            repiceListMaking.Visibility = Visibility.Hidden;
+
+
+        }
+
+        private void RadioButtonWait_Click(object sender, RoutedEventArgs e)
+        {
+            repiceList.ItemsSource = RecipeControlViewModel.UserTreeWait;
+            repiceList.Visibility = Visibility.Visible;
+            repiceListMaking.Visibility = Visibility.Hidden;
+        }
+
+        private void RadioButtonMaking_Click(object sender, RoutedEventArgs e)
+        {
+            repiceListMaking.Visibility = Visibility.Visible;
+            repiceList.Visibility = Visibility.Hidden;
+
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/RecipeInfosView.xaml b/BPASmartClient.FoodStationTest/View/RecipeInfosView.xaml
new file mode 100644
index 00000000..c8606936
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/RecipeInfosView.xaml
@@ -0,0 +1,248 @@
+<Window
+    x:Class="BPASmartClient.FoodStationTest.View.RecipeInfosView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    Title="RecipeInfosView"
+    Width="550"
+    Height="450"
+    AllowsTransparency="True"
+    Background="{x:Null}"
+    Topmost="True"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
+
+    <Window.DataContext>
+        <vm:RecipeInfosViewModel />
+    </Window.DataContext>
+
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+
+                <ResourceDictionary>
+                    <!--#region ListBox样式-->
+                    <!--<Style x:Key="ListBoxItemStyle1" TargetType="{x:Type ListBoxItem}">
+                        <Setter Property="OverridesDefaultStyle" Value="True" />
+                        <Setter Property="SnapsToDevicePixels" Value="True" />
+                        <Setter Property="BorderBrush" Value="{x:Null}" />
+                        <Setter Property="Foreground" Value="White" />
+                        <Setter Property="FontSize" Value="20" />
+                        <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                                    <Border x:Name="border" CornerRadius="8">
+                                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                    </Border>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>-->
+                    <!--#endregion-->
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
+
+    <Border
+        Name="br"
+        BorderBrush="#0CADF5"
+        BorderThickness="1">
+        <Border.Background>
+            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" />
+        </Border.Background>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid Grid.Row="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="80" />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <WrapPanel>
+                        <TextBlock
+                            Margin="10,10"
+                            Background="Transparent"
+                            FontSize="16"
+                            Foreground="#FF2AB2E7"
+                            Text="配方名称：" />
+                        <TextBlock
+                            Margin="10,10"
+                            Background="Transparent"
+                            FontSize="16"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding RecipeName}" />
+                    </WrapPanel>
+                    <WrapPanel Grid.Column="1">
+                        <TextBlock
+                            Margin="10,10"
+                            Background="Transparent"
+                            FontSize="16"
+                            Foreground="#FF2AB2E7"
+                            Text="配方编号：" />
+                        <TextBlock
+                            Margin="10,10"
+                            Background="Transparent"
+                            FontSize="16"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding RecipeCode}" />
+                    </WrapPanel>
+
+                    <WrapPanel Grid.Row="1">
+                        <TextBlock
+                            Margin="10,0,0,0"
+                            Background="Transparent"
+                            FontSize="16"
+                            Foreground="#FF2AB2E7"
+                            Text="托盘编号：" />
+                        <TextBlock
+                            Grid.Row="1"
+                            Margin="10,10"
+                            Background="Transparent"
+                            FontSize="16"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding TrayCode}" />
+
+                    </WrapPanel>
+                    <Button
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Width="100"
+                        Margin="10,0,0,0"
+                        HorizontalAlignment="Left"
+                        Command="{Binding ReturnPage}">
+                        返回
+                    </Button>
+                </Grid>
+
+                <Grid Grid.Row="3">
+                    <Grid Grid.Column="1">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="20" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Grid Grid.Row="0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="2*" />
+                                <ColumnDefinition Width="2*" />
+                                <ColumnDefinition Width="2*" />
+                                <ColumnDefinition Width="2*" />
+                                <ColumnDefinition Width="2*" />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Grid.Column="0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontSize="16">
+                                原料名称
+                            </TextBlock>
+                            <TextBlock
+                                Grid.Column="1"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontSize="16">
+                                原料位置
+                            </TextBlock>
+                            <TextBlock
+                                Grid.Column="2"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontSize="16">
+                                原料桶号
+                            </TextBlock>
+                            <TextBlock
+                                Grid.Column="3"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontSize="16">
+                                原料重量
+                            </TextBlock>
+                            <TextBlock
+                                Grid.Column="4"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontSize="16">
+                                原料类型
+                            </TextBlock>
+                        </Grid>
+                        <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Hidden">
+                            <ItemsControl Width="548" ItemsSource="{Binding RawMaterialsInfo}">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid x:Name="grb" Height="25">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="2*" />
+                                                <ColumnDefinition Width="2*" />
+                                                <ColumnDefinition Width="2*" />
+                                                <ColumnDefinition Width="2*" />
+                                                <ColumnDefinition Width="2*" />
+                                            </Grid.ColumnDefinitions>
+                                            <TextBlock
+                                                Grid.Column="0"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Top"
+                                                FontSize="16"
+                                                Foreground="#FF2AB2E7"
+                                                Text="{Binding RawMaterialName}" />
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Top"
+                                                FontSize="16"
+                                                Foreground="#FF2AB2E7"
+                                                Text="{Binding RawMaterialLocation}" />
+                                            <TextBlock
+                                                Grid.Column="2"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Top"
+                                                FontSize="16"
+                                                Foreground="#FF2AB2E7"
+                                                Text="{Binding RawMaterialBarrelNum}" />
+                                            <TextBlock
+                                                Grid.Column="3"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Top"
+                                                FontSize="16"
+                                                Foreground="#FF2AB2E7"
+                                                Text="{Binding RawMaterialWeight}" />
+                                            <TextBlock
+                                                Grid.Column="4"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Top"
+                                                FontSize="16"
+                                                Foreground="#FF2AB2E7"
+                                                Text="{Binding RawMaterialType}" />
+                                        </Grid>
+                                        <DataTemplate.Triggers>
+                                            <Trigger Property="IsMouseOver" Value="true">
+                                                <Setter TargetName="grb" Property="Background" Value="#112AB2E7" />
+                                            </Trigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </ScrollViewer>
+                    </Grid>
+                </Grid>
+            </Grid>
+        </Grid>
+    </Border>
+</Window>
diff --git a/BPASmartClient.FoodStationTest/View/RecipeInfosView.xaml.cs b/BPASmartClient.FoodStationTest/View/RecipeInfosView.xaml.cs
new file mode 100644
index 00000000..f6f50fcc
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/RecipeInfosView.xaml.cs
@@ -0,0 +1,21 @@
+using BPASmartClient.Helper;
+using System;
+using System.Windows;
+using System.Windows.Input;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// NewRecipeView.xaml 的交互逻辑
+    /// </summary>
+    public partial class RecipeInfosView : Window
+    {
+        public RecipeInfosView()
+        {
+            InitializeComponent();
+            this.br.MouseLeftButtonDown += (o, e) => { if (e.LeftButton == MouseButtonState.Pressed) this.DragMove(); };
+            ActionManage.GetInstance.CancelRegister("CloseRecipeInfosView");
+            ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "CloseRecipeInfosView");
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml b/BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml
new file mode 100644
index 00000000..a969b2bb
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml
@@ -0,0 +1,228 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.RecipeReceiveView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:control="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="BorderSolid" Color="#5523CACA" />
+        <SolidColorBrush x:Key="FontColor" Color="#FF2AB2E7" />
+        <SolidColorBrush x:Key="TitleFontColor" Color="#ddd" />
+        <SolidColorBrush x:Key="CursorColor" Color="Aqua" />
+        <SolidColorBrush x:Key="TitleBorderColor" Color="#FF2AB2E7" />
+        <SolidColorBrush x:Key="TextBlockForeground" Color="#9934F7F7" />
+
+        <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+            <Setter Property="FontFamily" Value="楷体" />
+            <Setter Property="FontSize" Value="20" />
+            <Setter Property="Background" Value="Transparent" />
+            <!--<Setter Property="Foreground" Value="{StaticResource FontColor}" />-->
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+        </Style>
+
+        <Style x:Key="buttonStyle" TargetType="Button">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="FontSize" Value="16" />
+            <Setter Property="Foreground" Value="Aqua" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="BorderThickness" Value="0" />
+        </Style>
+
+    </UserControl.Resources>
+
+    <UserControl.DataContext>
+        <vm:RecipeReceiveViewModel />
+    </UserControl.DataContext>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50" />
+            <RowDefinition Height="40" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+            <CheckBox
+                x:Name="NotUseSmallDosing"
+                Margin="0,0,10,0"
+                VerticalAlignment="Center"
+                VerticalContentAlignment="Center"
+                Content="不使用小料站配料"
+                FontFamily="楷体"
+                FontSize="20"
+                Foreground="Aqua"
+                IsChecked="{Binding NotUseSmallDosing}" />
+            <CheckBox
+                x:Name="IsUseWindSend"
+                Margin="0,0,10,0"
+                VerticalAlignment="Center"
+                VerticalContentAlignment="Center"
+                Content="使用粉料仓配料"
+                FontFamily="楷体"
+                FontSize="20"
+                Foreground="Aqua"
+                IsChecked="{Binding IsUseWindSendDosing}" />
+            <CheckBox
+                x:Name="IsUseStockBin"
+                VerticalAlignment="Center"
+                VerticalContentAlignment="Center"
+                Content="本地小料仓配方配料"
+                FontFamily="楷体"
+                FontSize="20"
+                Foreground="Aqua"
+                IsChecked="{Binding IsUseLocalRecipe}" />
+            <pry:IcoButton
+                Width="140"
+                Margin="10"
+                HorizontalAlignment="Right"
+                Command="{Binding NewRecipe}"
+                Content="自定义配方"
+                FontSize="16"
+                Foreground="Aqua"
+                IcoText="&#xe626;"
+                Style="{StaticResource IcoButtonStyle}" />
+            <pry:IcoButton
+                Width="140"
+                Margin="10"
+                HorizontalAlignment="Right"
+                Command="{Binding NewSimulateRecipe}"
+                Content="新建模拟配方"
+                FontSize="16"
+                Foreground="Aqua"
+                IcoText="&#xe626;"
+                Style="{StaticResource IcoButtonStyle}" />
+
+            <pry:IcoButton
+                Width="140"
+                Margin="10"
+                HorizontalAlignment="Right"
+                Command="{Binding ClearAllRecipe}"
+                Content="清除所有配方"
+                FontSize="16"
+                Foreground="Aqua"
+                IcoText="&#xe635;"
+                IsEnabled="True"
+                Style="{StaticResource IcoButtonStyle}" />
+        </StackPanel>
+        <Button Content="筛选配方" Style="{StaticResource ButtonStyle}" Command="{Binding SelectRecipesCommand}" Grid.Row="1"/>
+        <ScrollViewer Grid.Row="2">
+            <ListView
+                Margin="5"
+                VerticalAlignment="Top"
+                Background="Transparent"
+                BorderThickness="0"
+                ItemsSource="{Binding SelectedRecipes}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <UniformGrid
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Columns="8" />
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <Border Margin="5" Background="LightSkyBlue">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition Height="0.25*" />
+                                    <RowDefinition Height="0.2*" />
+                                </Grid.RowDefinitions>
+                                <Image Source="/BPASmartClient.CustomResource;component/Image/AGV/炒锅.png" />
+                                <WrapPanel Grid.Row="1">
+                                    <TextBlock
+                                        Margin="2,0,0,0"
+                                        Foreground="#dd000000"
+                                        Text="名称:" />
+                                    <TextBlock
+                                        Margin="2,0,0,0"
+                                        Foreground="#dd000000"
+                                        Text="{Binding RecipeName}" />
+                                    <TextBlock
+                                        Margin="5,0,0,0"
+                                        Foreground="#dd000000"
+                                        Text="编号:" />
+                                    <TextBlock
+                                        Margin="2,0,0,0"
+                                        Foreground="#dd000000"
+                                        Text="{Binding RecipeCode}" />
+                                    <TextBlock
+                                        Margin="5,0,0,0"
+                                        Foreground="#dd000000"
+                                        Text="托盘号:" />
+                                    <TextBlock
+                                        Margin="2,0,0,0"
+                                        Foreground="#dd000000"
+                                        Text="{Binding TrayCode}" />
+                                </WrapPanel>
+
+                                <Grid
+                                    Name="gr"
+                                    Grid.Row="2"
+                                    Height="30">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition />
+                                        <ColumnDefinition />
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+
+                                    <pry:IcoButton
+                                        Grid.Column="0"
+                                        Height="{Binding ElementName=gr, Path=ActualHeight}"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        BorderThickness="0"
+                                        Command="{Binding DataContext.DetailsCommand, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding RecipeCode}"
+                                        Content="编辑"
+                                        EnterBackground="#FF2AB2E7"
+                                        Foreground="#dd000000"
+                                        IcoText="&#xe636;"
+                                        Style="{StaticResource IcoButtonStyle}" />
+                                    <pry:IcoButton
+                                        Grid.Column="1"
+                                        Height="{Binding ElementName=gr, Path=ActualHeight}"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        BorderThickness="0"
+                                        Command="{Binding DataContext.IssueRecipe, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding RecipeCode}"
+                                        Content="下发"
+                                        EnterBackground="#FF2AB2E7"
+                                        Foreground="#dd000000"
+                                        IcoText="&#xe636;"
+                                        Style="{StaticResource IcoButtonStyle}" />
+                                    <pry:IcoButton
+                                        Grid.Column="2"
+                                        Height="{Binding ElementName=gr, Path=ActualHeight}"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        BorderThickness="0"
+                                        Command="{Binding DataContext.RemoveRecipe, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding RecipeCode}"
+                                        Content="删除"
+                                        EnterBackground="#FF2AB2E7"
+                                        Foreground="#dd000000"
+                                        IcoText="&#xe636;"
+                                        Style="{StaticResource IcoButtonStyle}" />
+                                </Grid>
+
+                            </Grid>
+                        </Border>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+        </ScrollViewer>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml.cs b/BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml.cs
new file mode 100644
index 00000000..362d36dc
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml.cs
@@ -0,0 +1,20 @@
+using BPASmartClient.FoodStationTest.Model;
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// RecipeSettingsView.xaml 的交互逻辑
+    /// </summary>
+    public partial class RecipeReceiveView : UserControl
+    {
+        public RecipeReceiveView()
+        {
+            InitializeComponent();
+            this.IsUseWindSend.Click += (o, e) => { GVL_SmallStation.GetInstance.IsUseWindSend = (bool)IsUseWindSend.IsChecked; };
+            this.IsUseStockBin.Click += (o, e) => { GVL_SmallStation.GetInstance.IsUseLocalRecipe = (bool)IsUseStockBin.IsChecked; };
+            this.NotUseSmallDosing.Click += (o, e) => { GVL_SmallStation.GetInstance.NotUseSmallStation = (bool)NotUseSmallDosing.IsChecked; };
+
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/RecipeSettingsView.xaml b/BPASmartClient.FoodStationTest/View/RecipeSettingsView.xaml
new file mode 100644
index 00000000..6b12566c
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/RecipeSettingsView.xaml
@@ -0,0 +1,289 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.RecipeSettingsView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:control="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="BorderSolid" Color="#5523CACA" />
+        <SolidColorBrush x:Key="FontColor" Color="#FF2AB2E7" />
+        <SolidColorBrush x:Key="TitleFontColor" Color="#ddd" />
+        <SolidColorBrush x:Key="CursorColor" Color="Aqua" />
+        <SolidColorBrush x:Key="TitleBorderColor" Color="#FF2AB2E7" />
+        <SolidColorBrush x:Key="TextBlockForeground" Color="#9934F7F7" />
+
+        <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+            <Setter Property="FontFamily" Value="楷体" />
+            <Setter Property="FontSize" Value="20" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+        </Style>
+
+        <Style x:Key="buttonStyle" TargetType="Button">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="FontSize" Value="16" />
+            <Setter Property="Foreground" Value="Aqua" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="BorderThickness" Value="0" />
+        </Style>
+
+        <Style x:Key="ListViewStyle" TargetType="ListView" />
+
+    </UserControl.Resources>
+
+    <UserControl.DataContext>
+        <vm:RecipeSettingsViewModel />
+    </UserControl.DataContext>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50" />
+            <RowDefinition Height="30" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+        <!--#region 操作按钮-->
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+            <pry:IcoButton
+                Grid.Column="3"
+                Width="140"
+                Margin="10"
+                HorizontalAlignment="Left"
+                Command="{Binding NewMaterital}"
+                Content="新建原料"
+                FontSize="16"
+                Foreground="Aqua"
+                IcoText="&#xe626;"
+                Style="{StaticResource IcoButtonStyle}" />
+            <pry:IcoButton
+                Grid.Column="3"
+                Width="140"
+                Margin="10"
+                HorizontalAlignment="Left"
+                Command="{Binding NewRecipe}"
+                Content="新建配方"
+                FontSize="16"
+                Foreground="Aqua"
+                IcoText="&#xe626;"
+                Style="{StaticResource IcoButtonStyle}" />
+
+            <pry:IcoButton
+                Grid.Column="3"
+                Width="140"
+                Margin="10"
+                HorizontalAlignment="Left"
+                Command="{Binding SaveRecipe}"
+                Content="保存配方"
+                FontSize="17"
+                Foreground="Aqua"
+                IcoText="&#xe635;"
+                IsEnabled="True"
+                Style="{StaticResource IcoButtonStyle}" />
+        </StackPanel>
+        <!--#endregion-->
+
+        <ListBox
+            Grid.Row="2"
+            Margin="5"
+            VerticalAlignment="Top"
+            Background="Transparent"
+            BorderThickness="0"
+            ItemsSource="{Binding Recipes}"
+            ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+            <ListBox.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <UniformGrid
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        Columns="8" />
+                </ItemsPanelTemplate>
+            </ListBox.ItemsPanel>
+
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+
+                    <Grid
+                        Name="tt"
+                        Height="220"
+                        Margin="5">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="30" />
+                            <RowDefinition Height="20" />
+                            <RowDefinition Height="128" />
+                            <RowDefinition Height="2" />
+                            <RowDefinition Height="40" />
+                        </Grid.RowDefinitions>
+
+                        <Image
+                            Grid.RowSpan="5"
+                            Source="/BPASmartClient.CustomResource;component/Image/配方背景/竖背景框.png"
+                            Stretch="Fill" />
+
+                        <TextBlock
+                            Grid.Row="0"
+                            Margin="2,5,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Top"
+                            FontSize="18"
+                            Foreground="#FF2AB2E7"
+                            Text="{Binding RecipeName}" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Margin="5,0,0,0"
+                            VerticalAlignment="Top"
+                            Foreground="#FF2AB2E7"
+                            Text="配方信息：" />
+
+                        <ScrollViewer
+                            Grid.Row="2"
+                            VerticalAlignment="Top"
+                            Background="Transparent"
+                            HorizontalScrollBarVisibility="Hidden"
+                            VerticalScrollBarVisibility="Hidden">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="auto" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+
+                                <ItemsControl ItemsSource="{Binding RawMaterials}">
+                                    <ItemsControl.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid>
+                                                <TextBlock
+                                                    Grid.Row="1"
+                                                    Margin="5,0,0,0"
+                                                    HorizontalAlignment="Right"
+                                                    VerticalAlignment="Center"
+                                                    Foreground="#aa2AB2E7"
+                                                    Text="{Binding RawMaterialName}" />
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                </ItemsControl>
+
+                                <ItemsControl Grid.Column="1" ItemsSource="{Binding RawMaterials}">
+                                    <ItemsControl.ItemTemplate>
+                                        <DataTemplate>
+                                            <StackPanel Orientation="Horizontal">
+
+                                                <TextBlock
+                                                    Margin="5,0,0,0"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Foreground="#aa2AB2E7"
+                                                    Text=":" />
+
+                                                <TextBlock
+                                                    Margin="5,0,0,0"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Foreground="#aa2AB2E7"
+                                                    Text="{Binding RawMaterialWeight}" />
+
+                                                <TextBlock
+                                                    Margin="5,0,0,0"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Foreground="#aa2AB2E7"
+                                                    Text="g" />
+
+                                            </StackPanel>
+                                        </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                </ItemsControl>
+
+                            </Grid>
+
+                        </ScrollViewer>
+
+                        <!--<Grid
+                            Grid.Row="3"
+                            Height="2"
+                            VerticalAlignment="Bottom">
+                            <Grid.Background>
+                                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/直线.png" Stretch="Fill" />
+                            </Grid.Background>
+                        </Grid>-->
+
+                        <Image
+                            Grid.Row="3"
+                            Width="{Binding ElementName=tt, Path=ActualWidth}"
+                            Height="2"
+                            VerticalAlignment="Bottom"
+                            Source="/BPASmartClient.CustomResource;component/Image/直线.png"
+                            Stretch="Fill" />
+
+                        <Grid
+                            Name="gr"
+                            Grid.Row="4"
+                            Height="30"
+                            Margin="0,0,0,10"
+                            VerticalAlignment="Bottom"
+                            Background="Transparent">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+
+                            <!--<Image
+                                Height="2"
+                                Grid.ColumnSpan="2"
+                                Width="{Binding ElementName=gr, Path=ActualWidth}"
+                                VerticalAlignment="Top"
+                                Source="/BPASmartClient.CustomResource;component/Image/直线.png" />-->
+
+                            <pry:IcoButton
+                                Width="{Binding ElementName=gr, Path=ActualWidth}"
+                                Height="{Binding ElementName=gr, Path=ActualHeight}"
+                                Margin="4,4,3,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Background="#11F53F62"
+                                BorderThickness="0"
+                                Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
+                                CommandParameter="{Binding RecipCode}"
+                                Content="删除"
+                                EnterBackground="#22F53F62"
+                                FontStyle="Normal"
+                                Foreground="#FFF53F62"
+                                IcoText="&#xe68e;"
+                                Style="{StaticResource IcoButtonStyle}" />
+
+                            <pry:IcoButton
+                                Grid.Column="1"
+                                Width="{Binding ElementName=gr, Path=ActualWidth}"
+                                Height="{Binding ElementName=gr, Path=ActualHeight}"
+                                Margin="3,4,4,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Background="#112AB2E7"
+                                BorderThickness="0"
+                                Command="{Binding DataContext.DetailsCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
+                                CommandParameter="{Binding RecipCode}"
+                                Content="编辑"
+                                EnterBackground="#222AB2E7"
+                                Foreground="#FF2AB2E7"
+                                IcoText="&#xe636;"
+                                Style="{StaticResource IcoButtonStyle}" />
+
+                        </Grid>
+                        <!--</StackPanel>-->
+                    </Grid>
+
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/RecipeSettingsView.xaml.cs b/BPASmartClient.FoodStationTest/View/RecipeSettingsView.xaml.cs
new file mode 100644
index 00000000..67e1727c
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/RecipeSettingsView.xaml.cs
@@ -0,0 +1,34 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// RecipeSettingsView.xaml 的交互逻辑
+    /// </summary>
+    public partial class RecipeSettingsView : UserControl
+    {
+        public RecipeSettingsView()
+        {
+            InitializeComponent();
+            //SetAlignment();
+        }
+
+        //public static void SetAlignment()
+        //{
+        //    //获取系统是以Left-handed（true）还是Right-handed（false）
+        //    var ifLeft = SystemParameters.MenuDropAlignment;
+
+        //    if (ifLeft)
+        //    {
+        //        Console.WriteLine($"系统为左撇子，转换为右撇子。");
+
+        //        // change to false
+        //        var t = typeof(SystemParameters);
+        //        var field = t.GetField("_menuDropAlignment", BindingFlags.NonPublic | BindingFlags.Static);
+        //        field.SetValue(null, false);
+
+        //        ifLeft = SystemParameters.MenuDropAlignment;
+        //    }
+        //}
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/RobotView.xaml b/BPASmartClient.FoodStationTest/View/RobotView.xaml
new file mode 100644
index 00000000..c499d9e1
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/RobotView.xaml
@@ -0,0 +1,308 @@
+<UserControl x:Class="BPASmartClient.FoodStationTest.View.RobotView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920">
+    <UserControl.Resources>
+        <Style x:Key="radioButtonStyle" TargetType="RadioButton">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="RadioButton">
+                        <Grid Name="gr" Opacity="0.8">
+                            <ContentControl
+                                Margin="{TemplateBinding Margin}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Content="{TemplateBinding Content}"
+                                FontSize="{TemplateBinding FontSize}"
+                                Foreground="{TemplateBinding Foreground}" />
+                            <Image
+                                Name="image"
+                                Source="/BPASmartClient.CustomResource;component/Image/边框线.png"
+                                Stretch="Fill" />
+
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="False">
+                                <Setter TargetName="image" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/边框线.png" />
+                            </Trigger>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter TargetName="image" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/透明背景.png" />
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="gr" Property="Opacity" Value="1" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Resources>
+    <UserControl.DataContext>
+        <vm:RobotViewModel/>
+    </UserControl.DataContext>
+
+    <Grid Margin="10">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="4*"/>
+        </Grid.ColumnDefinitions>
+        <!--#region 表格标题栏设置-->
+        <Grid>
+            <StackPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="机器人自动运行模式："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsAutoMode}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人正在自动运行："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsAutoRun}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人停止状态："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsStop}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人运行正常："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsRun}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人运行故障："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsAlarm}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人在Home点："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsHomed}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人运行的程序号："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding IsRunProgramNum}"></TextBlock>
+                </WrapPanel>
+                <!--<WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="抓空桶完成："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotGetEmptyBarrelComplete}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="放空桶完成："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotPutEmptyBarrelComplete}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="抓满桶完成："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotGetFullBarrelComplete}"></TextBlock>
+                </WrapPanel>
+                <WrapPanel>
+                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="放满桶完成："></TextBlock>
+                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotPutFullBarrelComplete}"></TextBlock>
+                </WrapPanel>-->
+            </StackPanel>
+        </Grid>
+        <Grid Grid.Column="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1*"></RowDefinition>
+                <RowDefinition Height="7*"></RowDefinition>
+            </Grid.RowDefinitions>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Button
+                    Margin="20,15"
+                    Command="{Binding SystemStart}"
+                    Content="启动"
+                    FontSize="40"
+                    Background="LightGreen"></Button>
+                <Button
+                    Grid.Column="1"
+                    Margin="20,15"
+                    Command="{Binding SystemStop}"
+                    Content="停止"
+                    FontSize="40"
+                    Background="OrangeRed"></Button>
+                <Button
+                    Grid.Column="2"
+                    Grid.ColumnSpan="2"
+                    Margin="20,15"
+                    Command="{Binding EStopReset}"
+                    Content="急停复位"
+                    FontSize="40"
+                    Background="DodgerBlue"></Button>
+            </Grid>
+        </Grid>
+        <!--<Grid Grid.Column="2">
+            <Grid.RowDefinitions>
+                <RowDefinition></RowDefinition>
+                <RowDefinition></RowDefinition>
+                <RowDefinition></RowDefinition>
+            </Grid.RowDefinitions>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                </Grid.RowDefinitions>
+                <Button
+                    Margin="20,5"
+                    Command="{Binding AutoMode}"
+                    Content="自动模式"
+                    FontSize="32"
+                    Panel.ZIndex="0"
+                    Style="{StaticResource ImageButtonStyle}"></Button>
+                <Button
+                    Grid.Column="1"
+                    Margin="20,5"
+                    Command="{Binding TestMode}"
+                    Content="测试模式"
+                    FontSize="32"
+                    Panel.ZIndex="0"
+                    Style="{StaticResource ImageButtonStyle}"></Button>
+                <Grid Grid.Row="1" Grid.ColumnSpan="2">
+                    <StackPanel Orientation="Vertical">
+                        <WrapPanel Orientation="Horizontal">
+                            <TextBlock  Text="机器人正在运行程序号：" Foreground="#FF2AB2E7" FontSize="25" Margin="10" HorizontalAlignment="Left"></TextBlock>
+                            <TextBlock  Text="{Binding IsRunProgramNum}" Foreground="#FF2AB2E7" FontSize="25" Margin="10" HorizontalAlignment="Left" TextAlignment="Center"></TextBlock>
+                        </WrapPanel>
+                        <WrapPanel Orientation="Horizontal" VerticalAlignment="Center">
+                            <TextBlock   Text="机器人需要运行程序号：" Foreground="#FF2AB2E7" FontSize="25" Margin="10" HorizontalAlignment="Left"></TextBlock>
+                            <TextBox  Text="{Binding SetProgramNum}" Width="50" Foreground="#FF2AB2E7" FontSize="25" Margin="10" HorizontalAlignment="Left" TextAlignment="Center"></TextBox>
+                            <Button  FontSize="20" Height="40" Command="{Binding SetProgramNumCommand}" Content="设置" Style="{StaticResource ImageButtonStyle}"></Button>
+                        </WrapPanel>
+                    </StackPanel>
+                </Grid>
+                <Button
+                    Grid.Row="2"
+                    Margin="20,5"
+                    Command="{Binding TestRobotRun}"
+                    Content="测试抓桶程序"
+                    FontSize="32"
+                    Style="{StaticResource ImageButtonStyle}"></Button>
+            </Grid>
+            --><!--<ListView
+                Grid.Row="1"
+                Background="Transparent"
+                BorderBrush="#00BEFA"
+                BorderThickness="0"
+                ItemsSource="{Binding cylinderModels}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <UniformGrid
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Columns="8" />
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <Grid
+                            Width="200"
+                            Height="100"
+                            Margin="0,0,0,15"
+                            Background="Transparent">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="30" />
+                                <RowDefinition />
+                                <RowDefinition Height="30" />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="0.5*" />
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock
+                                Grid.Column="1"
+                                Grid.ColumnSpan="2"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Foreground="Aqua"
+                                Text="{Binding Name}" />
+
+                            <pry:Cylinder
+                                Grid.Row="1"
+                                Grid.ColumnSpan="3"
+                                Width="200"
+                                Height="50"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                LeftTogIsChecked="{Binding LeftTog}"
+                                RightTogIsChecked="{Binding RightTog}" />
+
+                            <RadioButton
+                                Grid.Row="2"
+                                Grid.Column="1"
+                                Command="{Binding DataContext.Open, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                CommandParameter="{Binding Name}"
+                                Content="伸出"
+                                Foreground="Aqua"
+                                IsChecked="True"
+                                Style="{StaticResource radioButtonStyle}" />
+
+                            <RadioButton
+                                Grid.Row="2"
+                                Grid.Column="2"
+                                Command="{Binding DataContext.Close, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                CommandParameter="{Binding Name}"
+                                Content="缩回"
+                                Foreground="Aqua"
+                                IsChecked="False"
+                                Style="{StaticResource radioButtonStyle}" />
+                        </Grid>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>--><!--
+            <Grid Grid.Row="1" Visibility="Hidden">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                </Grid.RowDefinitions>
+                <Grid Grid.Row="0">
+                    <Button
+                        Margin="20,5"
+                        Command="{Binding RobotGetEmptyBarrel}"
+                        Content="允许机器人抓空桶"
+                        Style="{StaticResource ImageButtonStyle}"></Button>
+                </Grid>
+                <Grid Grid.Column="1">
+                    <Button
+                        Margin="20,5"
+                        Command="{Binding RobotPutEmptyBarrel}"
+                        Content="允许机器人放空桶"
+                        Style="{StaticResource ImageButtonStyle}"></Button>
+                </Grid>
+                <Grid Grid.Row="1">
+                    <Button
+                        Margin="20,5"
+                        Command="{Binding RobotGetFullBarrel}"
+                        Content="允许机器人抓满桶"
+                        Style="{StaticResource ImageButtonStyle}"></Button>
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="1">
+                    <Button
+                        Margin="20,5"
+                        Command="{Binding RobotPutFullBarrel}"
+                        Content="允许机器人放满桶"
+                        Style="{StaticResource ImageButtonStyle}"></Button>
+                </Grid>
+            </Grid>
+        </Grid>-->
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/RobotView.xaml.cs b/BPASmartClient.FoodStationTest/View/RobotView.xaml.cs
new file mode 100644
index 00000000..89f2b7b4
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/RobotView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// HKPlcCommMonitor.xaml 的交互逻辑
+    /// </summary>
+    public partial class RobotView : UserControl
+    {
+        public RobotView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/SelectRecipesView.xaml b/BPASmartClient.FoodStationTest/View/SelectRecipesView.xaml
new file mode 100644
index 00000000..88ee9cf0
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/SelectRecipesView.xaml
@@ -0,0 +1,221 @@
+<Window
+    x:Class="BPASmartClient.FoodStationTest.View.SelectRecipesView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    Title="SelectRecipesView"
+    Width="1000"
+    Height="620"
+    AllowsTransparency="True"
+    Background="{x:Null}"
+    Topmost="True"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
+
+    <Window.DataContext>
+        <vm:SelectRecipesViewModel />
+    </Window.DataContext>
+
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+
+            </ResourceDictionary.MergedDictionaries>
+            <!--修改了勾选的大小-->
+            <Style x:Key="CheckBoxLarge" TargetType="{x:Type CheckBox}">
+                <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+                <Setter Property="VerticalContentAlignment" Value="Center" />
+                <Setter Property="FocusVisualStyle">
+                    <Setter.Value>
+                        <Style>
+                            <Setter Property="Control.Template">
+                                <Setter.Value>
+                                    <ControlTemplate>
+                                        <Rectangle
+                                            Margin="1"
+                                            SnapsToDevicePixels="True"
+                                            Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                            StrokeDashArray="1 2"
+                                            StrokeThickness="1" />
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </Style>
+                    </Setter.Value>
+                </Setter>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type CheckBox}">
+                            <StackPanel
+                                Background="Transparent"
+                                Orientation="Horizontal"
+                                SnapsToDevicePixels="True">
+                                <Grid>
+                                    <Image
+                                        Width="24"
+                                        Height="28"
+                                        Source="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png" />
+                                    <Image
+                                        x:Name="image1"
+                                        Width="24"
+                                        Height="28"
+                                        Source="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png" />
+                                </Grid>
+                                <ContentPresenter
+                                    Margin="{TemplateBinding Padding}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Content="{TemplateBinding Content}"
+                                    ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                    RecognizesAccessKey="True"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            </StackPanel>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="HasContent" Value="True">
+                                    <Setter Property="FocusVisualStyle">
+                                        <Setter.Value>
+                                            <Style>
+                                                <Setter Property="Control.Template">
+                                                    <Setter.Value>
+                                                        <ControlTemplate>
+                                                            <Rectangle
+                                                                Margin="14,0,0,0"
+                                                                SnapsToDevicePixels="True"
+                                                                Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                                                StrokeDashArray="1 2"
+                                                                StrokeThickness="1" />
+                                                        </ControlTemplate>
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </Style>
+                                        </Setter.Value>
+                                    </Setter>
+                                    <Setter Property="Padding" Value="4,0,0,0" />
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                                </Trigger>
+                                <Trigger Property="IsChecked" Value="true">
+                                    <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/Cb_Checked.png" />
+                                </Trigger>
+                                <Trigger Property="IsChecked" Value="{x:Null}">
+                                    <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png" />
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
+        </ResourceDictionary>
+    </Window.Resources>
+    <Border
+        Name="br"
+        BorderBrush="#0CADF5"
+        BorderThickness="2">
+        <Border.Background>
+            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" />
+        </Border.Background>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="40" />
+                <RowDefinition Height="40" />
+                <RowDefinition Height="1*" />
+            </Grid.RowDefinitions>
+            <TextBlock
+                HorizontalAlignment="Center"
+                FontSize="35"
+                Text="配方筛选界面" />
+            <StackPanel
+                Grid.Row="1"
+                Margin="10,0"
+                HorizontalAlignment="Right"
+                Orientation="Horizontal">
+                <Button
+                    Width="100"
+                    Margin="20,0"
+                    Command="{Binding AllSelectCommand}"
+                    Content="全选" />
+                <Button
+                    Width="100"
+                    Margin="20,0"
+                    Command="{Binding AllCancelCommand}"
+                    Content="取消全选" />
+                <Button
+                    Width="100"
+                    Margin="20,0"
+                    Command="{Binding ConfirmCommand}"
+                    Content="确认选择" />
+                <Button
+                    Width="100"
+                    Margin="20,0"
+                    Command="{Binding CancelCommand}"
+                    Content="退出" />
+            </StackPanel>
+            <Border
+                Grid.Row="2"
+                BorderBrush="#FFA2C2E8"
+                BorderThickness="1">
+                <!--  视图显示  -->
+                <ListBox
+                    Margin="5"
+                    Background="Transparent"
+                    ItemsSource="{Binding AllRecipes}"
+                    ScrollViewer.VerticalScrollBarVisibility="Visible">
+                    
+                    <!--<ListBox.GroupStyle>
+                        <GroupStyle>
+                            <GroupStyle.ContainerStyle>
+                                <Style BasedOn="{StaticResource ListBoxGroupStyle}" TargetType="{x:Type GroupItem}" />
+                            </GroupStyle.ContainerStyle>
+                        </GroupStyle>
+                    </ListBox.GroupStyle>-->
+
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Orientation="Vertical">
+                                <StackPanel Orientation="Horizontal">
+                                    <!--<CheckBox Margin="5" Command="{Binding DataContext.CheckCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}" IsChecked="{Binding IsSelected}">
+                                        <CheckBox.CommandParameter>
+                                            <MultiBinding Converter="{StaticResource CheckRecipeConverter}">
+                                                <Binding Path="IsChecked" RelativeSource="{RelativeSource Self}" />
+                                                <Binding Path="RecipeCode" />
+                                            </MultiBinding>
+                                        </CheckBox.CommandParameter>
+                                    </CheckBox>-->
+                                    <CheckBox
+                                        Margin="5"
+                                        IsChecked="{Binding IsSelected, Mode=TwoWay}" Style="{StaticResource CheckBoxLarge}"/>
+
+                                    <TextBlock
+                                        Margin="10"
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding Recipe.RecipeCode, StringFormat=配方编号：{0}}" />
+                                    <TextBlock
+                                        Margin="10,0"
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding Recipe.RecipeName, StringFormat=配方名称：{0}}" />
+                                </StackPanel>
+                                <Line
+                                    Stroke="#FFA2C2E8"
+                                    StrokeThickness="3"
+                                    X1="0"
+                                    X2="1000"
+                                    Y1="0"
+                                    Y2="0" />
+                            </StackPanel>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+            </Border>
+        </Grid>
+    </Border>
+</Window>
diff --git a/BPASmartClient.FoodStationTest/View/SelectRecipesView.xaml.cs b/BPASmartClient.FoodStationTest/View/SelectRecipesView.xaml.cs
new file mode 100644
index 00000000..cf6b0b68
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/SelectRecipesView.xaml.cs
@@ -0,0 +1,21 @@
+using BPASmartClient.Helper;
+using System;
+using System.Windows;
+using System.Windows.Input;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// SelectRecipesView.xaml 的交互逻辑
+    /// </summary>
+    public partial class SelectRecipesView : Window
+    {
+        public SelectRecipesView()
+        {
+            InitializeComponent();
+            this.br.MouseLeftButtonDown += (o, e) => { if (e.LeftButton == MouseButtonState.Pressed) this.DragMove(); };
+            ActionManage.GetInstance.CancelRegister("CloseSelectRecipesView");
+            ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "CloseSelectRecipesView");
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/SiemensRecipeReceiveView.xaml b/BPASmartClient.FoodStationTest/View/SiemensRecipeReceiveView.xaml
new file mode 100644
index 00000000..d435e30a
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/SiemensRecipeReceiveView.xaml
@@ -0,0 +1,150 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.SiemensRecipeReceiveView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:control="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="BorderSolid" Color="#5523CACA" />
+        <SolidColorBrush x:Key="FontColor" Color="#FF2AB2E7" />
+        <SolidColorBrush x:Key="TitleFontColor" Color="#ddd" />
+        <SolidColorBrush x:Key="CursorColor" Color="Aqua" />
+        <SolidColorBrush x:Key="TitleBorderColor" Color="#FF2AB2E7" />
+        <SolidColorBrush x:Key="TextBlockForeground" Color="#9934F7F7" />
+
+        <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+            <Setter Property="FontFamily" Value="楷体" />
+            <Setter Property="FontSize" Value="20" />
+            <Setter Property="Background" Value="Transparent" />
+            <!--<Setter Property="Foreground" Value="{StaticResource FontColor}" />-->
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+        </Style>
+
+        <Style x:Key="buttonStyle" TargetType="Button">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="FontSize" Value="16" />
+            <Setter Property="Foreground" Value="Aqua" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="BorderThickness" Value="0" />
+        </Style>
+
+    </UserControl.Resources>
+
+    <UserControl.DataContext>
+        <vm:SiemensRecipeReceiveViewModel />
+    </UserControl.DataContext>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+            <pry:IcoButton
+                Grid.Column="3"
+                Width="140"
+                Margin="10"
+                HorizontalAlignment="Right"
+                Command="{Binding ClearAllRecipe}"
+                Content="清除所有配方"
+                FontSize="16"
+                Foreground="Aqua"
+                IcoText="&#xe635;"
+                IsEnabled="True"
+                Style="{StaticResource IcoButtonStyle}" />
+        </StackPanel>
+        <ScrollViewer Grid.Row="1">
+            <ListView
+                Margin="5"
+                VerticalAlignment="Top"
+                Background="Transparent"
+                BorderThickness="0"
+                ItemsSource="{Binding Recipes}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <UniformGrid
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Columns="8" />
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <Border Margin="5" Background="LightSkyBlue">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition Height="0.25*" />
+                                    <RowDefinition Height="0.2*" />
+                                </Grid.RowDefinitions>
+                                <Image Source="/BPASmartClient.CustomResource;component/Image/AGV/炒锅.png" />
+                                <WrapPanel Grid.Row="1">
+                                    <TextBlock
+                                        Margin="2,0,0,0"
+                                        Foreground="#dd000000"
+                                        Text="名称:" />
+                                    <TextBlock
+                                        Margin="2,0,0,0"
+                                        Foreground="#dd000000"
+                                        Text="{Binding RecipeName}" />
+                                    <TextBlock
+                                        Margin="5,0,0,0"
+                                        Foreground="#dd000000"
+                                        Text="编号:" />
+                                    <TextBlock
+                                        Margin="2,0,0,0"
+                                        Foreground="#dd000000"
+                                        Text="{Binding RecipeCode}" />
+                                    <TextBlock
+                                        Margin="5,0,0,0"
+                                        Foreground="#dd000000"
+                                        Text="托盘号:" />
+                                    <TextBlock
+                                        Margin="2,0,0,0"
+                                        Foreground="#dd000000"
+                                        Text="{Binding TrayCode}" />
+                                </WrapPanel>
+
+                                <Grid
+                                    Name="gr"
+                                    Grid.Row="2"
+                                    Height="30">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+
+                                    <pry:IcoButton
+                                        Grid.Column="0"
+                                        Width="{Binding ElementName=gr, Path=ActualWidth}"
+                                        Height="{Binding ElementName=gr, Path=ActualHeight}"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        BorderThickness="0"
+                                        Command="{Binding DataContext.DetailsCommand, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding RecipeCode}"
+                                        Content="详情"
+                                        EnterBackground="#FF2AB2E7"
+                                        Foreground="#dd000000"
+                                        IcoText="&#xe636;"
+                                        Style="{StaticResource IcoButtonStyle}" />
+                                </Grid>
+
+                            </Grid>
+                        </Border>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+        </ScrollViewer>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/SiemensRecipeReceiveView.xaml.cs b/BPASmartClient.FoodStationTest/View/SiemensRecipeReceiveView.xaml.cs
new file mode 100644
index 00000000..817c4f81
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/SiemensRecipeReceiveView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// RecipeSettingsView.xaml 的交互逻辑
+    /// </summary>
+    public partial class SiemensRecipeReceiveView : UserControl
+    {
+        public SiemensRecipeReceiveView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/StockBinRawMaterialView.xaml b/BPASmartClient.FoodStationTest/View/StockBinRawMaterialView.xaml
new file mode 100644
index 00000000..43c667b4
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/StockBinRawMaterialView.xaml
@@ -0,0 +1,173 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.StockBinRawMaterialView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
+    <UserControl.DataContext>
+        <vm:StockBinRawMaterialViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.FoodStationTest;component/Resource/MyStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="60" />
+            <RowDefinition Height="50" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <!--#region 表格标题栏设置-->
+        <Grid>
+            <StackPanel
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
+                <Button
+                    Width="150"
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding UpdateRawMaterial}"
+                    Content="新增数据"
+                    FontSize="28"
+                    Foreground="DeepSkyBlue"
+                    Style="{StaticResource ImageButtonStyle}" />
+                <Button
+                    Width="150"
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding SaveRawMaterialPara}"
+                    Content="保存参数"
+                    FontSize="28"
+                    Foreground="DeepSkyBlue"
+                    Style="{StaticResource ImageButtonStyle}" />
+            </StackPanel>
+
+        </Grid>
+        <Grid
+            Grid.Row="1"
+            Margin="0,10,0,0"
+            Background="#ff0C255F">
+
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock
+                Grid.Column="0"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="序号" />
+
+            <TextBlock
+                Grid.Column="1"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="料仓位置" />
+
+            <TextBlock
+                Grid.Column="2"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="原料编号" />
+
+            <TextBlock
+                Grid.Column="3"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="编辑" />
+
+            <Border
+                Grid.Column="0"
+                Grid.ColumnSpan="4"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,1,1,1" />
+            <Border
+                Grid.Column="1"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,0,1,0" />
+            <Border
+                Grid.Column="3"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,0,1,0" />
+
+
+        </Grid>
+        <Grid Grid.Row="2">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                <ItemsControl Foreground="DeepSkyBlue" ItemsSource="{Binding RawMaterialInfo}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid Name="gr">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+
+                                <TextBlock
+                                    Grid.Column="0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    Text="{Binding RawMaterialCount}" />
+
+                                <TextBox
+                                    Grid.Column="1"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding RawMaterialLocation}" />
+
+                                <TextBox
+                                    Grid.Column="2"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding RawMaterialName}" />
+
+                                <Button
+                                    Grid.Column="3"
+                                    Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                    CommandParameter="{Binding RawMaterialLocation}"
+                                    Content="删除"
+                                    FontSize="16"
+                                    Style="{StaticResource ControlButtonStyle}" />
+
+                                <Border
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="4"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,1" />
+                                <Border
+                                    Grid.Column="1"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,0" />
+                                <Border
+                                    Grid.Column="3"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,0" />
+                            </Grid>
+
+                            <DataTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                </Trigger>
+                            </DataTemplate.Triggers>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/StockBinRawMaterialView.xaml.cs b/BPASmartClient.FoodStationTest/View/StockBinRawMaterialView.xaml.cs
new file mode 100644
index 00000000..539fc38f
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/StockBinRawMaterialView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// HKPlcCommMonitor.xaml 的交互逻辑
+    /// </summary>
+    public partial class StockBinRawMaterialView : UserControl
+    {
+        public StockBinRawMaterialView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/SystemParView.xaml b/BPASmartClient.FoodStationTest/View/SystemParView.xaml
new file mode 100644
index 00000000..9cf29ee0
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/SystemParView.xaml
@@ -0,0 +1,308 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.SystemParView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:con="clr-namespace:BPASmartClient.FoodStationTest.Converter"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:SystemParViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="tabColor" Color="#FF2AB2E7" />
+        <!--<SolidColorBrush x:Key="bordColor" Color="#33ffffff" />-->
+        <SolidColorBrush x:Key="bordColor" Color="#332AB2E7" />
+        <con:DataTableRedundantConverter x:Key="tabConvert" />
+
+        <Style x:Key="RowRadioButtonStyle" TargetType="{x:Type RadioButton}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type RadioButton}">
+                        <Border
+                            x:Name="NvaBor"
+                            Background="Transparent"
+                            BorderBrush="#FF2AB2E7"
+                            BorderThickness="0">
+                            <ContentControl
+                                Margin="10,4"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Content="{TemplateBinding Content}"
+                                FontSize="16" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
+                                <Setter TargetName="NvaBor" Property="BorderThickness" Value="0" />
+                            </Trigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsChecked" Value="false" />
+                                    <Condition Property="IsMouseOver" Value="True" />
+                                </MultiTrigger.Conditions>
+                                <MultiTrigger.Setters>
+                                    <Setter TargetName="NvaBor" Property="Background" Value="#22ffffff" />
+                                </MultiTrigger.Setters>
+                            </MultiTrigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="InputTextboxStyle" TargetType="TextBox">
+            <Setter Property="Margin" Value="5,0,0,0" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="Width" Value="150" />
+            <Setter Property="Height" Value="40" />
+            <Setter Property="CaretBrush" Value="{StaticResource TitleBorderColor}" />
+            <Setter Property="Foreground" Value="{StaticResource TitleBorderColor}" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="14" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+
+        <Style x:Key="ControlButtonStyle" TargetType="Button">
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="Foreground" Value="#FFF53F62" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+            <Setter Property="FontFamily" Value="楷体" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border
+                            Name="TitleBarBr"
+                            BorderBrush="#00c2f4"
+                            BorderThickness="0"
+                            CornerRadius="0"
+                            Opacity="0.8">
+
+                            <ContentPresenter
+                                Margin="{TemplateBinding Margin}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                            <Border.Background>
+                                <ImageBrush
+                                    ImageSource="/BPASmartClient.CustomResource;component/Image/组合边框1.1.png"
+                                    Opacity="0.8"
+                                    Stretch="Fill" />
+                            </Border.Background>
+
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="TitleBarBr" Property="Opacity" Value="1" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="TitleTextblockStyle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="16" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Foreground" Value="{StaticResource tabColor}" />
+            <Setter Property="FontFamily" Value="楷体" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+        </Style>
+
+    </UserControl.Resources>
+
+    <Grid>
+
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+
+        <Button
+            Width="140"
+            Height="30"
+            Margin="10,0,10,0"
+            HorizontalAlignment="Left"
+            Command="{Binding SaveCommand}"
+            Content="保存参数"
+            FontSize="24"
+            Style="{StaticResource ImageButtonStyle}" />
+        <Button
+            Grid.Column="1"
+            Width="140"
+            Height="30"
+            Margin="10,0,10,0"
+            HorizontalAlignment="Left"
+            Command="{Binding SetParCommand}"
+            Content="下发参数"
+            FontSize="24"
+            Style="{StaticResource ImageButtonStyle}" />
+        <StackPanel
+            Grid.Row="1"
+            Margin="10,0,10,0"
+            HorizontalAlignment="Left"
+            Orientation="Vertical">
+            <CheckBox
+                Margin="0,10,10,0"
+                VerticalAlignment="Center"
+                Content="西门子设备连接"
+                FontFamily="楷体"
+                FontSize="20"
+                Foreground="Aqua"
+                IsChecked="{Binding SiemensConnect}" />
+            <CheckBox
+                Margin="0,10,10,0"
+                VerticalAlignment="Center"
+                Content="粉料仓设备连接"
+                FontFamily="楷体"
+                FontSize="20"
+                Foreground="Aqua"
+                IsChecked="{Binding WindSendConnect}" />
+            <CheckBox
+                Margin="0,10,10,0"
+                VerticalAlignment="Center"
+                Content="小料站产线PLC设备连接"
+                FontFamily="楷体"
+                FontSize="20"
+                Foreground="Aqua"
+                IsChecked="{Binding HKPlcConnect}" />
+
+
+            <CheckBox
+                Margin="0,10,10,0"
+                VerticalAlignment="Center"
+                Content="屏蔽小料仓数量读取报警"
+                FontFamily="楷体"
+                FontSize="20"
+                Foreground="Aqua"
+                IsChecked="{Binding ShieldStockbinAlarm}" />
+
+        </StackPanel>
+        <Grid
+            Grid.Row="1"
+            Grid.Column="1"
+            VerticalAlignment="Top">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="37*" />
+                <ColumnDefinition Width="163*" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <WrapPanel Grid.ColumnSpan="2" Margin="0,0,0,38">
+                <TextBlock
+                    Margin="10"
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="调速电机速度(进桶侧)" />
+                <TextBox
+                    Width="50"
+                    Margin="10"
+                    FontSize="16"
+                    Text="{Binding AxisLoadSpeed}" />
+                <TextBlock
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="" />
+            </WrapPanel>
+            <WrapPanel
+                Grid.RowSpan="2"
+                Grid.ColumnSpan="2"
+                Margin="0,42,0,75">
+                <TextBlock
+                    Margin="10"
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="调速电机速度(过渡侧)" />
+                <TextBox
+                    Width="50"
+                    Margin="10"
+                    FontSize="16"
+                    Text="{Binding AxisMidSpeed}" />
+                <TextBlock
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="" />
+            </WrapPanel>
+            <WrapPanel
+                Grid.Row="1"
+                Grid.ColumnSpan="2"
+                Margin="0,5,0,33">
+                <TextBlock
+                    Margin="10"
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="调速电机速度(出桶侧)" />
+                <TextBox
+                    Width="50"
+                    Margin="10"
+                    FontSize="16"
+                    Text="{Binding AxisUnLoadSpeed}" />
+                <TextBlock
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="" />
+            </WrapPanel>
+            <WrapPanel
+                Grid.Row="1"
+                Grid.RowSpan="2"
+                Grid.ColumnSpan="2"
+                Margin="0,47,0,71">
+                <TextBlock
+                    Margin="10"
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="伺服1速度(进桶侧)" />
+                <TextBox
+                    Width="50"
+                    Margin="10"
+                    FontSize="16"
+                    Text="{Binding Axis1Speed}" />
+                <TextBlock
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="" />
+            </WrapPanel>
+            <WrapPanel
+                Grid.Row="2"
+                Grid.ColumnSpan="2"
+                Margin="0,9,0,28">
+                <TextBlock
+                    Margin="10"
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="伺服2速度(出桶侧)" />
+                <TextBox
+                    Width="50"
+                    Margin="10"
+                    FontSize="16"
+                    Text="{Binding Axis2Speed}" />
+                <TextBlock
+                    FontSize="16"
+                    Foreground="Aqua"
+                    Text="" />
+            </WrapPanel>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/SystemParView.xaml.cs b/BPASmartClient.FoodStationTest/View/SystemParView.xaml.cs
new file mode 100644
index 00000000..91222782
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/SystemParView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// DeviceMaterialParView.xaml 的交互逻辑
+    /// </summary>
+    public partial class SystemParView : UserControl
+    {
+        public SystemParView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/View/WindSendParView.xaml b/BPASmartClient.FoodStationTest/View/WindSendParView.xaml
new file mode 100644
index 00000000..888c7992
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/WindSendParView.xaml
@@ -0,0 +1,218 @@
+<UserControl
+    x:Class="BPASmartClient.FoodStationTest.View.WindSendParView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:con="clr-namespace:BPASmartClient.FoodStationTest.Converter"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vm:WindSendParViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.FoodStationTest;component/Resource/MyStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="60" />
+            <RowDefinition Height="40" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <!--#region 表格标题栏设置-->
+        <Grid>
+            <StackPanel
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
+                <!--<pry:IcoButton
+                    Margin="10"
+                    Command="{Binding UpdateRawMaterial}"
+                    Content="新增数据"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource IcoButtonStyle}" />-->
+                <Button
+                    Width="150"
+                    Height="50"
+                    Margin="5"
+                    Command="{Binding SaveRawMaterialPara}"
+                    Content="保存参数"
+                    FontSize="28"
+                    Foreground="DeepSkyBlue"
+                    Style="{StaticResource ImageButtonStyle}" />
+                <!--<pry:IcoButton
+                    Margin="10"
+                    Command="{Binding SaveRawMaterialPara}"
+                    Content="保存参数"
+                    FontSize="28"
+                    Foreground="Aqua"
+                    Style="{StaticResource IcoButtonStyle}" />-->
+            </StackPanel>
+
+        </Grid>
+        <Grid
+            Grid.Row="1"
+            Margin="0,10,0,0"
+            Background="#ff0C255F">
+
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock
+                Grid.Column="0"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="序号" />
+
+            <TextBlock
+                Grid.Column="1"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="料仓位置" />
+
+            <TextBlock
+                Grid.Column="2"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="原料编号" />
+
+            <TextBlock
+                Grid.Column="3"
+                FontSize="24"
+                Style="{StaticResource TitleTextblockStyle}"
+                Text="原料名称" />
+
+            <Border
+                Grid.Column="0"
+                Grid.ColumnSpan="4"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,1,1,1" />
+            <Border
+                Grid.Column="1"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,0,1,0" />
+            <Border
+                Grid.Column="3"
+                BorderBrush="{StaticResource bordColor}"
+                BorderThickness="1,0,1,0" />
+        </Grid>
+        <Grid Grid.Row="2">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                <ItemsControl Foreground="DeepSkyBlue" ItemsSource="{Binding WindSendRawMaterial}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid Name="gr">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+
+                                <TextBlock
+                                    Grid.Column="0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    Text="{Binding Location}" />
+
+                                <TextBlock
+                                    Grid.Column="1"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    Text="{Binding Location}" />
+
+                                <TextBox
+                                    Grid.Column="2"
+                                    Style="{StaticResource InputTextboxStyle}"
+                                    Text="{Binding RawMaterialName}" />
+
+                                <TextBlock
+                                    Grid.Column="3"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    Text="{Binding RawMaterialChineseName}" />
+
+                                <Border
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="4"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,1" />
+                                <Border
+                                    Grid.Column="1"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,0" />
+                                <Border
+                                    Grid.Column="3"
+                                    BorderBrush="{StaticResource bordColor}"
+                                    BorderThickness="1,0,1,0" />
+
+                                <!--<Grid Grid.Column="0" Margin="5">
+                                    <TextBlock
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding Location}" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
+
+                                </Grid>
+                                <Grid Grid.Column="1" Margin="5">
+                                    <TextBlock
+                                        Width="50"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding Location}"
+                                        TextAlignment="Center" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
+
+                                </Grid>
+                                <Grid Grid.Column="2" Margin="5">
+                                    <TextBox
+                                        Name="name"
+                                        Width="50"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding RawMaterialName}" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
+                                </Grid>
+                                <Grid Grid.Column="3" Margin="5">
+                                    <TextBlock
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding RawMaterialChineseName}" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
+                                </Grid>-->
+                            </Grid>
+                            <DataTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                </Trigger>
+                            </DataTemplate.Triggers>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/WindSendParView.xaml.cs b/BPASmartClient.FoodStationTest/View/WindSendParView.xaml.cs
new file mode 100644
index 00000000..f6f0e048
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/View/WindSendParView.xaml.cs
@@ -0,0 +1,16 @@
+using System.Windows.Controls;
+
+namespace BPASmartClient.FoodStationTest.View
+{
+    /// <summary>
+    /// DeviceMaterialParView.xaml 的交互逻辑
+    /// </summary>
+    public partial class WindSendParView : UserControl
+    {
+        public WindSendParView()
+        {
+            InitializeComponent();
+
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/BomOfMaterialViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/BomOfMaterialViewModel.cs
new file mode 100644
index 00000000..ce684c33
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/BomOfMaterialViewModel.cs
@@ -0,0 +1,77 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.FoodStationTest.Model.Bom;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class BomOfMaterialViewModel : ObservableObject
+    {
+        public BomOfMaterialViewModel()
+        {
+            RawMaterialInfo = Json<DevicePar>.Data.BomMaterial;
+            AddMaterial = new RelayCommand(() =>
+            {
+                RawMaterialInfo.Add(new BomMaterial()
+                {
+                    Count = Json<DevicePar>.Data.BomMaterial.Count + 1,
+                });
+            });
+            SaveMaterials = new RelayCommand(() =>
+            {
+                if (MessageNotify.GetInstance.ShowDialog("请确认是否保存！") == true)
+                {
+                    Json<DevicePar>.Save();
+                    MessageNotify.GetInstance.ShowUserLog($"西门子物料清单保存成功");
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"原料与料仓对应关系保存成功");
+                }
+            });
+            GetBomMaterialData = new RelayCommand(() =>
+            {
+                Json<DevicePar>.Data.BomMaterial.Clear();
+                ProcessControl.GetInstance.RawMaterialNameWithCode();//原料的名称和编码对应 ：西门子mes定义的物料编码
+                foreach (var item in GVL_SmallStation.GetInstance.RawMaterialsNameCode)
+                {
+                    Json<DevicePar>.Data.BomMaterial.Add(new BomMaterial() { Count = Json<DevicePar>.Data.BomMaterial.Count + 1, MaterialCode = item.Key, MaterialName = item.Value });
+                }
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"读取程序的Bom清单");
+            });
+            DeleteAllMaterial = new RelayCommand(() =>
+            {
+                if (MessageNotify.GetInstance.ShowDialog("请确认是否删除所有原料数据！") == true)
+                {
+                    Json<DevicePar>.Data.BomMaterial.Clear();
+                    MessageNotify.GetInstance.ShowUserLog($"西门子物料清单删除完成");
+                }
+            });
+            RemoveCommand = new RelayCommand<int>((Count) =>
+            {
+                if (Count is int cnt)
+                {
+                    var res = RawMaterialInfo.FirstOrDefault(p => p.Count == cnt);
+                    if (res != null)
+                    {
+                        if (MessageNotify.GetInstance.ShowDialog($"请确认是否删除[{res.MaterialCode}]，[{res.MaterialName}]！") == true)
+                        {
+                            RawMaterialInfo.Remove(res);
+                            NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"删除成功");
+                        }
+                    }
+                }
+            });
+        }
+        public ObservableCollection<BomMaterial> RawMaterialInfo { get; set; } = new ObservableCollection<BomMaterial>();
+        public RelayCommand AddMaterial { get; set; }
+        public RelayCommand SaveMaterials { get; set; }
+        public RelayCommand<int> RemoveCommand { get; set; }
+        public RelayCommand GetBomMaterialData { get; set; }
+        public RelayCommand DeleteAllMaterial { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/ChangeDeviceNameViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/ChangeDeviceNameViewModel.cs
new file mode 100644
index 00000000..7dbb9ad8
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/ChangeDeviceNameViewModel.cs
@@ -0,0 +1,72 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Linq;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class ChangeDeviceNameViewModel : ObservableObject
+    {
+        public ChangeDeviceNameViewModel()
+        {
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is string str)
+                    IpAddress = str;
+            }), "ChangeDeviceNameViewOpen");
+
+            CancleCommand = new RelayCommand(() => { ActionManage.GetInstance.Send("ChangeDeviceNameViewClose"); });
+            ConfirmCommand = new RelayCommand(() =>
+            {
+                if (string.IsNullOrEmpty(DeviceName))
+                {
+                    ErrorInfo = "设备名称不能为空";
+                    return;
+                }
+                int index = Array.FindIndex(DeviceInquire.GetInstance.devices.ToArray(), p => p.IpAddress == IpAddress);
+                if (index >= 0 && index < DeviceInquire.GetInstance.devices.Count)
+                {
+                    if (DeviceInquire.GetInstance.devices.FirstOrDefault(p => p.DeviceName == DeviceName) != null)
+                        ErrorInfo = "设备名称已存在";
+                    else
+                    {
+                        var res = Global.DeviceRawMaterials.FirstOrDefault(p => p.RawMaterialName == DeviceInquire.GetInstance.devices.ElementAt(index).DeviceName);
+                        if (res != null)
+                        {
+                            res.RawMaterialName = DeviceName;
+                            DeviceInquire.GetInstance.devices.ElementAt(index).DeviceName = DeviceName;
+                            DeviceInquire.GetInstance.GetDevice(IpAddress).SetDeviceName(DeviceName);//设置PLC名称
+                            for (int i = 0; i < Json<LocaPar>.Data.Recipes.Count; i++)
+                            {
+                                for (int m = 0; m < Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.Count; m++)
+                                {
+                                    Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).RawMaterialName = DeviceName;
+                                }
+                            }
+                            ActionManage.GetInstance.Send("ChangeDeviceNameViewClose");
+                        }
+                    }
+                }
+
+            });
+        }
+
+        private static string IpAddress = string.Empty;
+
+        public RelayCommand ConfirmCommand { get; set; }
+
+        public RelayCommand CancleCommand { get; set; }
+
+
+        public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
+        private string _mErrorInfo;
+
+
+        public string DeviceName { get { return _mDeviceName; } set { _mDeviceName = value; OnPropertyChanged(); } }
+        private string _mDeviceName;
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/DeviceListViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/DeviceListViewModel.cs
new file mode 100644
index 00000000..3c5078ca
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/DeviceListViewModel.cs
@@ -0,0 +1,68 @@
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.FoodStationTest.View;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class DeviceListViewModel : ObservableObject
+    {
+        public DeviceListViewModel()
+        {
+            ChangeNameCommand = new RelayCommand<object>((o) =>
+            {
+                if (o != null && o is string str)
+                {
+                    ChangeDeviceNameView cdn = new ChangeDeviceNameView();
+                    ActionManage.GetInstance.Send("ChangeDeviceNameViewOpen", str);
+                    cdn.ShowDialog();
+                }
+            });
+
+            Open = new RelayCommand<object>((o) =>
+            {
+                if (o != null && o is string str)
+                {
+                    DeviceInquire.GetInstance.GetDevice(str).OpenLid();//设置PLC名称
+                }
+            });
+
+            Close = new RelayCommand<object>((o) =>
+            {
+                if (o != null && o is string str)
+                {
+                    DeviceInquire.GetInstance.GetDevice(str).CloseLid();//设置PLC名称
+                }
+            });
+
+            devices = DeviceInquire.GetInstance.devices;
+            /*foreach (var device in devices) 
+            {
+                device.Serial = Convert.ToInt32(device.DeviceName.Substring(1, device.DeviceName.Length - 1)) / 10;
+            }
+            devices = new ObservableCollection<Devices>(devices.OrderBy(item => item.Serial));*/
+        }
+
+        public RelayCommand<object> ChangeNameCommand { get; set; }
+        public RelayCommand<object> Open { get; set; }
+        public RelayCommand<object> Close { get; set; }
+
+        //public static ObservableCollection<Devices> devices { get; set; } = new ObservableCollection<Devices>();
+        public ObservableCollection<Devices> devices { get; set; }
+    }
+
+    public class Devices : ObservableObject
+    {
+        public int Serial { get { return _mSerial; } set { _mSerial = value; OnPropertyChanged(); } }
+        private int _mSerial;
+
+        public string IpAddress { get { return _mIpAddress; } set { _mIpAddress = value; OnPropertyChanged(); } }
+        private string _mIpAddress;
+
+        public string DeviceName { get { return _mDeviceName; } set { _mDeviceName = value; OnPropertyChanged(); } }
+        private string _mDeviceName;
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/DeviceMaterialParViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/DeviceMaterialParViewModel.cs
new file mode 100644
index 00000000..7e4b59eb
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/DeviceMaterialParViewModel.cs
@@ -0,0 +1,65 @@
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class DeviceMaterialParViewModel : ObservableObject
+    {
+        public DeviceMaterialParViewModel()
+        {
+            deviceParModels = Json<DevicePar>.Data.deviceParModels;
+            RemoveCommand = new RelayCommand<object>((o) =>
+            {
+                var res = deviceParModels.FirstOrDefault(p => p.MaterialName == o?.ToString());
+                if (res != null)
+                    deviceParModels.Remove(res);
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{o.ToString()}：原料删除成功!");
+            });
+
+            AddCommand = new RelayCommand(() => { deviceParModels.Add(new DeviceParMode()); });
+            SaveCommand = new RelayCommand(() =>
+            {
+                if (deviceParModels == null || deviceParModels.Count <= 0)
+                {
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "警告", $"没有可保存的参数!");
+                    return;
+                }
+
+                for (int i = 0; i < deviceParModels.Count; i++)
+                {
+                    if (deviceParModels.Where(p => p.MaterialName == deviceParModels.ElementAt(i).MaterialName)?.ToList()?.Count >= 2)
+                        deviceParModels.ElementAt(i).IsRedundant = true;
+                    else
+                        deviceParModels.ElementAt(i).IsRedundant = false;
+                }
+
+                if (deviceParModels.FirstOrDefault(p => p.IsRedundant == true) != null)
+                {
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"原料名称冲突，请检查后重试!");
+                    return;
+                }
+
+                deviceParModels.Where(P => P.MaterialName.Length <= 0)?.ToList()?.ForEach(item =>
+                {
+                    Json<DevicePar>.Data.deviceParModels.Remove(item);
+                });
+                Json<DevicePar>.Save();
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"原料参数保存成功!");
+            });
+        }
+
+        public ObservableCollection<DeviceParMode> deviceParModels { get; set; }
+
+        public RelayCommand<object> RemoveCommand { get; set; }
+
+        public RelayCommand AddCommand { get; set; }
+        public RelayCommand SaveCommand { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/HardwareStatusViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/HardwareStatusViewModel.cs
new file mode 100644
index 00000000..149b50a1
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/HardwareStatusViewModel.cs
@@ -0,0 +1,24 @@
+using BPASmartClient.FoodStationTest.Model;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class HardwareStatusViewModel : ObservableObject
+    {
+        public HardwareStatusViewModel()
+        {
+            TopDeviceCurrentStatuses = DeviceInquire.GetInstance.TopDeviceCurrentStatuses;
+
+            BottomDeviceCurrentStatuses = DeviceInquire.GetInstance.BottomDeviceCurrentStatuses;
+
+            /*TopDeviceCurrentStatuses = new ObservableCollection<DeviceCurrentStatus>(TopDeviceCurrentStatuses.OrderByDescending(item => item.DeviceNum));
+
+            BottomDeviceCurrentStatuses = new ObservableCollection<DeviceCurrentStatus>(BottomDeviceCurrentStatuses.OrderBy(item => item.DeviceNum));*/
+        }
+
+        public ObservableCollection<DeviceCurrentStatus> TopDeviceCurrentStatuses { get; set; }
+
+        public ObservableCollection<DeviceCurrentStatus> BottomDeviceCurrentStatuses { get; set; }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/ManualCommViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/ManualCommViewModel.cs
new file mode 100644
index 00000000..da23f01c
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/ManualCommViewModel.cs
@@ -0,0 +1,29 @@
+using BPASmartClient.FoodStationTest.Model;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class ManualCommViewModel : ObservableObject
+    {
+        public ManualCommViewModel()
+        {
+            PlcDataColl.Add(new VarMonitor() { SerialNum = PlcDataColl.Count, Address = "", });
+            SetParCommand = new RelayCommand<object>((o) =>
+            {
+                if (o != null && o is string address)
+                {
+                    var res = PlcDataColl.FirstOrDefault(p => p.Address == address);
+                }
+            });
+        }
+        public static ObservableCollection<VarMonitor> PlcDataColl { get; set; } = new ObservableCollection<VarMonitor>();
+
+        public RelayCommand<object> SetParCommand { get; set; }
+
+        public RelayCommand Connect { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/ManualControlViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/ManualControlViewModel.cs
new file mode 100644
index 00000000..5af1d1e0
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/ManualControlViewModel.cs
@@ -0,0 +1,423 @@
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class ManualControlViewModel : ObservableObject
+    {
+        public ManualControlViewModel()
+        {
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                PlcSystemMode = GVL_SmallStation.GetInstance.PlcSystemMode;
+                //SystemMode = GVL_SmallStation.GetInstance.PlcSystemMode ? "手动" : "自动";
+                //if (GVL_SmallStation.GetInstance.PlcSystemMode) ManualMode = true;
+                //else AutoModeStatus = true;
+                if (GVL_SmallStation.GetInstance.PlcSystemIsAutoRun)
+                {
+                    SystemStatus = GVL_SmallStation.GetInstance.PlcSystemIsPause ? "暂停" : "运行";
+                    //if (GVL_SmallStation.GetInstance.PlcSystemIsPause)
+                    //{
+                    //    SystemStatus = "暂停";
+                    //}
+                    //else
+                    //{
+                    //    SystemStatus = "运行";
+                    //}
+                }
+                else
+                {
+                    SystemStatus = "停止";
+                }
+                for (int i = 0; i < 15; i++)
+                {
+                    if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[i])
+                    {
+                        cylinderModels.ElementAt(i).LeftTog = true;
+                        cylinderModels.ElementAt(i).RightTog = false;
+                    }
+                    else
+                    {
+                        cylinderModels.ElementAt(i).LeftTog = false;
+                        cylinderModels.ElementAt(i).RightTog = true;
+                    }
+                }
+                foreach (var item in PalletCylinders)
+                {
+                    if (item.Name == "进料桶顶升气缸")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[20])
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                        else
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                    }
+                    if (item.Name == "出料桶顶升气缸1")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[21])
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                        else
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                    }
+                    if (item.Name == "出料桶顶升气缸2")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[22])
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                        else
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                    }
+                    if (item.Name == "出料桶顶升气缸3")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[23])
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                        else
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                    }
+                    if (item.Name == "托盘气缸1_1")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[24])
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                        else
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                    }
+                    if (item.Name == "托盘气缸1_2")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[25])
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                        else
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                    }
+                    if (item.Name == "托盘气缸2_1")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[26])
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                        else
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                    }
+                    if (item.Name == "托盘气缸2_2")
+                    {
+                        if (GVL_SmallStation.GetInstance.Cylinder_JackInfo[27])
+                        {
+                            item.LeftTog = false;
+                            item.RightTog = true;
+                        }
+                        else
+                        {
+                            item.LeftTog = true;
+                            item.RightTog = false;
+                        }
+                    }
+                }
+                Thread.Sleep(200);
+            }), "获取系统状态", true);
+            if (cylinderModels.Count < 15)
+            {
+                for (int i = 0; i < 15; i++)
+                {
+                    cylinderModels.Add(new CylinderModel()
+                    {
+                        Name = $"升降气缸 {i + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
+
+                    BlockCylinders.Add(new CylinderModel()
+                    {
+                        Name = $"阻挡气缸 {i + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
+                }
+            }
+            if (PalletCylinders.Count < 8)
+            {
+                for (int i = 1; i < 3; i++)
+                {
+                    PalletCylinders.Add(new CylinderModel()
+                    {
+                        Name = $"托盘气缸1_{(i + 1) % 2 + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
+                }
+                for (int i = 1; i < 3; i++)
+                {
+                    PalletCylinders.Add(new CylinderModel()
+                    {
+                        Name = $"托盘气缸2_{(i + 1) % 2 + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
+                }
+                PalletCylinders.Add(new CylinderModel()
+                {
+                    Name = $"进料桶顶升气缸",
+                    LeftTog = false,
+                    RightTog = false,
+                });
+                for (int i = 0; i < 3; i++)
+                {
+                    PalletCylinders.Add(new CylinderModel()
+                    {
+                        Name = $"出料桶顶升气缸{i + 1}",
+                        LeftTog = false,
+                        RightTog = false,
+                    });
+                }
+            }
+            Open = new RelayCommand<object>((o) =>
+            {
+                ActionManage.GetInstance.Send("ManualOpen", o);
+            });
+            Close = new RelayCommand<object>((o) =>
+            {
+                ActionManage.GetInstance.Send("ManualClose", o);
+            });
+            StartAxisLoadCommand = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("StartAxisLoadCommand");
+            });
+            StopAxisLoadCommand = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("StopAxisLoadCommand");
+            });
+            StartAxisMidCommand = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("StartAxisMidCommand");
+            });
+            StopAxisMidCommand = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("StopAxisMidCommand");
+            });
+            StartAxisUnLoadCommand = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("StartAxisUnLoadCommand");
+            });
+            StopAxisUnLoadCommand = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("StopAxisUnLoadCommand");
+            });
+            StartAxis1Command = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("StartAxis1Command");
+            });
+            StopAxis1Command = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("StopAxis1Command");
+            });
+            StartAxis2Command = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("StartAxis2Command");
+            });
+            StopAxis2Command = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("StopAxis2Command");
+            });
+
+            SystemStartCommand = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("SystemStart");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"系统启动!");
+            });
+            SystemStopCommand = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("SystemStop");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"系统停止!");
+            });
+            SystemPauseCommand = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("SystemPause");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"系统暂停!");
+            });
+            SystemResetCommand = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("SystemReset");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"系统暂停后复位!");
+            });
+            DebugMode = new RelayCommand(() =>
+            {
+                // ActionManage.GetInstance.Send("SystemDebugMode");
+            });
+            AutoMode = new RelayCommand(() =>
+            {
+                // ActionManage.GetInstance.Send("SystemAutoMode");
+            });
+        }
+
+        /// <summary>
+        /// 升降气缸
+        /// </summary>
+        public static ObservableCollection<CylinderModel> cylinderModels { get; set; } = new ObservableCollection<CylinderModel>();
+
+        /// <summary>
+        /// 阻挡气缸
+        /// </summary>
+        public static ObservableCollection<CylinderModel> BlockCylinders { get; set; } = new ObservableCollection<CylinderModel>();
+
+        /// <summary>
+        /// 托盘气缸
+        /// </summary>
+        public static ObservableCollection<CylinderModel> PalletCylinders { get; set; } = new ObservableCollection<CylinderModel>();
+        public static string SystemMode { get { return _mSystemMode; } set { _mSystemMode = value; OnStaticPropertyChanged(); } }
+        private static string _mSystemMode = String.Empty;
+
+
+        public static string SystemStatus { get { return _mSystemStatus; } set { _mSystemStatus = value; OnStaticPropertyChanged(); } }
+        private static string _mSystemStatus;
+        public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
+        private static void OnStaticPropertyChanged([CallerMemberName] string PropName = "")
+        {
+            StaticPropertyChanged?.Invoke(null, new PropertyChangedEventArgs(PropName));
+        }
+        public RelayCommand<object> Open { get; set; }
+
+        public RelayCommand<object> Close { get; set; }
+
+        //五个电机手动控制 
+        public RelayCommand StartAxisLoadCommand { get; set; }
+        public RelayCommand StopAxisLoadCommand { get; set; }
+        public RelayCommand StartAxisMidCommand { get; set; }
+        public RelayCommand StopAxisMidCommand { get; set; }
+        public RelayCommand StartAxisUnLoadCommand { get; set; }
+        public RelayCommand StopAxisUnLoadCommand { get; set; }
+        public RelayCommand StartAxis1Command { get; set; }
+        public RelayCommand StopAxis1Command { get; set; }
+        public RelayCommand StartAxis2Command { get; set; }
+        public RelayCommand StopAxis2Command { get; set; }
+
+        public RelayCommand SystemStartCommand { get; set; }
+        public RelayCommand SystemStopCommand { get; set; }
+        public RelayCommand SystemPauseCommand { get; set; }
+
+        public RelayCommand SystemResetCommand { get; set; }
+
+        public RelayCommand AutoMode { get; set; }
+        public RelayCommand DebugMode { get; set; }
+
+        /// <summary>
+        /// 系统模式改变
+        /// </summary>
+        public static bool PlcSystemMode
+        {
+            get { return _mPlcSystemMode; }
+            set
+            {
+                if (_mPlcSystemMode != value || string.IsNullOrEmpty(SystemMode))
+                {
+                    _mPlcSystemMode = value;
+                    SystemMode = value ? "手动" : "自动";
+                    if (value)
+                        ManualMode = true;
+                    else
+                        AutoModeStatus = true;
+                }
+
+            }
+        }
+        private static bool _mPlcSystemMode;
+
+
+        /// <summary>
+        /// 自动模式
+        /// </summary>
+        public static bool AutoModeStatus
+        {
+            get { return _mAutoModeStatus; }
+            set
+            {
+                if (_mAutoModeStatus != value || (!_mAutoModeStatus && !_mManualMode))
+                {
+                    if (value)
+                        ProcessControl.GetInstance.HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.1", false);
+                    _mAutoModeStatus = value;
+                    OnStaticPropertyChanged();
+                }
+            }
+        }
+        private static bool _mAutoModeStatus;
+
+        /// <summary>
+        /// 手动模式
+        /// </summary>
+        public static bool ManualMode
+        {
+            get { return _mManualMode; }
+            set
+            {
+                if (_mManualMode != value || (!_mAutoModeStatus && !_mManualMode))
+                {
+                    if (value)
+                        ProcessControl.GetInstance.HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.1", true);
+                    _mManualMode = value;
+                    OnStaticPropertyChanged();
+                }
+            }
+        }
+        private static bool _mManualMode;
+    }
+
+
+
+    public class CylinderModel : ObservableObject
+    {
+        public bool LeftTog { get { return _mLeftTog; } set { _mLeftTog = value; OnPropertyChanged(); } }
+        private bool _mLeftTog;
+
+        public bool RightTog { get { return _mRightTog; } set { _mRightTog = value; OnPropertyChanged(); } }
+        private bool _mRightTog;
+
+        public string Name { get { return _mName; } set { _mName = value; OnPropertyChanged(); } }
+        private string _mName;
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/ManualFlowViewModel.cs
new file mode 100644
index 00000000..98b54bd6
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/ManualFlowViewModel.cs
@@ -0,0 +1,380 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.FoodStationTest.Model.HK_PLC;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Windows;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class ManualFlowViewModel : ObservableObject
+    {
+        public ManualFlowViewModel()
+        {
+            time = GVL_SmallStation.GetInstance.Time;
+            Test1Command = new RelayCommand(() =>
+            {
+                if (DateTime.Now.Subtract(GVL_SmallStation.GetInstance.LatestIssueRecipe).TotalSeconds <= 10)
+                {
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "提示", $"最后一次手动下发订单间隔不足10秒，请稍后再点击。");
+                    return;
+                }
+
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX8.0", PlcVarType = PlcVarType.Bool, Value = true });
+                //Thread.Sleep(200);
+                //ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX8.0", PlcVarType = PlcVarType.Bool, Value = false });
+                //GVL_SmallStation.GetInstance.AGV_PutTray1Finish = true;
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV送托盘完成");
+
+                VisibilityBtn1 = Visibility.Hidden;
+                VisibilityBtn2 = Visibility.Visible;
+                VisibilityBtn3 = Visibility.Hidden;
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV送托盘完成");
+
+            });
+
+            Test2Command = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX4.0", PlcVarType = PlcVarType.Bool, Value = true });
+                //Thread.Sleep(200);
+                //ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX4.0", PlcVarType = PlcVarType.Bool, Value = false });
+                //GVL_SmallStation.GetInstance.WindSendDosingComple = true;
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，粉料仓配料完成");
+
+                VisibilityBtn1 = Visibility.Hidden;
+                VisibilityBtn2 = Visibility.Hidden;
+                VisibilityBtn3 = Visibility.Visible;
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，粉料仓配料完成");
+            });
+            Test3Command = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX10.0", PlcVarType = PlcVarType.Bool, Value = true });
+                //Thread.Sleep(200);
+                //ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX10.0", PlcVarType = PlcVarType.Bool, Value = false });
+                //GVL_SmallStation.GetInstance.AGV_GetTray1Finish = true;
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV取托盘完成");
+
+                VisibilityBtn1 = Visibility.Visible;
+                VisibilityBtn2 = Visibility.Hidden;
+                VisibilityBtn3 = Visibility.Hidden;
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV取托盘完成");
+            });
+
+            Test4Command = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX1.5", PlcVarType = PlcVarType.Bool, Value = true });
+                //GVL_SmallStation.GetInstance.CylinderReset = true;
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，气缸收紧错位复位");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，气缸收紧错位复位");
+            });
+            //Test5Command = new RelayCommand(() =>
+            //{
+            //    GVL_SmallStation.GetInstance.WindSendAllowAGVPutGet = true;
+            //    MessageNotify.GetInstance.ShowUserLog("手动点击按钮，粉料仓提升到位");
+            //});
+            Test6Command = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("AGVPutTrayFinish");
+                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV放货架流程完成");
+            });
+            CLearRecipeInfo = new RelayCommand(() =>
+            {
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    if (MessageNotify.GetInstance.ShowDialog("请确认，是否进行【PLC配方清零】操作"))
+                    {
+                        ActionManage.GetInstance.Send("CLearRecipeInfo");
+                        MessageNotify.GetInstance.ShowUserLog("手动点击按钮，PLC配方清零");
+                    }
+                });
+            });
+            SystemReset = new RelayCommand(() =>
+            {
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    if (MessageNotify.GetInstance.ShowDialog("请确认，是否进行【PLC系统复位】操作"))
+                    {
+                        ActionManage.GetInstance.Send("ManualSystemReset");
+                        MessageNotify.GetInstance.ShowUserLog("手动点击按钮，PLC系统复位");
+                    }
+                });
+            });
+            BPAResetCommand = new RelayCommand(() =>
+            {
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    if (MessageNotify.GetInstance.ShowDialog("请确认，是否进行【上位机初始化】操作"))
+                    {
+                        ActionManage.GetInstance.Send("BPASystemReset");
+                        MessageNotify.GetInstance.ShowUserLog("手动点击按钮，上位机初始化");
+                    }
+                });
+            });
+            StockbinDosingComple = new RelayCommand(() =>
+            {
+                int loc = StockbinDosingCompleNum;
+                if (loc >= 1 && loc <= 8)
+                {
+                    ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX12." + (loc - 1), PlcVarType = PlcVarType.Bool, Value = true });
+
+                    MessageNotify.GetInstance.ShowUserLog($"手动点击按钮，给plc料仓{loc}配料完成信号");
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，手动设置料仓{loc}配料完成");
+                }
+                else if (loc >= 9 && loc <= 15)
+                {
+                    ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX13." + (loc - 9), PlcVarType = PlcVarType.Bool, Value = true });
+
+                    MessageNotify.GetInstance.ShowUserLog($"手动点击按钮，给plc料仓{loc}配料完成信号");
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，手动设置料仓{loc}配料完成");
+                }
+                else
+                {
+                    MessageNotify.GetInstance.ShowUserLog("料仓编号不正确");
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，手动设置料仓{loc}配料，料仓编号不正确");
+                }
+            });
+            StockbinDosingCompleClear = new RelayCommand(() =>
+            {
+                //for (int i = 0; i < GVL_SmallStation.GetInstance.StockInDosingComple.Length; i++) 
+                //{
+                //    GVL_SmallStation.GetInstance.StockInDosingComple[i] = false;
+                //}
+                //MessageNotify.GetInstance.ShowUserLog($"手动点击按钮，清除所有手动配料完成信号");
+                //NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"清除所有手动配料完成信号");
+            });
+            CancelRecipeCommand = new RelayCommand(() =>
+            {
+                string cancelRecipeCode = CancelRecipeCode.Trim();
+                if (!String.IsNullOrEmpty(cancelRecipeCode) && MessageNotify.GetInstance.ShowDialog($"请确认，是否进行删除订单【{cancelRecipeCode}】操作？"))
+                {
+                    if (Json<RemoteRecipeDataColl>.Data.Recipes != null)
+                    {
+                        int index = Array.FindIndex(Json<RemoteRecipeDataColl>.Data.Recipes.ToArray(), p => p.RecipeCode == cancelRecipeCode);
+                        if (index >= 0)
+                        {
+                            GVL_SmallStation.GetInstance.Order_Cancel = true;
+                            GVL_SmallStation.GetInstance.Order_CancelRecipeCode = cancelRecipeCode;
+                            MessageNotify.GetInstance.ShowUserLog($"手动删除订单【{cancelRecipeCode}】。");
+                            NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"删除订单【{cancelRecipeCode}】成功！");
+                            return;
+                        }
+                        NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "提示", $"删除订单【{cancelRecipeCode}】失败，未找到该订单。");
+
+                    }
+                }
+
+            });
+            CompletedNumResetCommand = new RelayCommand(() =>
+            {
+                if (MessageNotify.GetInstance.ShowDialog("请确认，是否将配方完成数目清零？", DialogType.Warning))
+                {
+                    GVL_SmallStation.GetInstance.RecipeDosingCompleNum = 0;
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", "配方完成数目清零成功！");
+                    MessageNotify.GetInstance.ShowUserLog("手动清零配方完成数目。");
+                }
+            });
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                RecipeDosingCompleNum = GVL_SmallStation.GetInstance.RecipeDosingCompleNum;
+                Recipe1DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[0].ToBinString();
+                Recipe2DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[1].ToBinString();
+                Recipe3DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[2].ToBinString();
+                Recipe4DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[3].ToBinString();
+                Recipe5DosingComplete = GVL_SmallStation.GetInstance.RecipeStockBinDosing[4].ToBinString();
+                Heartbeat = GVL_SmallStation.GetInstance.HeartBeatFromPlc;
+                switch (GVL_SmallStation.GetInstance.SiemensSendRecipeStatus)
+                {
+                    case 0:
+                        OrderStatus = IssueRecipeCondition.等待小料站PLC允许下配方.ToString();
+                        break;
+                    case 1:
+                        OrderStatus = IssueRecipeCondition.等待西门子下发配方.ToString();
+                        break;
+                    case 2:
+                        OrderStatus = IssueRecipeCondition.等待西门子下发配方信号复位.ToString();
+                        break;
+                    case 3:
+                        OrderStatus = IssueRecipeCondition.等待上位机请求配料.ToString();
+                        break;
+                    case 4:
+                        OrderStatus = IssueRecipeCondition.等待西门子确认配料.ToString();
+                        break;
+                    case 5:
+                        OrderStatus = IssueRecipeCondition.等待西门子确认配料信号复位.ToString();
+                        break;
+                    case 6:
+                        OrderStatus = "上位机将配方添加到队列中";
+                        break;
+                    default:
+                        OrderStatus = "无意义";
+                        break;
+                }
+                switch (GVL_SmallStation.GetInstance.RecipeProcessStatus[0])
+                {
+                    case 0:
+                        Recipe1DosingStatus = ProcessCondition.等待AGV到位.ToString();
+                        break;
+                    case 1:
+                        Recipe1DosingStatus = ProcessCondition.等待小料站PLC接受配方完成.ToString();
+                        break;
+                    case 2:
+                        Recipe1DosingStatus = ProcessCondition.等待配方配料完成.ToString();
+                        break;
+                    default:
+                        break;
+                }
+                switch (GVL_SmallStation.GetInstance.RecipeProcessStatus[1])
+                {
+                    case 0:
+                        Recipe2DosingStatus = ProcessCondition.等待AGV到位.ToString();
+                        break;
+                    case 1:
+                        Recipe2DosingStatus = ProcessCondition.等待小料站PLC接受配方完成.ToString();
+                        break;
+                    case 2:
+                        Recipe2DosingStatus = ProcessCondition.等待配方配料完成.ToString();
+                        break;
+                    default:
+                        break;
+                }
+                switch (GVL_SmallStation.GetInstance.RecipeProcessStatus[2])
+                {
+                    case 0:
+                        Recipe3DosingStatus = ProcessCondition.等待AGV到位.ToString();
+                        break;
+                    case 1:
+                        Recipe3DosingStatus = ProcessCondition.等待小料站PLC接受配方完成.ToString();
+                        break;
+                    case 2:
+                        Recipe3DosingStatus = ProcessCondition.等待配方配料完成.ToString();
+                        break;
+                    default:
+                        break;
+                }
+                switch (GVL_SmallStation.GetInstance.RecipeProcessStatus[3])
+                {
+                    case 0:
+                        Recipe4DosingStatus = ProcessCondition.等待AGV到位.ToString();
+                        break;
+                    case 1:
+                        Recipe4DosingStatus = ProcessCondition.等待小料站PLC接受配方完成.ToString();
+                        break;
+                    case 2:
+                        Recipe4DosingStatus = ProcessCondition.等待配方配料完成.ToString();
+                        break;
+                    default:
+                        break;
+                }
+                switch (GVL_SmallStation.GetInstance.RecipeProcessStatus[4])
+                {
+                    case 0:
+                        Recipe5DosingStatus = ProcessCondition.等待AGV到位.ToString();
+                        break;
+                    case 1:
+                        Recipe5DosingStatus = ProcessCondition.等待小料站PLC接受配方完成.ToString();
+                        break;
+                    case 2:
+                        Recipe5DosingStatus = ProcessCondition.等待配方配料完成.ToString();
+                        break;
+                    default:
+                        break;
+                }
+                Thread.Sleep(100);
+            }), "流程手动设备状态读取", true);
+            TimeSet = new RelayCommand(() =>
+            {
+                GVL_SmallStation.GetInstance.Time = time;
+                MessageNotify.GetInstance.ShowUserLog($"设置柔性味魔方复位时间：{time}s");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{time.ToString()}：设置成功!");
+            });
+            HKPlcIsConnect = ProcessControl.GetInstance.HKDevice.IsConnected;
+        }
+        public RelayCommand Test1Command { get; set; }
+        public RelayCommand Test2Command { get; set; }
+        public RelayCommand Test3Command { get; set; }
+        public RelayCommand Test4Command { get; set; }
+        public RelayCommand Test5Command { get; set; }
+        public RelayCommand Test6Command { get; set; }
+        public RelayCommand TimeSet { get; set; }
+        public RelayCommand CompletedNumResetCommand { get; set; }
+        public static bool Heartbeat { get { return _mHeartbeat; } set { _mHeartbeat = value; OnStaticPropertyChanged(); } }
+        private static bool _mHeartbeat;
+
+        public int time { get { return _mtime; } set { _mtime = value; OnStaticPropertyChanged(); } }
+        private int _mtime;
+        public static string OrderStatus { get { return _mOrderStatus; } set { _mOrderStatus = value; OnStaticPropertyChanged(); } }
+        private static string _mOrderStatus = "无意义";
+        public static string Recipe1DosingStatus { get { return _mRecipe1DosingStatus; } set { _mRecipe1DosingStatus = value; OnStaticPropertyChanged(); } }
+        private static string _mRecipe1DosingStatus = "无意义";
+        public static string Recipe2DosingStatus { get { return _mRecipe2DosingStatus; } set { _mRecipe2DosingStatus = value; OnStaticPropertyChanged(); } }
+        private static string _mRecipe2DosingStatus = "无意义";
+        public static string Recipe3DosingStatus { get { return _mRecipe3DosingStatus; } set { _mRecipe3DosingStatus = value; OnStaticPropertyChanged(); } }
+        private static string _mRecipe3DosingStatus = "无意义";
+        public static string Recipe4DosingStatus { get { return _mRecipe4DosingStatus; } set { _mRecipe4DosingStatus = value; OnStaticPropertyChanged(); } }
+        private static string _mRecipe4DosingStatus = "无意义";
+        public static string Recipe5DosingStatus { get { return _mRecipe5DosingStatus; } set { _mRecipe5DosingStatus = value; OnStaticPropertyChanged(); } }
+        private static string _mRecipe5DosingStatus = "无意义";
+
+
+        public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
+        public static void OnStaticPropertyChanged([CallerMemberName] string PropName = "")
+        {
+            StaticPropertyChanged?.Invoke(null, new PropertyChangedEventArgs(PropName));
+        }
+        public RelayCommand CLearRecipeInfo { get; set; }
+        public RelayCommand SystemReset { get; set; }
+        public RelayCommand BPAResetCommand { get; set; }
+        private bool _SiemensIsConnect { get; set; }
+        public bool SiemensIsConnect { get { return _SiemensIsConnect; } set { _SiemensIsConnect = value; OnPropertyChanged(); } }
+        private bool _HKPlcIsConnect { get; set; }
+        public bool HKPlcIsConnect { get { return _HKPlcIsConnect; } set { _HKPlcIsConnect = value; OnPropertyChanged(); } }
+        private bool _WindSendIsConnect { get; set; }
+        public bool WindSendIsConnect { get { return _WindSendIsConnect; } set { _WindSendIsConnect = value; OnPropertyChanged(); } }
+
+
+        private static string _Recipe1DosingComplete { get; set; }
+        public static string Recipe1DosingComplete { get { return _Recipe1DosingComplete; } set { _Recipe1DosingComplete = value; OnStaticPropertyChanged(); } }
+
+        private static string _Recipe2DosingComplete { get; set; }
+        public static string Recipe2DosingComplete { get { return _Recipe2DosingComplete; } set { _Recipe2DosingComplete = value; OnStaticPropertyChanged(); } }
+
+        private static string _Recipe3DosingComplete { get; set; }
+        public static string Recipe3DosingComplete { get { return _Recipe3DosingComplete; } set { _Recipe3DosingComplete = value; OnStaticPropertyChanged(); } }
+        private static string _Recipe4DosingComplete { get; set; }
+        public static string Recipe4DosingComplete { get { return _Recipe4DosingComplete; } set { _Recipe4DosingComplete = value; OnStaticPropertyChanged(); } }
+        private static string _Recipe5DosingComplete { get; set; }
+        public static string Recipe5DosingComplete { get { return _Recipe5DosingComplete; } set { _Recipe5DosingComplete = value; OnStaticPropertyChanged(); } }
+
+
+        public RelayCommand StockbinDosingComple { get; set; }
+        public RelayCommand StockbinDosingCompleClear { get; set; }
+        public RelayCommand CancelRecipeCommand { get; set; }
+        private static int _StockbinDosingCompleNum { get; set; }
+        public static int StockbinDosingCompleNum { get { return _StockbinDosingCompleNum; } set { _StockbinDosingCompleNum = value; OnStaticPropertyChanged(); } }
+
+
+        private static int _RecipeDosingCompleNum { get; set; }
+        public static int RecipeDosingCompleNum { get { return _RecipeDosingCompleNum; } set { _RecipeDosingCompleNum = value; OnStaticPropertyChanged(); } }
+
+        public static Visibility VisibilityBtn1 { get { return _VisibilityBtn1; } set { _VisibilityBtn1 = value; OnStaticPropertyChanged(); } }
+        private static Visibility _VisibilityBtn1 = Visibility.Visible;
+        public static Visibility VisibilityBtn2 { get { return _VisibilityBtn2; } set { _VisibilityBtn2 = value; OnStaticPropertyChanged(); } }
+        private static Visibility _VisibilityBtn2 = Visibility.Hidden;
+        public static Visibility VisibilityBtn3 { get { return _VisibilityBtn3; } set { _VisibilityBtn3 = value; OnStaticPropertyChanged(); } }
+
+        public string CancelRecipeCode { get { return _CancelRecipeCode; } set { _CancelRecipeCode = value; OnPropertyChanged(); } }
+        public string _CancelRecipeCode { get; set; }
+
+        private static Visibility _VisibilityBtn3 = Visibility.Hidden;
+
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/NewLocalRecipeViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/NewLocalRecipeViewModel.cs
new file mode 100644
index 00000000..15673100
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/NewLocalRecipeViewModel.cs
@@ -0,0 +1,220 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class NewLocalRecipeViewModel : ObservableObject
+    {
+        public NewLocalRecipeViewModel()
+        {
+            //ActionManage.GetInstance.CancelRegister("LocalRecipeEdit");
+
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is RemoteRecipeData rm)
+                {
+                    RecipeName = rm.RecipeName;
+                    RecipeCode = rm.RecipeCode;
+                    TrayNum = rm.TrayCode;
+                    foreach (RemoteRecipeRawMaterial item in rm.RawMaterial)
+                    {
+                        var res = Json<DevicePar>.Data.rawMaterialStockBin.FirstOrDefault(p => p.RawMaterialLocation == item.RawMaterialLocation);
+                        if (res != null && !string.IsNullOrEmpty(res.RawMaterialName))
+                        {
+                            var temp = Json<DevicePar>.Data.BomMaterial.FirstOrDefault(p => p.MaterialCode == res.RawMaterialName);
+                            if (temp != null && !string.IsNullOrEmpty(temp.MaterialName))
+                            {
+                                item.RawMaterialName = temp.MaterialName;
+                            }
+                        }
+                        //AllRawMaterial.Add(item);
+                        AllRawMaterial.Add(new RemoteRecipeRawMaterial()
+                        {
+                            RawMaterialType = item.RawMaterialType,
+                            RawMaterialName = item.RawMaterialName,
+                            RawMaterialWeight = item.RawMaterialWeight,
+                            RawMaterialLocation = item.RawMaterialLocation,
+                            RawMaterialBarrelNum = item.RawMaterialBarrelNum,
+                        });
+                    }
+                }
+            }), "LocalRecipeEdit", true);
+
+
+            RemoveCommand = new RelayCommand<object>((o) =>
+            {
+                var res = AllRawMaterial.FirstOrDefault(p => p.RawMaterialName == o.ToString());
+                if (res != null)
+                    AllRawMaterial.Remove(res);
+                //NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{o.ToString()}：原料删除成功!");
+            });
+
+            AddCommand = new RelayCommand(() =>
+            {
+                int MaxRawMaterial = 15;
+                var res = AllRawMaterial.Where(p => p.RawMaterialType == "小料").ToList();
+                if (res.Count < MaxRawMaterial)
+                {
+                    AllRawMaterial.Add(new RemoteRecipeRawMaterial()
+                    {
+                        RawMaterialType = "小料",
+                        RawMaterialName = "小料" + (res.Count + 1),
+                        RawMaterialLocation = res.Count + 1,
+                        RawMaterialBarrelNum = (short)new Random().Next(6, 9),
+                        RawMaterialWeight = (float)(new Random().Next(100, 300) * 0.001),
+                    });
+                }
+                else
+                {
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"原料最多添加{MaxRawMaterial}种");
+                }
+
+            });
+            AddFLCommand = new RelayCommand(() =>
+            {
+                int MaxRawMaterial = 5;
+                var res = AllRawMaterial.Where(p => p.RawMaterialType == "粉料").ToList();
+                if (res.Count < MaxRawMaterial)
+                {
+                    AllRawMaterial.Add(new RemoteRecipeRawMaterial()
+                    {
+                        RawMaterialType = "粉料",
+                        RawMaterialName = "粉料" + (res.Count + 1),
+                        RawMaterialLocation = res.Count + 1,
+                        RawMaterialWeight = new Random().Next(1, 5),
+                        RawMaterialBarrelNum = 3,
+                    });
+                }
+                else
+                {
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"粉料最多添加{MaxRawMaterial}种");
+                }
+            });
+            SaveCommand = new RelayCommand(() =>
+            {
+                if (!MessageNotify.GetInstance.ShowDialog("请确认，是否保存该配方配置？"))
+                {
+                    return;
+                }
+                if (RecipeName.Length < 0 || RecipeName == null || RecipeName == String.Empty || RecipeName == "")
+                {
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"配方名称不能为空");
+                    return;
+                }
+                if (RecipeCode.Length < 0 || RecipeCode == null || RecipeCode == String.Empty || RecipeCode == "")
+                {
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"配方编号不能为空");
+                    return;
+                }
+                if (TrayNum != 1 && TrayNum != 2)
+                {
+                    TrayNum = 1;
+                }
+                ObservableCollection<RemoteRecipeRawMaterial> RawMaterials = new ObservableCollection<RemoteRecipeRawMaterial>();
+                if (AllRawMaterial == null || AllRawMaterial.Count <= 0)
+                {
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "警告", $"没有可保存的参数!");
+                    return;
+                }
+                var res = AllRawMaterial.Where(p => p.RawMaterialType == "小料").ToList();
+                for (int i = 0; i < res.Count; i++)
+                {
+                    if (res.Where(p => p.RawMaterialLocation == res.ElementAt(i).RawMaterialLocation)?.ToList()?.Count >= 2)
+                    {
+                        NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"原料位置冲突，请检查后重试!");
+                        return;
+                    }
+                }
+                var res1 = AllRawMaterial.Where(p => p.RawMaterialType == "粉料").ToList();
+                for (int i = 0; i < res1.Count; i++)
+                {
+                    if (res1.Where(p => p.RawMaterialLocation == res1.ElementAt(i).RawMaterialLocation)?.ToList()?.Count >= 2)
+                    {
+                        NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"粉料位置冲突，请检查后重试!");
+                        return;
+                    }
+                }
+                int index = Array.FindIndex(Json<LocalRecipeDataColl>.Data.Recipes.ToArray(), p => p.RecipeCode == RecipeCode);
+                if (index >= 0)
+                {
+                    foreach (var item in AllRawMaterial)
+                    {
+                        if (item.RawMaterialType == "小料")
+                        {
+                            RawMaterials.Add(new RemoteRecipeRawMaterial()
+                            {
+                                RawMaterialName = item.RawMaterialName,
+                                RawMaterialType = item.RawMaterialType,
+                                RawMaterialLocation = item.RawMaterialLocation,
+                                RawMaterialBarrelNum = item.RawMaterialBarrelNum,
+                                RawMaterialWeight = item.RawMaterialWeight,
+                            });
+                        }
+                    }
+                    Json<LocalRecipeDataColl>.Data.Recipes.ElementAt(index).RecipeName = RecipeName;
+                    Json<LocalRecipeDataColl>.Data.Recipes.ElementAt(index).TrayCode = TrayNum;
+                    Json<LocalRecipeDataColl>.Data.Recipes.ElementAt(index).RecipeCode = RecipeCode;
+                    Json<LocalRecipeDataColl>.Data.Recipes.ElementAt(index).RawMaterial = RawMaterials;
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"修改配方完成!");
+                }
+                else
+                {
+                    foreach (var item in AllRawMaterial)
+                    {
+                        if (item.RawMaterialType == "小料")
+                        {
+                            RawMaterials.Add(new RemoteRecipeRawMaterial()
+                            {
+                                RawMaterialName = item.RawMaterialName,
+                                RawMaterialType = item.RawMaterialType,
+                                RawMaterialLocation = item.RawMaterialLocation,
+                                RawMaterialBarrelNum = item.RawMaterialBarrelNum,
+                                RawMaterialWeight = item.RawMaterialWeight,
+                            });
+                        }
+                    }
+                    Json<LocalRecipeDataColl>.Data.Recipes.Add(new RemoteRecipeData()
+                    {
+                        RecipeName = RecipeName,
+                        RecipeCode = RecipeCode,
+                        TrayCode = TrayNum,
+                        RawMaterial = RawMaterials
+                    });
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"自定义配方添加完成!");
+                }
+                ActionManage.GetInstance.Send("CloseNewRemoteRecipeView");
+            });
+        }
+        public string RecipeCode { get { return _mRecipeCode; } set { _mRecipeCode = value; OnPropertyChanged(); } }
+        private string _mRecipeCode = string.Empty;
+
+        public string RecipeName { get { return _mRecipeName; } set { _mRecipeName = value; OnPropertyChanged(); } }
+        private string _mRecipeName = string.Empty;
+
+        public int TrayNum { get { return _mTrayNum; } set { _mTrayNum = value; OnPropertyChanged(); } }
+        private int _mTrayNum = 1;
+
+        public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
+        private string _mErrorInfo;
+
+        public ObservableCollection<RemoteRecipeRawMaterial> AllRawMaterial { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>();
+        //public ObservableCollection<NewRemoteRecipeModel> AllRawMaterial { get; set; } = new ObservableCollection<NewRemoteRecipeModel>();
+
+
+
+        public RelayCommand<object> RemoveCommand { get; set; }
+
+        public RelayCommand AddCommand { get; set; }
+        public RelayCommand AddFLCommand { get; set; }
+        public RelayCommand SaveCommand { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/NewMaterialViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/NewMaterialViewModel.cs
new file mode 100644
index 00000000..0504b4ff
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/NewMaterialViewModel.cs
@@ -0,0 +1,58 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.Helper;
+using BPASmartClient.Model;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace BPASmartClient.FoodStationTest.ViewModel;
+
+public class NewMaterialViewModel : ObservableObject
+{
+    public ObservableCollection<RawMaterialModel> Materials { get; set; } = Json<LocaMaterial>.Data.LocalMaterails;
+
+    public string MaterialName { get { return _materialName; } set { _materialName = value; OnPropertyChanged(); } }
+    private string _materialName = string.Empty;
+
+    public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
+    private string _mErrorInfo;
+
+    public RelayCommand<object> RemoveCommand { get; set; }
+
+    public RelayCommand SaveCommand { get; set; }
+
+
+
+    private void Remove(object o)
+    {
+        if (o == null)
+            return;
+        if (o is string id)
+        {
+            var res = Materials.FirstOrDefault(p => p.RawMaterialId == id);
+            Materials.Remove(res);
+            Json<LocaMaterial>.Save();
+            MessageNotify.GetInstance.ShowUserLog($"删除原料--{res.RawMaterialName}");
+        }
+    }
+
+    public NewMaterialViewModel()
+    {
+        RemoveCommand = new RelayCommand<object>(Remove);
+
+        SaveCommand = new RelayCommand(() =>
+        {
+            if (MaterialName == String.Empty)
+            { ErrorInfo = "原料名称不能为空"; return; }
+            if (Global.DeviceRawMaterials.FirstOrDefault(p => p.RawMaterialName == MaterialName) != null)
+            { ErrorInfo = "设备中已存在该原料名称"; return; }
+            if (Json<LocaMaterial>.Data.LocalMaterails.FirstOrDefault(p => p.RawMaterialName == MaterialName) != null)
+            { ErrorInfo = "本地原料名称重复"; return; }
+            Json<LocaMaterial>.Data.LocalMaterails.Add(new RawMaterialModel { RawMaterialName = MaterialName, RawMaterialId = Guid.NewGuid().ToString(), RawMaterialSource = 0 });
+            Json<LocaMaterial>.Save();
+            MessageNotify.GetInstance.ShowUserLog($"添加原料--{MaterialName}");
+        });
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/NewRecipeViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/NewRecipeViewModel.cs
new file mode 100644
index 00000000..72431cfb
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/NewRecipeViewModel.cs
@@ -0,0 +1,186 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.Helper;
+using BPASmartClient.Model;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class NewRecipeViewModel : ObservableObject
+    {
+        public NewRecipeViewModel()
+        {
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is RecipeModel rm)
+                {
+                    RecipeName = rm.RecipeName;
+                    foreach (var item in rm.RawMaterials)
+                    {
+                        item.SelectIndex = Array.FindIndex(RawMaterialNames.ToArray(), p => p == item.RawMaterialName);
+                        RawMaterials.Add(item);
+                    }
+                    RecipeCode = rm.RecipCode;
+                }
+            }), "Details");
+
+            AddCommand = new RelayCommand(() =>
+            {
+p:
+                string guid = Guid.NewGuid().ToString();
+                if (RawMaterials.FirstOrDefault(p => p.RawMaterialId == guid) == null)
+                {
+                    RawMaterials.Add(new RawMaterialModel()
+                    {
+                        RawMaterialId = guid
+                    });
+                }
+                else
+                    goto p;
+            });
+
+            RemoveCommand = new RelayCommand<object>((obj) =>
+            {
+                if (obj is string rm)
+                {
+                    var res = RawMaterials.FirstOrDefault(p => p.RawMaterialId == rm);
+                    if (res != null)
+                        Global.DeviceRawMaterials.Remove(res);
+                }
+            });
+
+            SaveCommand = new RelayCommand(() =>
+            {
+                ErrorInfo = String.Empty;
+                if (RecipeName == String.Empty)
+                { ErrorInfo = "配方名称未填写"; return; }
+                for (int i = 0; i < RawMaterials.Count; i++)
+                {
+                    var res = DeviceInquire.GetInstance.devices.FirstOrDefault(p => p.DeviceName == RawMaterials.ElementAt(i).RawMaterialName);
+                    if (res != null)
+                    {
+                        RawMaterials.ElementAt(i).DeviceIp = res.IpAddress;//根据设备名称和原料名称的唯一匹配关系，给原料配置IP
+                        RawMaterials.ElementAt(i).RawMaterialSource = 1;
+                    }
+                    var su = Global.DeviceRawMaterials.FirstOrDefault(p => p.RawMaterialName == RawMaterials.ElementAt(i).RawMaterialName);
+                    if (su != null)
+                    {
+                        RawMaterials.ElementAt(i).RawMaterialSource = su.RawMaterialSource;
+                    }
+                }
+
+                if (RecipeCode.Length <= 0)//新建配方
+                {
+                    var res = Array.FindIndex(Json<LocaPar>.Data.Recipes.ToArray(), p => p.RecipeName == RecipeName);
+
+                    if (res >= 0 && res < Json<LocaPar>.Data.Recipes.Count)
+                    {
+                        ErrorInfo = "该配方已存在，请重新输入";
+                    }
+                    else
+                    {
+                        AddRecipes();
+                    }
+                }
+                else//修改配方
+                {
+                    var res = Array.FindIndex(Json<LocaPar>.Data.Recipes.ToArray(), p => p.RecipCode == RecipeCode);
+                    if (res >= 0 && res < Json<LocaPar>.Data.Recipes.Count)
+                    {
+                        Json<LocaPar>.Data.Recipes.ElementAt(res).RecipeName = RecipeName;
+                        Json<LocaPar>.Data.Recipes.ElementAt(res).RawMaterials.Clear();
+                        foreach (var item in RawMaterials)
+                        {
+                            Json<LocaPar>.Data.Recipes.ElementAt(res).RawMaterials.Add(item);
+                        }
+                    }
+                }
+                ActionManage.GetInstance.Send("CloseNewRecipeView");
+            });
+
+            //RawMaterialNames.Add("乳化剂");
+            //RawMaterialNames.Add("酶制剂");
+            //RawMaterialNames.Add("增味剂");
+
+
+            //RawMaterialNames.Add("营养强化剂");
+            //RawMaterialNames.Add("抗结剂");
+            //RawMaterialNames.Add("消泡剂");
+            //RawMaterialNames.Add("膨松剂");
+            //RawMaterialNames.Add("防腐剂");
+            //RawMaterialNames.Add("着色剂");
+            //RawMaterialNames.Add("甜味剂");
+            //RawMaterialNames.Add("酸味剂");
+            //RawMaterialNames.Add("增白剂");
+            //RawMaterialNames.Add("香料");
+            //RawMaterialNames.Add("抗氧化剂");
+            //RawMaterialNames.Add("食用香料");
+            //RawMaterialNames.Add("增稠剂");
+
+            if (Global.userInfo.permission == CustomResource.Pages.Enums.Permission.管理员)
+            {
+                foreach (var item in Global.DeviceRawMaterials)
+                {
+                    RawMaterialNames.Add(item.RawMaterialName);
+
+                }
+                foreach (var item in Json<LocaMaterial>.Data.LocalMaterails)
+                {
+                    RawMaterialNames.Add(item.RawMaterialName);
+                }
+            }
+            else
+            {
+                foreach (var item in Global.DeviceRawMaterials)
+                {
+                    if (Global.userInfo.devRawMaterials.FirstOrDefault(p => p.RawMaterialName == item.RawMaterialName) != null)
+                        RawMaterialNames.Add(item.RawMaterialName);
+                }
+                foreach (var item in Json<LocaMaterial>.Data.LocalMaterails)
+                {
+                    if (Global.userInfo.locaRawMaterials.FirstOrDefault(p => p.RawMaterialName == item.RawMaterialName) != null)
+                        RawMaterialNames.Add(item.RawMaterialName);
+                }
+            }
+        }
+
+        private void AddRecipes()
+        {
+            string date = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
+            var dates = date.Split("-").ToList();
+            StringBuilder sb = new StringBuilder();
+            dates?.ForEach((item) => { sb.Append(item); });
+            Json<LocaPar>.Data.Recipes.Add(new RecipeModel()
+            {
+                SerialNum = Json<LocaPar>.Data.Recipes.Count + 1,
+                RawMaterials = RawMaterials,
+                RecipCode = sb.ToString(),
+                RecipeName = RecipeName,
+            });
+        }
+
+        public string RecipeCode { get { return _mRecipeCode; } set { _mRecipeCode = value; OnPropertyChanged(); } }
+        private string _mRecipeCode = string.Empty;
+
+        public string RecipeName { get { return _mRecipeName; } set { _mRecipeName = value; OnPropertyChanged(); } }
+        private string _mRecipeName = string.Empty;
+
+        public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
+        private string _mErrorInfo;
+
+        public RelayCommand AddCommand { get; set; }
+
+        public RelayCommand<object> RemoveCommand { get; set; }
+
+        public RelayCommand SaveCommand { get; set; }
+
+        public ObservableCollection<RawMaterialModel> RawMaterials { get; set; } = new ObservableCollection<RawMaterialModel>();
+
+        public ObservableCollection<string> RawMaterialNames { get; set; } = new ObservableCollection<string>();
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/PlcVarMonitorViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/PlcVarMonitorViewModel.cs
new file mode 100644
index 00000000..d61bc685
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/PlcVarMonitorViewModel.cs
@@ -0,0 +1,16 @@
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.FoodStationTest.Model.GVL;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class PlcVarMonitorViewModel : ObservableObject
+    {
+        public PlcVarMonitorViewModel()
+        {
+
+        }
+        public ObservableCollection<PlcInfos> plcInfos => ProcessControl.GetInstance.CommData;
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/ProcessMonitorViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/ProcessMonitorViewModel.cs
new file mode 100644
index 00000000..b48ec6d7
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/ProcessMonitorViewModel.cs
@@ -0,0 +1,16 @@
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.FoodStationTest.Model.GVL;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class ProcessMonitorViewModel : ObservableObject
+    {
+        public ProcessMonitorViewModel()
+        {
+
+        }
+        public ObservableCollection<PlcInfos> plcInfos => ProcessControl.GetInstance.ProcessVar;
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/RecipeControlViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/RecipeControlViewModel.cs
new file mode 100644
index 00000000..d06ef9e6
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/RecipeControlViewModel.cs
@@ -0,0 +1,212 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.Helper;
+using BPASmartClient.Model;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class RecipeControlViewModel : ObservableObject
+    {
+        ConcurrentQueue<string> devices = new ConcurrentQueue<string>();
+
+        public RecipeControlViewModel()
+        {
+            StartCommand = new RelayCommand<object>((o) =>
+            {
+                if (o != null && o is string deviceName)
+                {
+                    int index = Array.FindIndex(Recipes.ToArray(), p => p.RecipeName == deviceName);
+                    if (index >= 0 && index < Recipes.Count)
+                    {
+                        Recipes.ElementAt(index).IsEnable = false;
+                    }
+                    MessageNotify.GetInstance.ShowUserLog($"下发工单 {Recipes.ElementAt(index).RecipeName}");
+                    var res = Recipes.FirstOrDefault(p => p.RecipeName == deviceName);
+                    App.Current.Dispatcher.Invoke(() =>
+                    {
+                        UserTreeWait.Add(new RecipeModel { RecipeName = deviceName, RawMaterials = res.RawMaterials });
+                    });
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"配方下发成功!");
+                    MessageNotify.GetInstance.ShowUserLog($"下发工单 {Guid.NewGuid().ToString()}");
+                    devices.Enqueue(deviceName);
+                }
+            });
+
+            ChangeRecipeStateCommand = new RelayCommand<object>(ChangeRecipeState);
+
+
+
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                if (devices.Count > 0)
+                {
+                    int index = Array.FindIndex(Recipes.ToArray(), p => p.RecipeName == devices.ElementAt(0));
+                    if (index >= 0 && index < Recipes.Count)
+                    {
+                        Recipes.ElementAt(index).Are.Reset();
+                        Recipes.ElementAt(index).IsEnable = false;
+                        App.Current.Dispatcher.Invoke(new Action(() =>
+                        {
+                            recipeProcesses.Clear();
+                            UserTreeWait.RemoveAt(0);
+                        }));
+                        CurrentRecipeName = Recipes.ElementAt(index).RecipeName;
+                        foreach (var item in Recipes.ElementAt(index).RawMaterials)
+                        {
+                            DeviceInquire.GetInstance.GetDevice(item.DeviceIp)?.Start(item.RawMaterialWeight);//启动并写入每个原料重量
+
+                            App.Current.Dispatcher.Invoke(new Action(() =>
+                            {
+                                recipeProcesses.Add(new RawMaterialModel()
+                                {
+                                    RawMaterialName = item.RawMaterialName,
+                                    RecipeStatus = item.RecipeStatus,
+                                    RawMaterialSource = item.RawMaterialSource,
+                                    RawMaterialId = item.RawMaterialId,
+                                });
+                            }));
+                        }
+                        Recipes.ElementAt(index).Are.WaitOne();//阻塞，直到当前配方完成
+                        devices.TryDequeue(out string deviceName);
+                        App.Current.Dispatcher.Invoke(new Action(() =>
+                        {
+                            UserTreeCompelete.Add(Recipes.ElementAt(index));//当前配方完成后添加到已完成的配方列表
+                        }));
+                        App.Current.Dispatcher.Invoke(new Action(() =>
+                        {
+                            recipeProcesses.Clear();
+                            CurrentRecipeName = string.Empty;
+                        }));//完成后清空当前配方
+                    }
+
+                }
+                Thread.Sleep(100);
+            }), "启动配方下发", true);
+
+
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                for (int i = 0; i < Recipes.Count; i++)
+                {
+                    for (int m = 0; m < Recipes.ElementAt(i).RawMaterials.Count; m++)
+                    {
+                        var RunStatus = DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(m).DeviceIp).deviceStatus.RunStatus;
+
+                        //设备状态显示
+                        if (Recipes.ElementAt(i).RecipeName == CurrentRecipeName)
+                        {
+                            string deviceName = DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(m).DeviceIp).DeviceName;
+                            int index = Array.FindIndex(Recipes.ElementAt(i).RawMaterials.ToArray(), p => p.RawMaterialName == deviceName);
+
+                            if (index >= 0 && index < recipeProcesses.Count)
+                            {
+                                App.Current.Dispatcher.Invoke(new Action(() => { recipeProcesses.ElementAt(index).RecipeStatus = RunStatus; }));
+                            }
+                        }
+
+
+
+                        var proc = recipeProcesses.Where(p => p.RecipeStatus == 3).ToList();
+                        if (proc != null && proc.Count > 0 && proc.Count == recipeProcesses.Count)
+                        {
+                            int recipIndex = Array.FindIndex(Recipes.ToArray(), p => p.RecipeName == CurrentRecipeName);
+                            if (recipIndex >= 0 && recipIndex < Recipes.Count)
+                            {
+                                for (int n = 0; n < recipeProcesses.Count; n++)
+                                {
+                                    DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(recipIndex).RawMaterials.ElementAt(n).DeviceIp).StatusReset();//完成配料的设备运行状态地址写0
+                                    MessageNotify.GetInstance.ShowRunLog(Recipes.ElementAt(recipIndex).RawMaterials.ElementAt(n).DeviceIp);
+                                }
+                                App.Current.Dispatcher.Invoke(new Action(() => { recipeProcesses.Clear(); }));
+                                Recipes.ElementAt(recipIndex).IsEnable = true;
+                                Recipes.ElementAt(recipIndex).Are.Set();
+                            }
+                        }
+
+
+
+
+                        //Recipes.ElementAt(i).RawMaterials.ElementAt(m).RecipeStatus = RunStatus;
+                        //var res = Recipes.ElementAt(i).RawMaterials.Where(p => p.RecipeStatus == 3).ToList();
+                        //if (res != null && res.Count == Recipes.ElementAt(i).RawMaterials.Count)//配方所有配料完成下料
+                        //{
+                        //    for (int r = 0; r < Recipes.ElementAt(i).RawMaterials.Count; r++)
+                        //    {
+                        //        DeviceInquire.GetInstance.GetDevice(Recipes.ElementAt(i).RawMaterials.ElementAt(r).DeviceIp).StatusReset();//完成配料的设备运行状态地址写0
+                        //        App.Current.Dispatcher.Invoke(new Action(() => { recipeProcesses.Clear(); }));  
+                        //    }
+                        //    Recipes.ElementAt(i).IsEnable = true;
+                        //    Recipes.ElementAt(i).Are.Set();
+                        //}
+                    }
+                }
+                Thread.Sleep(100);
+            }), "RecipeControlViewModelStatusInquire", true);
+            //测试数据
+            /*  RawMaterialModel rawMaterial_1 = new RawMaterialModel { RawMaterialName = "香料_1" };
+              RawMaterialModel rawMaterial_2 = new RawMaterialModel { RawMaterialName = "香料_2" };
+              RawMaterialModel rawMaterial_3 = new RawMaterialModel { RawMaterialName = "香料_3" };
+              RawMaterialModel rawMaterial_4 = new RawMaterialModel { RawMaterialName = "香料_4" };
+              ObservableCollection<RawMaterialModel> rawMaterials = new ObservableCollection<RawMaterialModel> { rawMaterial_1, rawMaterial_2, rawMaterial_3, rawMaterial_4 };
+              UserTreeCompelete.Add(new RecipeModel { RecipeName = "完成的香料1", RawMaterials = rawMaterials });
+              UserTreeCompelete.Add(new RecipeModel { RecipeName = "完成的香料2", RawMaterials = rawMaterials });*/
+
+        }
+
+        public RelayCommand<object> StartCommand { get; set; }
+
+        public RelayCommand<object> ChangeRecipeStateCommand { get; set; }
+
+        public static ObservableCollection<RecipeModel> Recipes { get; set; } = Json<LocaPar>.Data.Recipes;
+
+        public string CurrentRecipeName { get { return _RecipeName; } set { _RecipeName = value; OnPropertyChanged(); } }
+        private static string _RecipeName;
+
+        /// <summary>
+        /// 当前正在制作的配方
+        /// </summary>
+
+        public static ObservableCollection<RawMaterialModel> recipeProcesses { get; set; } = new ObservableCollection<RawMaterialModel>();
+        /// <summary>
+        /// 等待制作的配方
+        /// </summary>
+        public static ObservableCollection<RecipeModel> UserTreeWait { get; set; } = new ObservableCollection<RecipeModel>();
+        /// <summary>
+        /// 已完成的配方
+        /// </summary>
+        public static ObservableCollection<RecipeModel> UserTreeCompelete { get; set; } = new ObservableCollection<RecipeModel>();
+
+
+        private void ChangeRecipeState(object o)
+        {
+            if (o == null)
+                return;
+            if (o is string id)
+            {
+                var res = recipeProcesses.FirstOrDefault(p => p.RawMaterialId == id);
+                if (res != null)
+                {
+                    if (res.RecipeStatus == 3)
+                    {
+                        res.RecipeStatus = 1;
+                    }
+                    else
+                    {
+                        res.RecipeStatus = 3;
+                    }
+                }
+            }
+        }
+    }
+
+
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/RecipeInfosViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/RecipeInfosViewModel.cs
new file mode 100644
index 00000000..52976b37
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/RecipeInfosViewModel.cs
@@ -0,0 +1,68 @@
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class RecipeInfosViewModel : ObservableObject
+    {
+        public RecipeInfosViewModel()
+        {
+
+            ActionManage.GetInstance.CancelRegister("RecipeInfo");
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o != null && o is RemoteRecipeData rm)
+                {
+                    RecipeName = rm.RecipeName;
+                    RecipeCode = rm.RecipeCode;
+                    TrayCode = rm.TrayCode;
+                    foreach (var item in rm.RawMaterial)
+                    {
+                        //RawMaterialsInfo.Add(item);
+
+                        var res = Json<DevicePar>.Data.rawMaterialStockBin.FirstOrDefault(p => p.RawMaterialLocation == item.RawMaterialLocation);
+                        if (res != null && !string.IsNullOrEmpty(res.RawMaterialName))
+                        {
+                            var temp = Json<DevicePar>.Data.BomMaterial.FirstOrDefault(p => p.MaterialCode == res.RawMaterialName);
+                            if (temp != null && !string.IsNullOrEmpty(temp.MaterialName))
+                            {
+                                item.RawMaterialName = temp.MaterialName;
+                            }
+                        }
+                        RawMaterialsInfo.Add(new RemoteRecipeRawMaterial()
+                        {
+                            RawMaterialType = item.RawMaterialType,
+                            RawMaterialName = item.RawMaterialName,
+                            RawMaterialWeight = item.RawMaterialWeight,
+                            RawMaterialLocation = item.RawMaterialLocation,
+                            RawMaterialBarrelNum = item.RawMaterialBarrelNum,
+                        });
+                    }
+                }
+            }), "RecipeInfo");
+
+            ReturnPage = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("CloseRecipeInfosView");
+            });
+        }
+
+        public string RecipeName { get { return _mRecipeName; } set { _mRecipeName = value; OnPropertyChanged(); } }
+        private string _mRecipeName;
+
+        public string RecipeCode { get { return _mRecipeCode; } set { _mRecipeCode = value; OnPropertyChanged(); } }
+        private string _mRecipeCode;
+
+        public int TrayCode { get { return _mTrayCode; } set { _mTrayCode = value; OnPropertyChanged(); } }
+        private int _mTrayCode;
+
+        public RelayCommand ReturnPage { get; set; }
+
+        public ObservableCollection<RemoteRecipeRawMaterial> RawMaterialsInfo { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>();
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/RecipeReceiveViewModel.cs
new file mode 100644
index 00000000..b455ddc6
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/RecipeReceiveViewModel.cs
@@ -0,0 +1,199 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.FoodStationTest.View;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class RecipeReceiveViewModel : ObservableObject
+    {
+        //ObservableCollection<RemoteRecipeRawMaterial> RawMaterials { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>();
+        public RecipeReceiveViewModel()
+        {
+            NotUseSmallDosing = GVL_SmallStation.GetInstance.NotUseSmallStation;
+            IsUseLocalRecipe = GVL_SmallStation.GetInstance.IsUseLocalRecipe;
+            IsUseWindSendDosing = GVL_SmallStation.GetInstance.IsUseWindSend;
+            Recipes = Json<LocalRecipeDataColl>.Data.Recipes;
+
+            NewRecipe = new RelayCommand(() =>
+            {
+                NewLocalRecipeView NewLocalRecipe = new NewLocalRecipeView();
+                NewLocalRecipe.ShowDialog();
+            });
+            RemoveRecipe = new RelayCommand<object>((o) =>
+            {
+                if (o != null && o is string cnt)
+                {
+                    if (MessageNotify.GetInstance.ShowDialog($"请确认，是否删除订单【{cnt}】？"))
+                    {
+                        var res = Json<LocalRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
+                        if (res != null)
+                        {
+                            Json<LocalRecipeDataColl>.Data.Recipes.Remove(res);
+                            MessageNotify.GetInstance.ShowUserLog($"删除配方——{res.RecipeName}");
+                        }
+                    }
+                }
+            });
+            DetailsCommand = new RelayCommand<object>((o) =>
+            {
+                if (o != null && o is string cnt)
+                {
+                    if (MessageNotify.GetInstance.ShowDialog($"请确认，是否进行编辑订单【{cnt}】操作？"))
+                    {
+                        //ActionManage.GetInstance.Send("CloseNewRemoteRecipeView");
+                        NewLocalRecipeView nrv = new NewLocalRecipeView();
+                        var res = Json<LocalRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
+                        if (res != null)
+                        {
+                            ActionManage.GetInstance.Send("LocalRecipeEdit", res);
+                            nrv.ShowDialog();
+                            MessageNotify.GetInstance.ShowUserLog($"编辑配方——{res.RecipeName}");
+                        }
+                    }
+                }
+            });
+            IssueRecipe = new RelayCommand<object>((o) =>
+            {
+                if (IsUseLocalRecipe == false)
+                {
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"未处于本地模拟配方状态!");
+                    return;
+                }
+                else
+                {
+                    if (o != null && o is string cnt)
+                    {
+                        var res = Json<LocalRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
+                        var res1 = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
+                        if (MessageNotify.GetInstance.ShowDialog($"请确认，是否进行下发订单【{cnt}】操作？"))
+                        {
+                            if (res1 != null)
+                            {
+                                NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"远程已经存在该配方!");
+                                return;
+                            }
+                            if (res != null && res1 == null)
+                            {
+                                ActionManage.GetInstance.Send("LocalSimulationRecipeIssue", res);
+                                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{res.RecipeName}配方下发成功!");
+                                MessageNotify.GetInstance.ShowUserLog($"下发本地模拟配方——{res.RecipeName}");
+                            }
+                            GVL_SmallStation.GetInstance.LatestIssueRecipe = DateTime.Now;
+                        }
+                    }
+                }
+            });
+            NewSimulateRecipe = new RelayCommand(() =>
+            {
+                ObservableCollection<RemoteRecipeRawMaterial> RawMaterials = new ObservableCollection<RemoteRecipeRawMaterial>();
+                string recipeName = "配方" + (Json<LocalRecipeDataColl>.Data.Recipes.Count + 1) + "";
+go:
+                string recipeCode = new Random().Next(1000, 9999).ToString();
+                foreach (var item in Json<LocalRecipeDataColl>.Data.Recipes)
+                {
+                    if (item.RecipeCode == recipeCode)
+                    {
+                        goto go;
+                    }
+                }
+                int trayCode = new Random().Next(1, 2);
+                for (int i = 1; i < 16; i++)
+                {
+                    RawMaterials.Add(new RemoteRecipeRawMaterial()
+                    {
+                        RawMaterialName = "原料" + i,
+                        RawMaterialType = "小料",
+                        RawMaterialWeight = (float)Math.Round(new Random().Next(200, 300) * 0.001, 3),
+                        RawMaterialBarrelNum = (short)new Random().Next(6, 9),
+                        RawMaterialLocation = i,
+                    });
+                }
+                if (GVL_SmallStation.GetInstance.IsUseWindSend && trayCode == 1)
+                {
+                    for (int i = 1; i < 6; i++)
+                    {
+                        RawMaterials.Add(new RemoteRecipeRawMaterial()
+                        {
+                            RawMaterialName = "粉料" + i,
+                            RawMaterialType = "粉料",
+                            RawMaterialWeight = new Random().Next(1, 6),
+                            RawMaterialLocation = i,
+                            RawMaterialBarrelNum = 3
+                        });
+                    }
+                }
+                var res = Array.FindIndex(Json<LocalRecipeDataColl>.Data.Recipes.ToArray(), p => p.RecipeCode == recipeCode);
+                if (res < 0)
+                {
+                    Json<LocalRecipeDataColl>.Data.Recipes.Add(new RemoteRecipeData()
+                    {
+                        RecipeName = recipeName,
+                        RecipeCode = recipeCode,
+                        TrayCode = trayCode,
+                        RawMaterial = RawMaterials,
+                    });
+                }
+
+            });
+            ClearAllRecipe = new RelayCommand(() =>
+            {
+                if (MessageNotify.GetInstance.ShowDialog("请确认，是否清除所有本地配方？", DialogType.Warning))
+                {
+                    Json<LocalRecipeDataColl>.Data.Recipes.Clear();
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"本地配方清空成功。");
+                    MessageNotify.GetInstance.ShowUserLog("手动清除所有本地配方");
+                }
+            });
+
+
+            SelectedRecipes = Json<LocalRecipeDataColl>.Data.SelectedRecipes;
+            SelectRecipesCommand = new RelayCommand(() =>
+            {
+                var selectView = new SelectRecipesView();
+                selectView.ShowDialog();
+
+                Json<LocalRecipeDataColl>.Data.SelectedRecipes.Clear();
+                foreach (var recipe in SelectRecipesViewModel.SelectRecipes)
+                {
+                    if (recipe != null && !Json<LocalRecipeDataColl>.Data.SelectedRecipes.Any(p => p.RecipeCode == recipe.RecipeCode))
+                    {
+                        Json<LocalRecipeDataColl>.Data.SelectedRecipes.Add(recipe);
+                    }
+                }
+                //不保存会导致下次打开本地配方下发页面，会重新读取之前存储的文件。
+                Json<LocalRecipeDataColl>.Save();
+            });
+        }
+
+        public bool NotUseSmallDosing { get { return _mNotUseSmallDosing; } set { _mNotUseSmallDosing = value; OnPropertyChanged(); } }
+        private bool _mNotUseSmallDosing;
+
+        public bool IsUseLocalRecipe { get { return _mIsUseLocalRecipe; } set { _mIsUseLocalRecipe = value; OnPropertyChanged(); } }
+        private bool _mIsUseLocalRecipe;
+
+        public bool IsUseWindSendDosing { get { return _mIsUseWindSendDosing; } set { _mIsUseWindSendDosing = value; OnPropertyChanged(); } }
+        private bool _mIsUseWindSendDosing;
+
+        /// <summary>
+        /// 筛选后的配方列表。
+        /// </summary>
+        public static ObservableCollection<RemoteRecipeData> SelectedRecipes { get; set; }
+
+        public RelayCommand<object> DetailsCommand { get; set; }
+        public RelayCommand<object> IssueRecipe { get; set; }
+        public RelayCommand<object> RemoveRecipe { get; set; }
+        public RelayCommand NewSimulateRecipe { get; set; }
+        public RelayCommand ClearAllRecipe { get; set; }
+        public RelayCommand NewRecipe { get; set; }
+        public RelayCommand SelectRecipesCommand { get; set; }
+        public ObservableCollection<RemoteRecipeData> Recipes { get; set; }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/RecipeSettingsViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/RecipeSettingsViewModel.cs
new file mode 100644
index 00000000..57c7fcde
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/RecipeSettingsViewModel.cs
@@ -0,0 +1,77 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.FoodStationTest.View;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class RecipeSettingsViewModel : ObservableObject
+    {
+        public RecipeSettingsViewModel()
+        {
+            Recipes = Json<LocaPar>.Data.Recipes;
+
+            NewMaterital = new RelayCommand(() =>
+            {
+                NewMaterialView newMateritalView = new NewMaterialView();
+                newMateritalView.ShowDialog();
+            });
+            NewRecipe = new RelayCommand(() =>
+            {
+                NewRecipeView nrv = new NewRecipeView();
+                nrv.ShowDialog();
+                MessageNotify.GetInstance.ShowUserLog("新建配方");
+            });
+            SaveRecipe = new RelayCommand(() =>
+            {
+                Json<LocaPar>.Save();
+                MessageNotify.GetInstance.ShowUserLog("保存配方");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"配方保存成功!");
+            });
+            RemoveCommand = new RelayCommand<object>((o) =>
+            {
+                if (o is string str)
+                {
+                    var res = Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipCode == str);
+                    if (res != null)
+                        Json<LocaPar>.Data.Recipes.Remove(res);
+                    MessageNotify.GetInstance.ShowUserLog($"删除名称——{res.RecipeName}");
+                }
+            });
+
+            DetailsCommand = new RelayCommand<object>((o) =>
+            {
+                if (o != null && o is string str)
+                {
+                    ActionManage.GetInstance.CancelRegister("Details");
+                    NewRecipeView nrv = new NewRecipeView();
+                    var res = Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipCode == str);
+                    ActionManage.GetInstance.Send("Details", res);
+                    nrv.ShowDialog();
+                    MessageNotify.GetInstance.ShowUserLog($"编辑配方名称——{res.RecipeName}");
+                }
+            });
+
+        }
+
+        public RelayCommand NewMaterital { get; set; }
+
+        public RelayCommand NewRecipe { get; set; }
+
+        public RelayCommand SaveRecipe { get; set; }
+
+        public RelayCommand<object> EditCommand { get; set; }
+
+        public RelayCommand<object> DetailsCommand { get; set; }
+
+        public RelayCommand<object> RemoveCommand { get; set; }
+
+        public ObservableCollection<RecipeModel> Recipes { get; set; }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/RobotViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/RobotViewModel.cs
new file mode 100644
index 00000000..3824d07d
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/RobotViewModel.cs
@@ -0,0 +1,129 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class RobotViewModel : ObservableObject
+    {
+        public RobotViewModel()
+        {
+            ThreadManage.GetInstance().StartLong(() =>
+            {
+                IsRunProgramNum = GVL_SmallStation.GetInstance.RobotProgramNum;
+                RobotIsAutoMode = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(2);
+                RobotIsAutoRun = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(3);
+                RobotIsStop = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(4);
+                RobotIsRun = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(5);
+                RobotIsAlarm = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(6);
+                RobotIsHomed = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(7);
+                //RobotGetEmptyBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(8);
+                //RobotPutEmptyBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(9);
+                //RobotGetFullBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(10);
+                //RobotPutFullBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(11);
+
+                Thread.Sleep(10);
+
+            }, "机器人状态", true);
+            SystemStart = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX0.1");
+                MessageNotify.GetInstance.ShowUserLog($"手动控制，机器人启动");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"机器人启动，操作完成!");
+            });
+            SystemStop = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX0.2");
+                MessageNotify.GetInstance.ShowUserLog($"手动控制，机器人停止");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"机器人停止，操作完成!");
+            });
+            EStopReset = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX0.3");
+                MessageNotify.GetInstance.ShowUserLog($"手动控制，机器人急停复位");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"机器人急停复位，操作完成!");
+            });
+
+            //TestRobotRun = new RelayCommand(() => {
+            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.4");
+            //});
+            //AutoMode = new RelayCommand(() => {
+            //    ActionManage.GetInstance.Send("RobotSendFalseCommand", "DB4.DBX100.3");
+            //});
+            //TestMode = new RelayCommand(() => {
+            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.3");
+            //});
+
+            //RobotGetEmptyBarrel = new RelayCommand(() => {
+            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.7");
+            //});
+            //RobotPutEmptyBarrel = new RelayCommand(() => {
+            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.0");
+            //});
+            //RobotGetFullBarrel = new RelayCommand(() => {
+            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.1");
+            //});
+            //RobotPutFullBarrel = new RelayCommand(() => {
+            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.2");
+            //});
+            //SetProgramNumCommand = new RelayCommand(() =>{
+            //    ActionManage.GetInstance.Send("RobotSetProgramNum", SetProgramNum);
+            //});
+        }
+        public RelayCommand SystemStart { get; set; }
+        public RelayCommand SystemStop { get; set; }
+        public RelayCommand EStopReset { get; set; }
+
+        public RelayCommand TestRobotRun { get; set; }
+        public RelayCommand AutoMode { get; set; }
+        public RelayCommand TestMode { get; set; }
+
+        public RelayCommand RobotGetEmptyBarrel { get; set; }
+        public RelayCommand RobotPutEmptyBarrel { get; set; }
+        public RelayCommand RobotGetFullBarrel { get; set; }
+        public RelayCommand RobotPutFullBarrel { get; set; }
+        public RelayCommand SetProgramNumCommand { get; set; }
+
+        public static short IsRunProgramNum { get { return _runProgramNum; } set { _runProgramNum = value; OnStaticPropertyChanged(); } }
+        private static short _runProgramNum;
+        public short SetProgramNum { get { return _SetProgramNum; } set { _SetProgramNum = value; OnPropertyChanged(); } }
+        private short _SetProgramNum;
+
+        public static bool RobotIsAutoMode { get { return _RobotIsAutoMode; } set { _RobotIsAutoMode = value; OnStaticPropertyChanged(); } }
+        private static bool _RobotIsAutoMode;
+        public static bool RobotIsAutoRun { get { return _RobotIsAutoRun; } set { _RobotIsAutoRun = value; OnStaticPropertyChanged(); } }
+        private static bool _RobotIsAutoRun;
+        public static bool RobotIsStop { get { return _RobotIsStop; } set { _RobotIsStop = value; OnStaticPropertyChanged(); } }
+        private static bool _RobotIsStop;
+        public static bool RobotIsRun { get { return _RobotIsRun; } set { _RobotIsRun = value; OnStaticPropertyChanged(); } }
+        private static bool _RobotIsRun;
+        public static bool RobotIsAlarm { get { return _RobotIsAlarm; } set { _RobotIsAlarm = value; OnStaticPropertyChanged(); } }
+        private static bool _RobotIsAlarm;
+        public static bool RobotIsHomed { get { return _RobotIsHomed; } set { _RobotIsHomed = value; OnStaticPropertyChanged(); } }
+        private static bool _RobotIsHomed;
+        public bool RobotGetEmptyBarrelComplete { get { return _RobotGetEmptyBarrelComplete; } set { _RobotGetEmptyBarrelComplete = value; OnPropertyChanged(); } }
+        private bool _RobotGetEmptyBarrelComplete;
+        public bool RobotPutEmptyBarrelComplete { get { return _RobotPutEmptyBarrelComplete; } set { _RobotPutEmptyBarrelComplete = value; OnPropertyChanged(); } }
+        private bool _RobotPutEmptyBarrelComplete;
+        public bool RobotGetFullBarrelComplete { get { return _RobotGetFullBarrelComplete; } set { _RobotGetFullBarrelComplete = value; OnPropertyChanged(); } }
+        private bool _RobotGetFullBarrelComplete;
+
+        public bool RobotPutFullBarrelComplete { get { return _RobotPutFullBarrelComplete; } set { _RobotPutFullBarrelComplete = value; OnPropertyChanged(); } }
+        private bool _RobotPutFullBarrelComplete;
+
+
+        public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
+        public static void OnStaticPropertyChanged([CallerMemberName] string PropName = "")
+        {
+            StaticPropertyChanged?.Invoke(null, new PropertyChangedEventArgs(PropName));
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/SelectRecipesViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/SelectRecipesViewModel.cs
new file mode 100644
index 00000000..4e01ecc2
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/SelectRecipesViewModel.cs
@@ -0,0 +1,109 @@
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    internal class SelectRecipesViewModel : ObservableObject
+    {
+        public SelectRecipesViewModel()
+        {
+            AllRecipes = new();
+            foreach (var item in Json<LocalRecipeDataColl>.Data.SelectedRecipes)
+            {
+                SelectRecipes.Add(item);
+            }
+
+            if (Json<LocalRecipeDataColl>.Data.Recipes != null)
+            {
+                foreach (var item in Json<LocalRecipeDataColl>.Data.Recipes)
+                {
+                    AllRecipes.Add(new RecipeDataWithCheck()
+                    {
+                        Recipe = item,
+                        IsSelected = SelectRecipes.Any(p => p.RecipeCode == item.RecipeCode)
+                    });
+                }
+            }
+
+
+            ConfirmCommand = new(() =>
+            {
+                RefreshSelected();
+                ActionManage.GetInstance.Send("CloseSelectRecipesView");
+            });
+
+            CancelCommand = new(() =>
+            {
+                ActionManage.GetInstance.Send("CloseSelectRecipesView");
+            });
+
+            AllSelectCommand = new(() =>
+            {
+                foreach (var item in AllRecipes)
+                {
+                    item.IsSelected = true;
+                }
+            });
+
+            AllCancelCommand = new(() =>
+            {
+                foreach (var item in AllRecipes)
+                {
+                    item.IsSelected = false;
+                }
+            });
+
+        }
+
+        private void RefreshSelected()
+        {
+            SelectRecipes.Clear();
+            foreach (var item in AllRecipes)
+            {
+                if (item.IsSelected == true)
+                {
+                    SelectRecipes.Add(item.Recipe);
+                }
+            }
+        }
+
+        public ObservableCollection<RecipeDataWithCheck> AllRecipes { get; set; }
+
+        public static ObservableCollection<RemoteRecipeData> SelectRecipes { get; set; } = new ObservableCollection<RemoteRecipeData>();
+
+        /// <summary>
+        /// 取消筛选，即关闭本窗口。
+        /// </summary>
+        public RelayCommand CancelCommand { get; set; }
+        /// <summary>
+        /// 全选。
+        /// </summary>
+        public RelayCommand AllSelectCommand { get; set; }
+        /// <summary>
+        /// 全部取消选择。
+        /// </summary>
+        public RelayCommand AllCancelCommand { get; set; }
+        /// <summary>
+        /// 确认选择。
+        /// </summary>
+        public RelayCommand ConfirmCommand { get; set; }
+
+
+        internal class RecipeDataWithCheck : ObservableObject
+        {
+            public RemoteRecipeData Recipe { get; set; }
+            private bool _IsSelected;
+
+            public bool IsSelected
+            {
+                get { return _IsSelected; }
+                set { _IsSelected = value; OnPropertyChanged(); }
+            }
+
+        }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/SiemensRecipeReceiveViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/SiemensRecipeReceiveViewModel.cs
new file mode 100644
index 00000000..e8ddde40
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/SiemensRecipeReceiveViewModel.cs
@@ -0,0 +1,47 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.FoodStationTest.View;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class SiemensRecipeReceiveViewModel : ObservableObject
+    {
+        //ObservableCollection<RemoteRecipeRawMaterial> RawMaterials { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>();
+        public SiemensRecipeReceiveViewModel()
+        {
+            Recipes = Json<RemoteRecipeDataColl>.Data.Recipes;
+            DetailsCommand = new RelayCommand<object>((o) =>
+            {
+                if (o != null && o is string cnt)
+                {
+                    ActionManage.GetInstance.Send("CloseRecipeInfosView");
+                    RecipeInfosView nrv = new RecipeInfosView();
+
+                    var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
+                    if (res != null)
+                    {
+                        ActionManage.GetInstance.Send("RecipeInfo", res);
+                        nrv.Show();
+                        MessageNotify.GetInstance.ShowUserLog($"查看配方——{res.RecipeName}");
+                    }
+                }
+            });
+            ClearAllRecipe = new RelayCommand(() =>
+            {
+                if (MessageNotify.GetInstance.ShowDialog($"请确认，是否删除所有配方订单？"))
+                {
+                    Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
+                    MessageNotify.GetInstance.ShowUserLog($"手动清除所有配方。");
+                }
+            });
+        }
+        public RelayCommand<object> DetailsCommand { get; set; }
+        public RelayCommand ClearAllRecipe { get; set; }
+        public ObservableCollection<RemoteRecipeData> Recipes { get; set; }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/StockBinRawMaterialViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/StockBinRawMaterialViewModel.cs
new file mode 100644
index 00000000..ab6f1a8c
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/StockBinRawMaterialViewModel.cs
@@ -0,0 +1,50 @@
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.FoodStationTest.Model.RawMaterial;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class StockBinRawMaterialViewModel : ObservableObject
+    {
+        public StockBinRawMaterialViewModel()
+        {
+            RawMaterialInfo = Json<DevicePar>.Data.rawMaterialStockBin;
+            RemoveCommand = new RelayCommand<Object>((loc) =>
+            {
+                if (loc is int pos)
+                {
+                    var res = RawMaterialInfo.FirstOrDefault(p => p.RawMaterialLocation == pos);
+                    if (res != null)
+                        RawMaterialInfo.Remove(res);
+                }
+            });
+            SaveRawMaterialPara = new RelayCommand(() =>
+            {
+                Json<DevicePar>.Save();
+                ProcessControl.GetInstance.StockBinNameWithPos();
+                foreach (var item in Json<DevicePar>.Data.rawMaterialStockBin)
+                {
+                    MessageNotify.GetInstance.ShowUserLog($"料仓位置:" + item.RawMaterialLocation + ",物料编码:" + item.RawMaterialName);
+                }
+                MessageNotify.GetInstance.ShowUserLog($"原料与料仓对应关系保存成功");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"原料与料仓对应关系保存成功");
+            });
+            UpdateRawMaterial = new RelayCommand(() =>
+            {
+                RawMaterialInfo.Add(new RawMaterialStockBin() { RawMaterialCount = (short)(RawMaterialInfo.Count + 1) });
+            });
+        }
+        public ObservableCollection<RawMaterialStockBin> RawMaterialInfo { get; set; } = new ObservableCollection<RawMaterialStockBin>();
+        public RelayCommand<Object> RemoveCommand { get; set; }
+        public RelayCommand SaveRawMaterialPara { get; set; }
+        public RelayCommand UpdateRawMaterial { get; set; }
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/SystemParViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/SystemParViewModel.cs
new file mode 100644
index 00000000..89778fbc
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/SystemParViewModel.cs
@@ -0,0 +1,85 @@
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.FoodStationTest.Model.HK_PLC;
+using BPASmartClient.FoodStationTest.Model.Par;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class SystemParViewModel : ObservableObject
+    {
+        public SystemParViewModel()
+        {
+            SiemensConnect = Json<DevicePar>.Data.deviceConnectPar.SiemensConnect;
+            WindSendConnect = Json<DevicePar>.Data.deviceConnectPar.WindSendConnect;
+            HKPlcConnect = Json<DevicePar>.Data.deviceConnectPar.HKPlcConnect;
+            ShieldStockbinAlarm = Json<DevicePar>.Data.deviceConnectPar.ShieldStockbinAlarm;
+
+            AxisLoadSpeed = Json<DevicePar>.Data.deviceConnectPar.AxisLoadSpeed;
+            AxisMidSpeed = Json<DevicePar>.Data.deviceConnectPar.AxisMidSpeed;
+            AxisUnLoadSpeed = Json<DevicePar>.Data.deviceConnectPar.AxisUnLoadSpeed;
+            AxisMidSpeed = Json<DevicePar>.Data.deviceConnectPar.AxisMidSpeed;
+            Axis1Speed = Json<DevicePar>.Data.deviceConnectPar.Axis1Speed;
+            Axis2Speed = Json<DevicePar>.Data.deviceConnectPar.Axis2Speed;
+            SaveCommand = new RelayCommand(() =>
+            {
+                Json<DevicePar>.Data.deviceConnectPar.SiemensConnect = SiemensConnect;
+                Json<DevicePar>.Data.deviceConnectPar.WindSendConnect = WindSendConnect;
+                Json<DevicePar>.Data.deviceConnectPar.HKPlcConnect = HKPlcConnect;
+                Json<DevicePar>.Data.deviceConnectPar.ShieldStockbinAlarm = ShieldStockbinAlarm;
+
+                Json<DevicePar>.Data.deviceConnectPar.AxisLoadSpeed = AxisLoadSpeed;
+                Json<DevicePar>.Data.deviceConnectPar.AxisMidSpeed = AxisMidSpeed;
+                Json<DevicePar>.Data.deviceConnectPar.AxisUnLoadSpeed = AxisUnLoadSpeed;
+                Json<DevicePar>.Data.deviceConnectPar.AxisMidSpeed = AxisMidSpeed;
+                Json<DevicePar>.Data.deviceConnectPar.Axis1Speed = Axis1Speed;
+                Json<DevicePar>.Data.deviceConnectPar.Axis2Speed = Axis2Speed;
+                Json<DevicePar>.Save();
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"参数保存成功!");
+            });
+            SetParCommand = new RelayCommand(() =>
+            {
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBD0", PlcVarType = PlcVarType.Real, Value = Axis1Speed });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBD4", PlcVarType = PlcVarType.Real, Value = Axis2Speed });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBW8", PlcVarType = PlcVarType.Int, Value = AxisLoadSpeed });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBW10", PlcVarType = PlcVarType.Int, Value = AxisMidSpeed });
+                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB47.DBW12", PlcVarType = PlcVarType.Int, Value = AxisUnLoadSpeed });
+
+                //ActionManage.GetInstance.Send("AxisLoadSpeedSet", AxisLoadSpeed);
+                //ActionManage.GetInstance.Send("AxisMidSpeedSet", AxisMidSpeed);
+                //ActionManage.GetInstance.Send("AxisUnLoadSpeedSet", AxisUnLoadSpeed);
+                //ActionManage.GetInstance.Send("Axis1SpeedSet", Axis1Speed);
+                //ActionManage.GetInstance.Send("Axis2SpeedSet", Axis2Speed);
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"参数设置成功!");
+            });
+        }
+
+        public ConnectParMode CommBaseParModel { get { return Json<DevicePar>.Data.deviceConnectPar; } set { Json<DevicePar>.Data.deviceConnectPar = value; OnPropertyChanged(); } }
+
+        public bool SiemensConnect { get { return _mSiemensConnect; } set { _mSiemensConnect = value; OnPropertyChanged(); } }
+        private bool _mSiemensConnect;
+        public bool WindSendConnect { get { return _mWindSendConnect; } set { _mWindSendConnect = value; OnPropertyChanged(); } }
+        private bool _mWindSendConnect;
+        public bool HKPlcConnect { get { return _mHKPlcConnect; } set { _mHKPlcConnect = value; OnPropertyChanged(); } }
+        private bool _mHKPlcConnect;
+        public bool ShieldStockbinAlarm { get { return _mShieldStockbinAlarm; } set { _mShieldStockbinAlarm = value; OnPropertyChanged(); } }
+        private bool _mShieldStockbinAlarm;
+
+        public short AxisLoadSpeed { get { return _mAxisLoadSpeed; } set { _mAxisLoadSpeed = value; OnPropertyChanged(); } }
+        private short _mAxisLoadSpeed;
+        public short AxisMidSpeed { get { return _mAxisMidSpeed; } set { _mAxisMidSpeed = value; OnPropertyChanged(); } }
+        private short _mAxisMidSpeed;
+        public short AxisUnLoadSpeed { get { return _mAxisUnLoadSpeed; } set { _mAxisUnLoadSpeed = value; OnPropertyChanged(); } }
+        private short _mAxisUnLoadSpeed;
+        public float Axis1Speed { get { return _mAxis1Speed; } set { _mAxis1Speed = value; OnPropertyChanged(); } }
+        private float _mAxis1Speed;
+        public float Axis2Speed { get { return _mAxis2Speed; } set { _mAxis2Speed = value; OnPropertyChanged(); } }
+        private float _mAxis2Speed;
+        public RelayCommand SaveCommand { get; set; }
+        public RelayCommand SetParCommand { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/WindSendParViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/WindSendParViewModel.cs
new file mode 100644
index 00000000..165f7821
--- /dev/null
+++ b/BPASmartClient.FoodStationTest/ViewModel/WindSendParViewModel.cs
@@ -0,0 +1,22 @@
+using BPASmartClient.FoodStationTest.Model;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+
+namespace BPASmartClient.FoodStationTest.ViewModel
+{
+    public class WindSendParViewModel : ObservableObject
+    {
+        public WindSendParViewModel()
+        {
+
+            SaveRawMaterialPara = new RelayCommand(() =>
+            {
+                Json<DevicePar>.Save();
+            });
+        }
+
+        public RelayCommand SaveRawMaterialPara { get; set; }
+
+    }
+}
diff --git a/BPASmartClient.FoodStationTest/hbl.ico b/BPASmartClient.FoodStationTest/hbl.ico
new file mode 100644
index 0000000000000000000000000000000000000000..cf89051a6e7c130919c9fd1049fc7910c4bf60fa
GIT binary patch
literal 4286
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
RJiT7{SG|5V_1~BP`!9((*n|K8

literal 0
HcmV?d00001

diff --git a/SmartClient.sln b/SmartClient.sln
index 6ba455e0..59658b17 100644
--- a/SmartClient.sln
+++ b/SmartClient.sln
@@ -214,7 +214,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MilkTeaCube"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.Update", "BPASmartClient.Update\BPASmartClient.Update.csproj", "{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.MorkMV1", "BPASmartClient.MorkMV1\BPASmartClient.MorkMV1.csproj", "{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkMV1", "BPASmartClient.MorkMV1\BPASmartClient.MorkMV1.csproj", "{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.FoodStationTest", "BPASmartClient.FoodStationTest\BPASmartClient.FoodStationTest.csproj", "{82D5C479-7C38-41D6-8B42-24D4EC32D94F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -2030,6 +2032,26 @@ Global
 		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Release|x64.Build.0 = Release|Any CPU
 		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Release|x86.ActiveCfg = Release|Any CPU
 		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB}.Release|x86.Build.0 = Release|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Debug|x64.Build.0 = Debug|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Debug|x86.Build.0 = Debug|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Release|ARM.Build.0 = Release|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Release|ARM64.Build.0 = Release|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Release|x64.ActiveCfg = Release|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Release|x64.Build.0 = Release|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Release|x86.ActiveCfg = Release|Any CPU
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2130,6 +2152,7 @@ Global
 		{915F0718-B7AC-428D-ACD5-7DAACC28539F} = {666CB1A9-562E-453A-A2C7-FD9D77CFDFDD}
 		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
 		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}
+		{82D5C479-7C38-41D6-8B42-24D4EC32D94F} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC}

From 54498f2e56a28a963d1bb10ef2aae79404ad02e0 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Fri, 9 Jun 2023 17:09:50 +0800
Subject: [PATCH 92/96] =?UTF-8?q?=E5=AF=B9=E6=96=B0=E5=A2=9E=E9=85=8D?=
 =?UTF-8?q?=E6=96=99=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F=E5=81=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.FoodStationTest/App.config     |   9 -
 BPASmartClient.FoodStationTest/App.xaml.cs    |  28 +-
 .../BPASmartClient.FoodStationTest.csproj     |  11 +-
 .../Converter/DataTableRedundantConverter.cs  |   0
 .../{Model => }/Converter/RunStatusConvert.cs |   0
 .../Model/GVL/GVL.cs                          |   6 -
 .../Model/GVL/ReadSmallMaterial.cs            | 111 -------
 .../Model/GVL/WriteSmallMaterial.cs           | 179 ----------
 .../Model/GVL_SmallStation.cs                 |   5 -
 .../Model/HK_PLC/HKDeviceRead.cs              |  10 -
 .../Model/HK_PLC/HKPlcCommAddress.cs          | 134 --------
 .../Model/HK_PLC/PlcManualComm.cs             |  12 -
 .../Model/Par/ConnectParMode.cs               |   5 +-
 .../Model/{RawMaterial => Par}/LocaPar.cs     |  10 +-
 .../Model/ProcessControl.cs                   |  38 ++-
 .../Model/RawMaterial/ActionMenu.cs           |  22 --
 .../Model/RawMaterial/ConveyorServer.cs       |  10 -
 .../Model/RawMaterial/CylinderStatusModel.cs  |  22 --
 .../Model/RawMaterial/DeviceAddress.cs        |   3 +
 .../Model/RawMaterial/DeviceInquire.cs        |  33 +-
 .../Model/RawMaterial/GlobalData.cs           |   7 -
 .../Model/RawMaterial/RecipeProcess.cs        |  15 -
 .../Model/Recipe/RemoteRecipeData.cs          |   4 +
 .../Model/Recipe/RemoteRecipeDataColl.cs      |   4 +-
 .../View/HardwareStatusView.xaml              |  21 +-
 .../View/ManualControlView.xaml               |   2 +-
 .../View/ManualFlowView.xaml                  |  28 +-
 .../View/RecipeReceiveView.xaml               |  11 +-
 .../View/RecipeReceiveView.xaml.cs            |   1 -
 .../View/RobotView.xaml                       | 308 ------------------
 .../View/RobotView.xaml.cs                    |  15 -
 .../View/SystemParView.xaml                   |  18 +-
 .../View/WindSendParView.xaml                 | 218 -------------
 .../View/WindSendParView.xaml.cs              |  16 -
 .../ViewModel/ChangeDeviceNameViewModel.cs    |   6 +-
 .../ViewModel/ManualControlViewModel.cs       |   4 +-
 .../ViewModel/NewRecipeViewModel.cs           |  18 +-
 .../ViewModel/RecipeControlViewModel.cs       |   2 +-
 .../ViewModel/RecipeReceiveViewModel.cs       |   3 +-
 .../ViewModel/RecipeSettingsViewModel.cs      |  10 +-
 .../ViewModel/RobotViewModel.cs               | 129 --------
 .../ViewModel/SystemParViewModel.cs           |   8 -
 .../ViewModel/WindSendParViewModel.cs         |  22 --
 43 files changed, 105 insertions(+), 1413 deletions(-)
 delete mode 100644 BPASmartClient.FoodStationTest/App.config
 rename BPASmartClient.FoodStationTest/{Model => }/Converter/DataTableRedundantConverter.cs (100%)
 rename BPASmartClient.FoodStationTest/{Model => }/Converter/RunStatusConvert.cs (100%)
 delete mode 100644 BPASmartClient.FoodStationTest/Model/GVL/GVL.cs
 delete mode 100644 BPASmartClient.FoodStationTest/Model/GVL/ReadSmallMaterial.cs
 delete mode 100644 BPASmartClient.FoodStationTest/Model/GVL/WriteSmallMaterial.cs
 delete mode 100644 BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceRead.cs
 delete mode 100644 BPASmartClient.FoodStationTest/Model/HK_PLC/HKPlcCommAddress.cs
 delete mode 100644 BPASmartClient.FoodStationTest/Model/HK_PLC/PlcManualComm.cs
 rename BPASmartClient.FoodStationTest/Model/{RawMaterial => Par}/LocaPar.cs (60%)
 delete mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/ActionMenu.cs
 delete mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/ConveyorServer.cs
 delete mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/CylinderStatusModel.cs
 delete mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/GlobalData.cs
 delete mode 100644 BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeProcess.cs
 delete mode 100644 BPASmartClient.FoodStationTest/View/RobotView.xaml
 delete mode 100644 BPASmartClient.FoodStationTest/View/RobotView.xaml.cs
 delete mode 100644 BPASmartClient.FoodStationTest/View/WindSendParView.xaml
 delete mode 100644 BPASmartClient.FoodStationTest/View/WindSendParView.xaml.cs
 delete mode 100644 BPASmartClient.FoodStationTest/ViewModel/RobotViewModel.cs
 delete mode 100644 BPASmartClient.FoodStationTest/ViewModel/WindSendParViewModel.cs

diff --git a/BPASmartClient.FoodStationTest/App.config b/BPASmartClient.FoodStationTest/App.config
deleted file mode 100644
index a50b26f3..00000000
--- a/BPASmartClient.FoodStationTest/App.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<appSettings>
-		<add key="RawMaterial_IP" value="107.107.2."/>
-		<add key="HKPlc_IP" value="107.107.2.88"/>
-		<add key="Siemens_IP" value="107.107.2.200"/>
-		<add key="WindSend_IP" value="107.107.2.210"/>
-	</appSettings>
-</configuration>
\ No newline at end of file
diff --git a/BPASmartClient.FoodStationTest/App.xaml.cs b/BPASmartClient.FoodStationTest/App.xaml.cs
index bd3ba7a8..082df6f2 100644
--- a/BPASmartClient.FoodStationTest/App.xaml.cs
+++ b/BPASmartClient.FoodStationTest/App.xaml.cs
@@ -35,7 +35,8 @@ namespace BPASmartClient.FoodStationTest
             DataInit();
             Init();
             MainView mv = new MainView();
-            mv.TitleName = "自动化产线-小料站上位机控制系统";
+            //TODO：修改软件名称。
+            mv.TitleName = "自动化产线-上位机控制系统";
             LoginView lv = new LoginView();
             var res = lv.ShowDialog();
             if (res != null && res == true)
@@ -45,7 +46,7 @@ namespace BPASmartClient.FoodStationTest
             }
             else
                 mv.Close();
-            GVL_SmallStation.GetInstance.RecipeDosingCompleNum = Json<LocaPar>.Data.RecipeDosingCompleNum;
+            GVL_SmallStation.GetInstance.RecipeDosingCompleNum = Json<LocalPar>.Data.RecipeDosingCompleNum;
             MainWindow = mv;
         }
         private async void Init()
@@ -60,8 +61,8 @@ namespace BPASmartClient.FoodStationTest
         protected override void OnExit(ExitEventArgs e)
         {
             base.OnExit(e);
-            Json<LocaPar>.Data.RecipeDosingCompleNum = GVL_SmallStation.GetInstance.RecipeDosingCompleNum;
-            Json<LocaPar>.Save();
+            Json<LocalPar>.Data.RecipeDosingCompleNum = GVL_SmallStation.GetInstance.RecipeDosingCompleNum;
+            Json<LocalPar>.Save();
             Json<LocalRecipeDataColl>.Save();
             Json<RemoteRecipeDataColl>.Save();
             MessageNotify.GetInstance.LogSave();
@@ -122,13 +123,6 @@ namespace BPASmartClient.FoodStationTest
                 ToggleWindowPath = "View.DeviceMaterialParView"
             });
             ParSet.Add(new SubMenumodel()
-            {
-                SubMenuName = "粉仓参数设置",
-                SubMenuPermission = new Permission[] { Permission.管理员 },
-                AssemblyName = "BPASmartClient.FoodStationTest",
-                ToggleWindowPath = "View.WindSendParView"
-            });
-            ParSet.Add(new SubMenumodel()
             {
                 SubMenuName = "系统参数设置",
                 SubMenuPermission = new Permission[] { Permission.管理员 },
@@ -183,14 +177,6 @@ namespace BPASmartClient.FoodStationTest
                 AssemblyName = "BPASmartClient.FoodStationTest",
                 ToggleWindowPath = "View.ManualFlowView"
 
-            });
-            ManualControl.Add(new SubMenumodel()
-            {
-                SubMenuName = "机器人设备控制",
-                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
-                AssemblyName = "BPASmartClient.FoodStationTest",
-                ToggleWindowPath = "View.RobotView"
-
             });
 
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
@@ -239,7 +225,7 @@ namespace BPASmartClient.FoodStationTest
             InfoLog.Add(new SubMenumodel()
             {
                 SubMenuName = "调试日志",
-                SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员, Permission.技术员 },
+                SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员 },
                 AssemblyName = "BPASmartClient.CustomResource",
                 ToggleWindowPath = "Pages.View.DebugLogView"
             });
@@ -339,7 +325,7 @@ namespace BPASmartClient.FoodStationTest
         private void DataInit()
         {
             //Config.GetInstance.Init();
-            Json<LocaPar>.Read();
+            Json<LocalPar>.Read();
             Json<DevicePar>.Read();
             Json<LocalRecipeDataColl>.Read();
             Json<RemoteRecipeDataColl>.Read();
diff --git a/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj b/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj
index abe64643..d2dee7d7 100644
--- a/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj
+++ b/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Communication" Version="1.0.104" />
+    <PackageReference Include="BPA.Communication" Version="1.0.105" />
   </ItemGroup>
 
   <ItemGroup>
@@ -30,9 +30,6 @@
     <Compile Update="View\ManualFlowView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="View\RobotView.xaml.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Update="View\SelectRecipesView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -81,9 +78,6 @@
     <Page Update="View\RecipeSettingsView.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
     </Page>
-    <Page Update="View\RobotView.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
     <Page Update="View\SiemensRecipeReceiveView.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
     </Page>
@@ -93,9 +87,6 @@
     <Page Update="View\SystemParView.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
     </Page>
-    <Page Update="View\WindSendParView.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
   </ItemGroup>
 
 </Project>
diff --git a/BPASmartClient.FoodStationTest/Model/Converter/DataTableRedundantConverter.cs b/BPASmartClient.FoodStationTest/Converter/DataTableRedundantConverter.cs
similarity index 100%
rename from BPASmartClient.FoodStationTest/Model/Converter/DataTableRedundantConverter.cs
rename to BPASmartClient.FoodStationTest/Converter/DataTableRedundantConverter.cs
diff --git a/BPASmartClient.FoodStationTest/Model/Converter/RunStatusConvert.cs b/BPASmartClient.FoodStationTest/Converter/RunStatusConvert.cs
similarity index 100%
rename from BPASmartClient.FoodStationTest/Model/Converter/RunStatusConvert.cs
rename to BPASmartClient.FoodStationTest/Converter/RunStatusConvert.cs
diff --git a/BPASmartClient.FoodStationTest/Model/GVL/GVL.cs b/BPASmartClient.FoodStationTest/Model/GVL/GVL.cs
deleted file mode 100644
index e918fcf4..00000000
--- a/BPASmartClient.FoodStationTest/Model/GVL/GVL.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace BPASmartClient.FoodStationTest.Model.GVL
-{
-    public class GVL
-    {
-    }
-}
diff --git a/BPASmartClient.FoodStationTest/Model/GVL/ReadSmallMaterial.cs b/BPASmartClient.FoodStationTest/Model/GVL/ReadSmallMaterial.cs
deleted file mode 100644
index 70702c4c..00000000
--- a/BPASmartClient.FoodStationTest/Model/GVL/ReadSmallMaterial.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-namespace BPASmartClient.FoodStationTest.Model.GVL
-{
-    public class ReadSmallMaterial
-    {
-        /// <summary>
-        /// PLC到上位机心跳
-        /// </summary>
-        public bool Heart { get; set; }
-        public bool Agv1 { get; set; }
-        public bool Agv2 { get; set; }
-        public bool Agv3 { get; set; }
-        public bool Agv4 { get; set; }
-        public bool Agv5 { get; set; }
-        public bool Agv6 { get; set; }
-        /// <summary>
-        /// 1#托盘工位占用
-        /// </summary>
-        public bool Tray1BeOccupied { get; set; }
-        /// <summary>
-        /// 2#托盘工位占用
-        /// </summary>
-        public bool Tray2BeOccupied { get; set; }
-        /// <summary>
-        /// 1#托盘工位配料完成
-        /// </summary>
-        public bool Tray1MaterialFinish { get; set; }
-        /// <summary>
-        /// 2#托盘工位配料完成
-        /// </summary>
-        public bool Tray2MaterialFinish { get; set; }
-        /// <summary>
-        /// 接收托盘1配方数据完成
-        /// </summary>
-        public bool Tray1ReceiveFinish { get; set; }
-        /// <summary>
-        /// 接收托盘2配方数据完成
-        /// </summary>
-        public bool Tray2ReceiveFinish { get; set; }
-
-        public int Reserve1 { get; set; }
-        public int Receive2 { get; set; }
-        /// <summary>
-        /// 托盘1_1#桶位置反馈
-        /// </summary>
-        public float Tray1Barrel1Location { get; set; }
-        /// <summary>
-        /// 托盘1_2#桶位置反馈
-        /// </summary>
-        public float Tray1Barrel2Location { get; set; }
-        /// <summary>
-        /// 托盘1_3#桶位置反馈
-        /// </summary>
-        public float Tray1Barrel3Location { get; set; }
-        /// <summary>
-        /// 托盘1_4#桶位置反馈
-        /// </summary>
-        public float Tray1Barrel4Location { get; set; }
-        /// <summary>
-        /// 托盘2_1#桶位置反馈
-        /// </summary>
-        public float Tray2Barrel1Location { get; set; }
-        /// <summary>
-        /// 托盘2_2#桶位置反馈
-        /// </summary>
-        public float Tray2Barrel2Location { get; set; }
-        /// <summary>
-        /// 托盘2_3#桶位置反馈
-        /// </summary>
-        public float Tray2Barrel3Location { get; set; }
-        /// <summary>
-        /// 托盘2_4#桶位置反馈
-        /// </summary>
-        public float Tray2Barrel4Location { get; set; }
-
-        public int Reserve3 { get; set; }
-        public int Receive4 { get; set; }
-        /// <summary>
-        /// 托盘1_1#桶允许配料
-        /// </summary>
-        public float Tray1Barrel1AllowDosing { get; set; }
-        /// <summary>
-        /// 托盘1_2#桶允许配料
-        /// </summary>
-        public float Tray1Barrel2AllowDosing { get; set; }
-        /// <summary>
-        /// 托盘1_3#桶允许配料
-        /// </summary>
-        public float Tray1Barrel3AllowDosing { get; set; }
-        /// <summary>
-        /// 托盘1_4#桶允许配料
-        /// </summary>
-        public float Tray1Barrel4AllowDosing { get; set; }
-        /// <summary>
-        /// 托盘2_1#桶允许配料
-        /// </summary>
-        public float Tray2Barrel1AllowDosing { get; set; }
-        /// <summary>
-        /// 托盘2_2#桶允许配料
-        /// </summary>
-        public float Tray2Barrel2AllowDosing { get; set; }
-        /// <summary>
-        /// 托盘2_3#桶允许配料
-        /// </summary>
-        public float Tray2Barrel3AllowDosing { get; set; }
-        /// <summary>
-        /// 托盘2_4#桶允许配料
-        /// </summary>
-        public float Tray2Barrel4AllowDosing { get; set; }
-
-    }
-}
diff --git a/BPASmartClient.FoodStationTest/Model/GVL/WriteSmallMaterial.cs b/BPASmartClient.FoodStationTest/Model/GVL/WriteSmallMaterial.cs
deleted file mode 100644
index 6db4ed80..00000000
--- a/BPASmartClient.FoodStationTest/Model/GVL/WriteSmallMaterial.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-namespace BPASmartClient.FoodStationTest.Model.GVL
-{
-    public class WriteSmallMaterial
-    {
-        /// <summary>
-        /// PLC到上位机心跳
-        /// </summary>
-        public bool Heart { get; set; }
-        public bool Agv1 { get; set; }
-        public bool Agv2 { get; set; }
-        public bool Agv3 { get; set; }
-        public bool Agv4 { get; set; }
-        public bool Agv5 { get; set; }
-        public bool Agv6 { get; set; }
-        public bool Agv7 { get; set; }
-        public bool Agv8 { get; set; }
-        public bool Agv9 { get; set; }
-        public bool Agv10 { get; set; }
-        /// <summary>
-        /// 下发配方到托盘1
-        /// </summary>
-        public bool Tray1IssueRecipe { get; set; }
-        /// <summary>
-        /// 下发配方到托盘2
-        /// </summary>
-        public bool Tray2IssueRecipe { get; set; }
-        public int Reserve1 { get; set; }
-        public int Receive2 { get; set; }
-
-
-        public bool Tray1Barrel1IsDosing1;
-        public bool Tray1Barrel1IsDosing2;
-        public bool Tray1Barrel1IsDosing3;
-        public bool Tray1Barrel1IsDosing4;
-        public bool Tray1Barrel1IsDosing5;
-        public bool Tray1Barrel1IsDosing6;
-        public bool Tray1Barrel1IsDosing7;
-        public bool Tray1Barrel1IsDosing8;
-        public bool Tray1Barrel1IsDosing9;
-        public bool Tray1Barrel1IsDosing10;
-        public bool Tray1Barrel1IsDosing11;
-        public bool Tray1Barrel1IsDosing12;
-        public bool Tray1Barrel1IsDosing13;
-        public bool Tray1Barrel1IsDosing14;
-        public bool Tray1Barrel1IsDosing15;
-        public bool Receive3;
-        public bool Tray1Barrel2IsDosing1;
-        public bool Tray1Barrel2IsDosing2;
-        public bool Tray1Barrel2IsDosing3;
-        public bool Tray1Barrel2IsDosing4;
-        public bool Tray1Barrel2IsDosing5;
-        public bool Tray1Barrel2IsDosing6;
-        public bool Tray1Barrel2IsDosing7;
-        public bool Tray1Barrel2IsDosing8;
-        public bool Tray1Barrel2IsDosing9;
-        public bool Tray1Barrel2IsDosing10;
-        public bool Tray1Barrel2IsDosing11;
-        public bool Tray1Barrel2IsDosing12;
-        public bool Tray1Barrel2IsDosing13;
-        public bool Tray1Barrel2IsDosing14;
-        public bool Tray1Barrel2IsDosing15;
-        public bool Receive4;
-        public bool Tray1Barrel3IsDosing1;
-        public bool Tray1Barrel3IsDosing2;
-        public bool Tray1Barrel3IsDosing3;
-        public bool Tray1Barrel3IsDosing4;
-        public bool Tray1Barrel3IsDosing5;
-        public bool Tray1Barrel3IsDosing6;
-        public bool Tray1Barrel3IsDosing7;
-        public bool Tray1Barrel3IsDosing8;
-        public bool Tray1Barrel3IsDosing9;
-        public bool Tray1Barrel3IsDosing10;
-        public bool Tray1Barrel3IsDosing11;
-        public bool Tray1Barrel3IsDosing12;
-        public bool Tray1Barrel3IsDosing13;
-        public bool Tray1Barrel3IsDosing14;
-        public bool Tray1Barrel3IsDosing15;
-        public bool Receive5;
-        public bool Tray1Barrel4IsDosing1;
-        public bool Tray1Barrel4IsDosing2;
-        public bool Tray1Barrel4IsDosing3;
-        public bool Tray1Barrel4IsDosing4;
-        public bool Tray1Barrel4IsDosing5;
-        public bool Tray1Barrel4IsDosing6;
-        public bool Tray1Barrel4IsDosing7;
-        public bool Tray1Barrel4IsDosing8;
-        public bool Tray1Barrel4IsDosing9;
-        public bool Tray1Barrel4IsDosing10;
-        public bool Tray1Barrel4IsDosing11;
-        public bool Tray1Barrel4IsDosing12;
-        public bool Tray1Barrel4IsDosing13;
-        public bool Tray1Barrel4IsDosing14;
-        public bool Tray1Barrel4IsDosing15;
-        public bool Receive6;
-
-        public bool Tray2Barrel1IsDosing1;
-        public bool Tray2Barrel1IsDosing2;
-        public bool Tray2Barrel1IsDosing3;
-        public bool Tray2Barrel1IsDosing4;
-        public bool Tray2Barrel1IsDosing5;
-        public bool Tray2Barrel1IsDosing6;
-        public bool Tray2Barrel1IsDosing7;
-        public bool Tray2Barrel1IsDosing8;
-        public bool Tray2Barrel1IsDosing9;
-        public bool Tray2Barrel1IsDosing10;
-        public bool Tray2Barrel1IsDosing11;
-        public bool Tray2Barrel1IsDosing12;
-        public bool Tray2Barrel1IsDosing13;
-        public bool Tray2Barrel1IsDosing14;
-        public bool Tray2Barrel1IsDosing15;
-        public bool Receive7;
-        public bool Tray2Barrel2IsDosing1;
-        public bool Tray2Barrel2IsDosing2;
-        public bool Tray2Barrel2IsDosing3;
-        public bool Tray2Barrel2IsDosing4;
-        public bool Tray2Barrel2IsDosing5;
-        public bool Tray2Barrel2IsDosing6;
-        public bool Tray2Barrel2IsDosing7;
-        public bool Tray2Barrel2IsDosing8;
-        public bool Tray2Barrel2IsDosing9;
-        public bool Tray2Barrel2IsDosing10;
-        public bool Tray2Barrel2IsDosing11;
-        public bool Tray2Barrel2IsDosing12;
-        public bool Tray2Barrel2IsDosing13;
-        public bool Tray2Barrel2IsDosing14;
-        public bool Tray2Barrel2IsDosing15;
-        public bool Receive8;
-        public bool Tray2Barrel3IsDosing1;
-        public bool Tray2Barrel3IsDosing2;
-        public bool Tray2Barrel3IsDosing3;
-        public bool Tray2Barrel3IsDosing4;
-        public bool Tray2Barrel3IsDosing5;
-        public bool Tray2Barrel3IsDosing6;
-        public bool Tray2Barrel3IsDosing7;
-        public bool Tray2Barrel3IsDosing8;
-        public bool Tray2Barrel3IsDosing9;
-        public bool Tray2Barrel3IsDosing10;
-        public bool Tray2Barrel3IsDosing11;
-        public bool Tray2Barrel3IsDosing12;
-        public bool Tray2Barrel3IsDosing13;
-        public bool Tray2Barrel3IsDosing14;
-        public bool Tray2Barrel3IsDosing15;
-        public bool Receive9;
-        public bool Tray2Barrel4IsDosing1;
-        public bool Tray2Barrel4IsDosing2;
-        public bool Tray2Barrel4IsDosing3;
-        public bool Tray2Barrel4IsDosing4;
-        public bool Tray2Barrel4IsDosing5;
-        public bool Tray2Barrel4IsDosing6;
-        public bool Tray2Barrel4IsDosing7;
-        public bool Tray2Barrel4IsDosing8;
-        public bool Tray2Barrel4IsDosing9;
-        public bool Tray2Barrel4IsDosing10;
-        public bool Tray2Barrel4IsDosing11;
-        public bool Tray2Barrel4IsDosing12;
-        public bool Tray2Barrel4IsDosing13;
-        public bool Tray2Barrel4IsDosing14;
-        public bool Tray2Barrel4IsDosing15;
-        public bool Receive10;
-        public int Receive11;
-
-        public bool StockIn1DosingFinish;
-        public bool StockIn2DosingFinish;
-        public bool StockIn3DosingFinish;
-        public bool StockIn4DosingFinish;
-        public bool StockIn5DosingFinish;
-        public bool StockIn6DosingFinish;
-        public bool StockIn7DosingFinish;
-        public bool StockIn8DosingFinish;
-        public bool StockIn9DosingFinish;
-        public bool StockIn10DosingFinish;
-        public bool StockIn11DosingFinish;
-        public bool StockIn12DosingFinish;
-        public bool StockIn13DosingFinish;
-        public bool StockIn14DosingFinish;
-        public bool StockIn15DosingFinish;
-        public bool Receive12;
-    }
-}
diff --git a/BPASmartClient.FoodStationTest/Model/GVL_SmallStation.cs b/BPASmartClient.FoodStationTest/Model/GVL_SmallStation.cs
index 875b839a..01dbeb0d 100644
--- a/BPASmartClient.FoodStationTest/Model/GVL_SmallStation.cs
+++ b/BPASmartClient.FoodStationTest/Model/GVL_SmallStation.cs
@@ -228,11 +228,6 @@ namespace BPASmartClient.FoodStationTest.Model
         public bool[] StockInDosingComple { get; set; } = new bool[15];
 
 
-        [VarComm("Global", "是否使用粉仓配料")]
-        /// <summary>
-        /// 是否使用粉仓配料
-        /// </summary>
-        public bool IsUseWindSend { get; set; } = false;
 
         [VarComm("Global", "粉仓正在配料")]
         /// <summary>
diff --git a/BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceRead.cs b/BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceRead.cs
deleted file mode 100644
index c1e9e2d5..00000000
--- a/BPASmartClient.FoodStationTest/Model/HK_PLC/HKDeviceRead.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace BPASmartClient.FoodStationTest.Model.HK_PLC
-{
-    public class HKDeviceRead
-    {
-        public bool HeartBeat { get; set; }
-        public bool SystemMode { get; set; }
-        public bool SystemStart { get; set; }
-        public bool SystemPause { get; set; }
-    }
-}
diff --git a/BPASmartClient.FoodStationTest/Model/HK_PLC/HKPlcCommAddress.cs b/BPASmartClient.FoodStationTest/Model/HK_PLC/HKPlcCommAddress.cs
deleted file mode 100644
index 307d24f2..00000000
--- a/BPASmartClient.FoodStationTest/Model/HK_PLC/HKPlcCommAddress.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-namespace BPASmartClient.FoodStationTest.Model.HK_PLC
-{
-    public class HKPlcCommAddress
-    {
-        #region 海科PLC ==> 上位机
-        /// <summary>
-        /// 是否允许配料
-        /// </summary>
-        public static string IsAllowDosing { get; set; } = "";
-        /// <summary>
-        /// 当前料仓位置
-        /// </summary>
-        public static string StockBinLocation { get; set; } = "";
-        /// <summary>
-        /// 当前料仓的状态(0:无意义，1：到达接料位置)
-        /// </summary>
-        public static string StockState { get; set; } = "";
-        #endregion
-
-        #region 上位机 ==> 海科PLC
-        /// <summary>
-        /// 料仓位置(配置该配方，所需要多个原料桶，每个原料桶有多个料仓位置)
-        /// </summary>
-        public static string StockBinLocationToPLC { get; set; } = "";
-        /// <summary>
-        /// 对应桶号
-        /// </summary>
-        public static string BarrelNumToPLC { get; set; } = "";
-        /// <summary>
-        /// 当前配料机配料完成
-        /// </summary>
-        public static string SingleDosingFinishToPLC { get; set; } = "";
-        /// <summary>
-        /// 当前配料料仓的位置
-        /// </summary>
-        public static string SingleStockBinLocationToPLC { get; set; } = "";
-
-        public static string RecipeDosingFinish { get; set; } = "";
-        #endregion
-
-        #region AGV进出站1
-        /// <summary>
-        /// Agv送货 进站申请 
-        /// </summary>
-        public static string DeliveryAGVApply { get; set; } = "DB3.DBX0.1";
-        /// <summary>
-        /// Agv送货 进站申请 
-        /// </summary>
-        public static string DeliveryAGVIsApply { get; set; } = "";
-        /// <summary>
-        /// Agv送货 进站顶升申请 
-        /// </summary>
-        public static string DeliveryAGVApplyJack { get; set; } = "";
-        /// <summary>
-        /// Agv送货 进站顶升申请 
-        /// </summary>
-        public static string DeliveryAGVIsApplyJack { get; set; } = "";
-        /// <summary>
-        /// Agv送货 送货完成 
-        /// </summary>
-        public static string DeliveryAGVFinsih { get; set; } = "";
-        /// <summary>
-        /// Agv送货 工位上有货架 
-        /// </summary>
-        public static string StationHaveCargo { get; set; } = "";
-        /// <summary>
-        ///  Agv送货 进站申请 
-        /// </summary>
-        public static string PickAGVApply { get; set; } = "";
-        /// <summary>
-        ///  Agv送货 进站申请 
-        /// </summary>
-        public static string PickAGVIsApply { get; set; } = "";
-        /// <summary>
-        /// Agv送货 取货架完成 
-        /// </summary>
-        public static string PickCargoAGVFinish { get; set; } = "";
-        /// <summary>
-        /// Agv送货 取料完成 
-        /// </summary>
-        public static string PickAGVFinish { get; set; } = "";
-        /// <summary>
-        ///  工位上是否有小车
-        /// </summary>
-        public static string StationIsExistTray { get; set; } = "";
-        #endregion
-        #region AGV进出站2
-        /// <summary>
-        /// Agv送货 进站申请 
-        /// </summary>
-        public static string DeliveryAGVApplyStation2 { get; set; } = "";
-        /// <summary>
-        /// Agv送货 进站申请 
-        /// </summary>
-        public static string DeliveryAGVIsApplyStation2 { get; set; } = "";
-        /// <summary>
-        /// Agv送货 进站顶升申请 
-        /// </summary>
-        public static string DeliveryAGVApplyJackStation2 { get; set; } = "";
-        /// <summary>
-        /// Agv送货 进站顶升申请 
-        /// </summary>
-        public static string DeliveryAGVIsApplyJackStation2 { get; set; } = "";
-        /// <summary>
-        /// Agv送货 送货完成 
-        /// </summary>
-        public static string DeliveryAGVFinsihStation2 { get; set; } = "";
-        /// <summary>
-        /// Agv送货 工位上有货架 
-        /// </summary>
-        public static string StationHaveCargoStation2 { get; set; } = "";
-        /// <summary>
-        ///  Agv送货 进站申请 
-        /// </summary>
-        public static string PickAGVApplyStation2 { get; set; } = "";
-        /// <summary>
-        ///  Agv送货 进站申请 
-        /// </summary>
-        public static string PickAGVIsApplyStation2 { get; set; } = "";
-        /// <summary>
-        /// Agv送货 取货架完成 
-        /// </summary>
-        public static string PickCargoAGVFinishStation2 { get; set; } = "";
-        /// <summary>
-        /// Agv送货 取料完成 
-        /// </summary>
-        public static string PickAGVFinishStation2 { get; set; } = "";
-        /// <summary>
-        ///  工位上是否有货架
-        /// </summary>
-        public static string StationIsExistTrayStation2 { get; set; } = "";
-        #endregion
-    }
-}
diff --git a/BPASmartClient.FoodStationTest/Model/HK_PLC/PlcManualComm.cs b/BPASmartClient.FoodStationTest/Model/HK_PLC/PlcManualComm.cs
deleted file mode 100644
index b4747cfd..00000000
--- a/BPASmartClient.FoodStationTest/Model/HK_PLC/PlcManualComm.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace BPASmartClient.FoodStationTest.Model.HK_PLC
-{
-    public class PlcManualComm
-    {
-        public int SerialNum { get; set; }
-        public string Address { get; set; }
-        public string Describe { get; set; }
-        public string NowValue { get; set; }
-        public string SetValue { get; set; }
-
-    }
-}
diff --git a/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs b/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs
index c6c57767..05580961 100644
--- a/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs
+++ b/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs
@@ -4,10 +4,7 @@ namespace BPASmartClient.FoodStationTest.Model.Par
 {
     public class ConnectParMode : ObservableObject
     {
-        public bool SiemensConnect { get { return _mSiemensConnect; } set { _mSiemensConnect = value; OnPropertyChanged(); } }
-        private bool _mSiemensConnect;
-        public bool WindSendConnect { get { return _mWindSendConnect; } set { _mWindSendConnect = value; OnPropertyChanged(); } }
-        private bool _mWindSendConnect;
+        
         public bool HKPlcConnect { get { return _mHKPlcConnect; } set { _mHKPlcConnect = value; OnPropertyChanged(); } }
         private bool _mHKPlcConnect;
         public bool ShieldStockbinAlarm { get { return _mShieldStockbinAlarm; } set { _mShieldStockbinAlarm = value; OnPropertyChanged(); } }
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/LocaPar.cs b/BPASmartClient.FoodStationTest/Model/Par/LocaPar.cs
similarity index 60%
rename from BPASmartClient.FoodStationTest/Model/RawMaterial/LocaPar.cs
rename to BPASmartClient.FoodStationTest/Model/Par/LocaPar.cs
index 0599917b..9728d0d8 100644
--- a/BPASmartClient.FoodStationTest/Model/RawMaterial/LocaPar.cs
+++ b/BPASmartClient.FoodStationTest/Model/Par/LocaPar.cs
@@ -2,12 +2,20 @@
 
 namespace BPASmartClient.FoodStationTest.Model
 {
-    public class LocaPar
+    public class LocalPar
     {
         public ObservableCollection<RecipeModel> Recipes { get; set; } = new ObservableCollection<RecipeModel>();
+
         /// <summary>
         /// 配方完成数目。
         /// </summary>
         public int RecipeDosingCompleNum { get; set; } = 0;
+
+        /// <summary>
+        /// 味魔方数量，每个项目应该固定的。
+        /// </summary>
+        public int RawMaterialDeviceNum { get; } = 6;
+
+        public string HK_PLC_IP { get; }
     }
 }
diff --git a/BPASmartClient.FoodStationTest/Model/ProcessControl.cs b/BPASmartClient.FoodStationTest/Model/ProcessControl.cs
index 24223fef..8b7ecaeb 100644
--- a/BPASmartClient.FoodStationTest/Model/ProcessControl.cs
+++ b/BPASmartClient.FoodStationTest/Model/ProcessControl.cs
@@ -41,9 +41,6 @@ namespace BPASmartClient.FoodStationTest.Model
         /// </summary>
         public Dictionary<int, ConcurrentQueue<string>> RecipeQueueTray { get; set; } = new Dictionary<int, ConcurrentQueue<string>>();
 
-        public ConcurrentQueue<string> RecipeQueueTray2 = new ConcurrentQueue<string>();
-
-
 
         public HKDeviceStatus HKDevice = new HKDeviceStatus();
 
@@ -52,15 +49,17 @@ namespace BPASmartClient.FoodStationTest.Model
 
         public DateTime StockBinAlarmTime = DateTime.Now;
 
-        public string? HK_PLC_IP = ConfigurationManager.AppSettings["HKPlc_IP"];
+        //public string? HK_PLC_IP = ConfigurationManager.AppSettings["HKPlc_IP"];
+        public string? HK_PLC_IP = Json<LocalPar>.Data.HK_PLC_IP;
 
         public void Init()
         {
-            RecipeQueueTray.TryAdd(0, new ConcurrentQueue<string>());
-            RecipeQueueTray.TryAdd(1, new ConcurrentQueue<string>());
-            RecipeQueueTray.TryAdd(2, new ConcurrentQueue<string>());
-            RecipeQueueTray.TryAdd(3, new ConcurrentQueue<string>());
-            RecipeQueueTray.TryAdd(4, new ConcurrentQueue<string>());
+            //初始化物料集合。
+            for (int i = 0; i < 5; i++)
+            {
+                RecipeQueueTray.TryAdd(i, new ConcurrentQueue<string>());
+            }
+
             PlcVarMonitor();
             StockBinNameWithPos();
             RawMaterialNameWithCode();
@@ -75,12 +74,14 @@ namespace BPASmartClient.FoodStationTest.Model
                     GVL_SmallStation.GetInstance.HeartBeatToPlc = !GVL_SmallStation.GetInstance.HeartBeatToPlc;
                     HKDevice.HK_PLC_S7.Write("DB4.DBX0.0", GVL_SmallStation.GetInstance.HeartBeatToPlc);
                     GVL_SmallStation.GetInstance.HeartBeatFromPlc = HKDevice.HK_PLC_S7.Read<bool>("DB45.DBX0.0").Content;
-                    if (DeviceInquire.GetInstance.devices.Count < 15 && HKDevice.IsConnected && Json<RemoteRecipeDataColl>.Data.Recipes.Count > 0 && GVL_SmallStation.GetInstance.DisEnableStockBinAlarm == false && DateTime.Now.Subtract(StockBinAlarmTime).TotalSeconds >= 60 & !GVL_SmallStation.GetInstance.DisEnableStockAlarm)
+                    if (DeviceInquire.GetInstance.devices.Count < Json<LocalPar>.Data.RawMaterialDeviceNum && HKDevice.IsConnected
+                        && Json<RemoteRecipeDataColl>.Data.Recipes.Count > 0 && GVL_SmallStation.GetInstance.DisEnableStockBinAlarm == false
+                        && DateTime.Now.Subtract(StockBinAlarmTime).TotalSeconds >= 60 & !GVL_SmallStation.GetInstance.DisEnableStockAlarm)
                     {
                         HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
                         App.Current.Dispatcher.Invoke(() =>
                         {
-                            MessageNotify.GetInstance.ShowDialog($"未读取到15个柔性味魔方料仓", DialogType.Error);
+                            MessageNotify.GetInstance.ShowDialog($"未读取到全部柔性味魔方料仓。", DialogType.Error);
                             StockBinAlarmTime = DateTime.Now;
                         });
                         HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", false);
@@ -502,7 +503,7 @@ namespace BPASmartClient.FoodStationTest.Model
                             else
                             {
                                 //粉料仓下发配方
-                                if (GVL_SmallStation.GetInstance.IsUseWindSend && GVL_SmallStation.GetInstance.WindSendDosing == false /*&& GVL_SmallStation.GetInstance.Tray_AGVLogic[recipeNum] == 2*/)
+                                if (/*GVL_SmallStation.GetInstance.IsUseWindSend &&*/ GVL_SmallStation.GetInstance.WindSendDosing == false /*&& GVL_SmallStation.GetInstance.Tray_AGVLogic[recipeNum] == 2*/)
                                 {
 
                                 }
@@ -675,9 +676,12 @@ namespace BPASmartClient.FoodStationTest.Model
             }
         }
 
+        /// <summary>
+        /// 复位所有料仓。
+        /// </summary>
         private void StockBinInit()
         {
-            for (int i = 1; i < 16; i++)
+            for (int i = 1; i <= Json<LocalPar>.Data.RawMaterialDeviceNum; i++)
             {
                 if (DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3)
                 {
@@ -703,7 +707,7 @@ namespace BPASmartClient.FoodStationTest.Model
             }
         }
         /// <summary>
-        /// PLC的DB3变量列表
+        /// PLC的DB3变量列表。初始化PLC读取DB块变量以及流程变量数据。
         /// </summary>
         public void PlcVarMonitor()
         {
@@ -743,6 +747,9 @@ namespace BPASmartClient.FoodStationTest.Model
                 }
             }
         }
+        /// <summary>
+        /// 注册需要用到的委托，主要是用于手动控制的。
+        /// </summary>
         public void RegisterInit()
         {
             //手动控制气缸 DB5.DBX0.0~DB5.DBX4.5
@@ -1107,6 +1114,9 @@ namespace BPASmartClient.FoodStationTest.Model
             }), "RobotSetProgramNum", true);
 
         }
+        /// <summary>
+        /// 连接海科PLC，并开启重连线程。
+        /// </summary>
         public void DeviceConnect()
         {
             try
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/ActionMenu.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/ActionMenu.cs
deleted file mode 100644
index d383bb1d..00000000
--- a/BPASmartClient.FoodStationTest/Model/RawMaterial/ActionMenu.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-namespace BPASmartClient.FoodStationTest.Model
-{
-    public class ActionMenu : ObservableObject
-    {
-        public string CommandParameter { get { return _mCommandParameter; } set { _mCommandParameter = value; OnPropertyChanged(); } }
-        private string _mCommandParameter;
-
-        //public Permission[] permission { get { return _mpermission; } set { _mpermission = value; OnPropertyChanged(); } }
-        //private Permission[] _mpermission;
-
-        public string MenuName { get { return _mMenuName; } set { _mMenuName = value; OnPropertyChanged(); } }
-        private string _mMenuName;
-
-
-        //public string NameSpace { get { return _mNameSpace; } set { _mNameSpace = value; OnPropertyChanged(); } }
-        //private string _mNameSpace;
-
-
-    }
-}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/ConveyorServer.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/ConveyorServer.cs
deleted file mode 100644
index 0fca193d..00000000
--- a/BPASmartClient.FoodStationTest/Model/RawMaterial/ConveyorServer.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace BPASmartClient.FoodStationTest.Model
-{
-    public class ConveyorServer
-    {
-        public ConveyorServer()
-        {
-
-        }
-    }
-}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/CylinderStatusModel.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/CylinderStatusModel.cs
deleted file mode 100644
index 5c77f971..00000000
--- a/BPASmartClient.FoodStationTest/Model/RawMaterial/CylinderStatusModel.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-namespace BPASmartClient.FoodStationTest.Model
-{
-    public class CylinderStatusModel : ObservableObject
-    {
-        /// <summary>
-        /// 气缸原点信号
-        /// </summary>
-        public bool HomeStatus { get { return _mHomeStatus; } set { _mHomeStatus = value; OnPropertyChanged(); } }
-        private bool _mHomeStatus;
-
-        /// <summary>
-        /// 气缸到位信号
-        /// </summary>
-        public bool InPlace { get { return _mInPlace; } set { _mInPlace = value; OnPropertyChanged(); } }
-        private bool _mInPlace;
-
-
-
-    }
-}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceAddress.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceAddress.cs
index 42c831d6..48214906 100644
--- a/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceAddress.cs
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceAddress.cs
@@ -1,5 +1,8 @@
 namespace BPASmartClient.FoodStationTest.Model
 {
+    /// <summary>
+    /// 味魔法通讯地址。
+    /// </summary>
     public class DeviceAddress
     {
         /// <summary>
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceInquire.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceInquire.cs
index bd98dd2d..e424e9b2 100644
--- a/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceInquire.cs
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceInquire.cs
@@ -20,6 +20,7 @@ namespace BPASmartClient.FoodStationTest.Model
         public static DeviceInquire GetInstance => _Instance ?? (_Instance = new DeviceInquire());
         private DeviceInquire() { }
 
+        //代码片段。
         string IPSegment = "107.107.2.";
 
         ConcurrentDictionary<string, DeviceStatus> DeviceLists = new ConcurrentDictionary<string, DeviceStatus>();
@@ -158,16 +159,10 @@ namespace BPASmartClient.FoodStationTest.Model
         {
             IPLists.Clear();
             IPQueues.Clear();
-            /* for (int i = 1; i <= 255; i++)
-             {
-                 if (!InvalidIP.Contains($"{IPSegment}{i}") && !DeviceLists.ContainsKey($"{IPSegment}{i}"))
-                 {
-                     IPLists.Add($"{IPSegment}{i}");
-                 }
-             }*/
-            //吉香居特定IP
-            for (int i = 0; i < 15; i++)
+            for (int i = 0; i < Json<LocalPar>.Data.RawMaterialDeviceNum; i++)
             {
+                //这里“69”是味魔方起始地址。
+                //TODO:修改起始地址。
                 IPLists.Add($"{IPSegment}{i + 69}");
             }
 
@@ -214,13 +209,13 @@ namespace BPASmartClient.FoodStationTest.Model
                                     BottomDeviceCurrentStatuses.Add(new DeviceCurrentStatus() { DeviceName = DeviceName });
 
 
-                                for (int i = 0; i < Json<LocaPar>.Data.Recipes.Count; i++)
+                                for (int i = 0; i < Json<LocalPar>.Data.Recipes.Count; i++)
                                 {
-                                    for (int m = 0; m < Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.Count; m++)
+                                    for (int m = 0; m < Json<LocalPar>.Data.Recipes.ElementAt(i).RawMaterials.Count; m++)
                                     {
-                                        if (Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).DeviceIp == ip)
+                                        if (Json<LocalPar>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).DeviceIp == ip)
                                         {
-                                            Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).RawMaterialName = DeviceName;
+                                            Json<LocalPar>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).RawMaterialName = DeviceName;
                                         }
                                     }
                                 }
@@ -320,7 +315,10 @@ namespace BPASmartClient.FoodStationTest.Model
 
         #region 对象属性声明
         public string DeviceName = String.Empty;
-        public string IpAddress = "172.16.0.200";
+        /// <summary>
+        /// ModbusTcp的地址。
+        /// </summary>
+        public string IpAddress=> modbusTcp.GetConfigPar().IpAddress;
         /// <summary>
         /// 设备状态
         /// </summary>
@@ -330,7 +328,7 @@ namespace BPASmartClient.FoodStationTest.Model
 
         public ModbusTcp modbusTcp = new ModbusTcp();
 
-        public bool IsConnected => modbusTcp.IsReconnect;
+        public bool IsConnected => modbusTcp.IsConnected();
         #endregion
 
         public void Init(string DeviceName)
@@ -407,7 +405,10 @@ namespace BPASmartClient.FoodStationTest.Model
             ThreadManage.GetInstance().StopTask($"{DeviceName} 开始监听");
         }
 
-
+        /// <summary>
+        /// 写入重量数据，开始配料。
+        /// </summary>
+        /// <param name="Value">配料重量。</param>
         public void Start(float Value)
         {
 
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/GlobalData.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/GlobalData.cs
deleted file mode 100644
index f29e3e2f..00000000
--- a/BPASmartClient.FoodStationTest/Model/RawMaterial/GlobalData.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace BPASmartClient.FoodStationTest.Model
-{
-    public class GlobalData
-    {
-
-    }
-}
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeProcess.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeProcess.cs
deleted file mode 100644
index 695340f8..00000000
--- a/BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeProcess.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-namespace BPASmartClient.FoodStationTest.Model
-{
-    public class RecipeProcess : ObservableObject
-    {
-        public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } }
-        private string _mRawMaterialName;
-
-
-        public int RawMaterialStatus { get { return _mRawMaterialStatus; } set { _mRawMaterialStatus = value; OnPropertyChanged(); } }
-        private int _mRawMaterialStatus;
-
-    }
-}
diff --git a/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeData.cs b/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeData.cs
index cbc58eb3..fb0dae1a 100644
--- a/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeData.cs
+++ b/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeData.cs
@@ -3,6 +3,10 @@ using System.Collections.ObjectModel;
 
 namespace BPASmartClient.FoodStationTest.Model
 {
+
+    /// <summary>
+    /// 远程配方数据。
+    /// </summary>
     public class RemoteRecipeData : ObservableObject
     {
         /// <summary>
diff --git a/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeDataColl.cs b/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeDataColl.cs
index fbfd101c..003dd88c 100644
--- a/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeDataColl.cs
+++ b/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeDataColl.cs
@@ -2,10 +2,12 @@
 
 namespace BPASmartClient.FoodStationTest.Model
 {
+    /// <summary>
+    /// 远程配方数据集合。
+    /// </summary>
     public class RemoteRecipeDataColl
     {
         public ObservableCollection<RemoteRecipeData> Recipes { get; set; } = new ObservableCollection<RemoteRecipeData>();
-        public int RecipesStatus { get; set; }
 
     }
 }
diff --git a/BPASmartClient.FoodStationTest/View/HardwareStatusView.xaml b/BPASmartClient.FoodStationTest/View/HardwareStatusView.xaml
index 96133824..9692a5c6 100644
--- a/BPASmartClient.FoodStationTest/View/HardwareStatusView.xaml
+++ b/BPASmartClient.FoodStationTest/View/HardwareStatusView.xaml
@@ -91,7 +91,7 @@
                                         Foreground="#FF0084FF"
                                         Text=" 号仓" />
                                 </StackPanel>
-                                
+
                                 <StackPanel
                                     Grid.Row="1"
                                     Margin="0,70,0,0"
@@ -121,17 +121,14 @@
         <!--#endregion-->
 
         <Grid x:Name="gr" Grid.Row="1">
-            <pry:ConveyorBelt
-                Grid.Row="1"
-                Width="{Binding ElementName=gr, Path=ActualWidth}"
-                Height="{Binding ElementName=gr, Path=ActualHeight}"
-                Margin="10,0,400,0"
-                ConveyorBeltWidth="70"
-                Direction="0"
-                StrokeBrush="#00BEFA"
-                StrokeDashArray="1.5 1.5"
-                StrokeFillBrush="#00BEFA"
-                StrokeThickness="2" />
+            <pry:ConveyBelt2
+                BeltDashOffset="100"
+                BeltDashThickess="62"
+                BeltDirection="0"
+                BeltHeight="70"
+                Margin="0,150,0,0"
+                BeltWidth="{Binding ElementName=gr, Path=ActualWidth}"
+                IsRun="True" />
         </Grid>
 
         <!--#region 底部料仓-->
diff --git a/BPASmartClient.FoodStationTest/View/ManualControlView.xaml b/BPASmartClient.FoodStationTest/View/ManualControlView.xaml
index 8c36c644..a04890f1 100644
--- a/BPASmartClient.FoodStationTest/View/ManualControlView.xaml
+++ b/BPASmartClient.FoodStationTest/View/ManualControlView.xaml
@@ -432,7 +432,7 @@
                 FontSize="16"
                 Foreground="Aqua"
                 Text="升降气缸控制" />
-            <ListView
+            <ListView VerticalAlignment="Center"
                 Grid.Row="1"
                 Background="Transparent"
                 BorderBrush="#00BEFA"
diff --git a/BPASmartClient.FoodStationTest/View/ManualFlowView.xaml b/BPASmartClient.FoodStationTest/View/ManualFlowView.xaml
index d0669cf9..6ab605a5 100644
--- a/BPASmartClient.FoodStationTest/View/ManualFlowView.xaml
+++ b/BPASmartClient.FoodStationTest/View/ManualFlowView.xaml
@@ -168,19 +168,7 @@
                     </StackPanel>
                 </StackPanel>
                 <WrapPanel Grid.Row="0">
-                    <TextBlock
-                        Margin="10,0,5,0"
-                        VerticalAlignment="Center"
-                        FontSize="25"
-                        Foreground="#FF2AB2E7"
-                        Text="西门子 连接状态：" />
-                    <TextBlock
-                        Margin="10"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        FontSize="25"
-                        Foreground="#FF2AB2E7"
-                        Text="{Binding SiemensIsConnect}" />
+                    
                     <TextBlock
                         Margin="10,0,5,0"
                         VerticalAlignment="Center"
@@ -194,19 +182,7 @@
                         FontSize="25"
                         Foreground="#FF2AB2E7"
                         Text="{Binding HKPlcIsConnect}" />
-                    <TextBlock
-                        Margin="10,0,5,0"
-                        VerticalAlignment="Center"
-                        FontSize="25"
-                        Foreground="#FF2AB2E7"
-                        Text="风送plc连接状态：" />
-                    <TextBlock
-                        Margin="10"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        FontSize="25"
-                        Foreground="#FF2AB2E7"
-                        Text="{Binding WindSendIsConnect}" />
+                    
                 </WrapPanel>
                 <WrapPanel Grid.Row="2">
                     <TextBlock
diff --git a/BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml b/BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml
index a969b2bb..ae89354f 100644
--- a/BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml
+++ b/BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml
@@ -60,16 +60,7 @@
                 FontSize="20"
                 Foreground="Aqua"
                 IsChecked="{Binding NotUseSmallDosing}" />
-            <CheckBox
-                x:Name="IsUseWindSend"
-                Margin="0,0,10,0"
-                VerticalAlignment="Center"
-                VerticalContentAlignment="Center"
-                Content="使用粉料仓配料"
-                FontFamily="楷体"
-                FontSize="20"
-                Foreground="Aqua"
-                IsChecked="{Binding IsUseWindSendDosing}" />
+            
             <CheckBox
                 x:Name="IsUseStockBin"
                 VerticalAlignment="Center"
diff --git a/BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml.cs b/BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml.cs
index 362d36dc..4ec70d21 100644
--- a/BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml.cs
+++ b/BPASmartClient.FoodStationTest/View/RecipeReceiveView.xaml.cs
@@ -11,7 +11,6 @@ namespace BPASmartClient.FoodStationTest.View
         public RecipeReceiveView()
         {
             InitializeComponent();
-            this.IsUseWindSend.Click += (o, e) => { GVL_SmallStation.GetInstance.IsUseWindSend = (bool)IsUseWindSend.IsChecked; };
             this.IsUseStockBin.Click += (o, e) => { GVL_SmallStation.GetInstance.IsUseLocalRecipe = (bool)IsUseStockBin.IsChecked; };
             this.NotUseSmallDosing.Click += (o, e) => { GVL_SmallStation.GetInstance.NotUseSmallStation = (bool)NotUseSmallDosing.IsChecked; };
 
diff --git a/BPASmartClient.FoodStationTest/View/RobotView.xaml b/BPASmartClient.FoodStationTest/View/RobotView.xaml
deleted file mode 100644
index c499d9e1..00000000
--- a/BPASmartClient.FoodStationTest/View/RobotView.xaml
+++ /dev/null
@@ -1,308 +0,0 @@
-<UserControl x:Class="BPASmartClient.FoodStationTest.View.RobotView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
-             mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920">
-    <UserControl.Resources>
-        <Style x:Key="radioButtonStyle" TargetType="RadioButton">
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="RadioButton">
-                        <Grid Name="gr" Opacity="0.8">
-                            <ContentControl
-                                Margin="{TemplateBinding Margin}"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                HorizontalContentAlignment="Center"
-                                VerticalContentAlignment="Center"
-                                Content="{TemplateBinding Content}"
-                                FontSize="{TemplateBinding FontSize}"
-                                Foreground="{TemplateBinding Foreground}" />
-                            <Image
-                                Name="image"
-                                Source="/BPASmartClient.CustomResource;component/Image/边框线.png"
-                                Stretch="Fill" />
-
-                        </Grid>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsChecked" Value="False">
-                                <Setter TargetName="image" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/边框线.png" />
-                            </Trigger>
-                            <Trigger Property="IsChecked" Value="True">
-                                <Setter TargetName="image" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/透明背景.png" />
-                            </Trigger>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="gr" Property="Opacity" Value="1" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </UserControl.Resources>
-    <UserControl.DataContext>
-        <vm:RobotViewModel/>
-    </UserControl.DataContext>
-
-    <Grid Margin="10">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="4*"/>
-            <ColumnDefinition Width="4*"/>
-            <ColumnDefinition Width="4*"/>
-        </Grid.ColumnDefinitions>
-        <!--#region 表格标题栏设置-->
-        <Grid>
-            <StackPanel>
-                <WrapPanel>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="机器人自动运行模式："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsAutoMode}"></TextBlock>
-                </WrapPanel>
-                <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人正在自动运行："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsAutoRun}"></TextBlock>
-                </WrapPanel>
-                <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人停止状态："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsStop}"></TextBlock>
-                </WrapPanel>
-                <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人运行正常："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsRun}"></TextBlock>
-                </WrapPanel>
-                <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人运行故障："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsAlarm}"></TextBlock>
-                </WrapPanel>
-                <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人在Home点："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsHomed}"></TextBlock>
-                </WrapPanel>
-                <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人运行的程序号："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding IsRunProgramNum}"></TextBlock>
-                </WrapPanel>
-                <!--<WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="抓空桶完成："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotGetEmptyBarrelComplete}"></TextBlock>
-                </WrapPanel>
-                <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="放空桶完成："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotPutEmptyBarrelComplete}"></TextBlock>
-                </WrapPanel>
-                <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="抓满桶完成："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotGetFullBarrelComplete}"></TextBlock>
-                </WrapPanel>
-                <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="放满桶完成："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotPutFullBarrelComplete}"></TextBlock>
-                </WrapPanel>-->
-            </StackPanel>
-        </Grid>
-        <Grid Grid.Column="1">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="1*"></RowDefinition>
-                <RowDefinition Height="7*"></RowDefinition>
-            </Grid.RowDefinitions>
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                </Grid.ColumnDefinitions>
-                <Button
-                    Margin="20,15"
-                    Command="{Binding SystemStart}"
-                    Content="启动"
-                    FontSize="40"
-                    Background="LightGreen"></Button>
-                <Button
-                    Grid.Column="1"
-                    Margin="20,15"
-                    Command="{Binding SystemStop}"
-                    Content="停止"
-                    FontSize="40"
-                    Background="OrangeRed"></Button>
-                <Button
-                    Grid.Column="2"
-                    Grid.ColumnSpan="2"
-                    Margin="20,15"
-                    Command="{Binding EStopReset}"
-                    Content="急停复位"
-                    FontSize="40"
-                    Background="DodgerBlue"></Button>
-            </Grid>
-        </Grid>
-        <!--<Grid Grid.Column="2">
-            <Grid.RowDefinitions>
-                <RowDefinition></RowDefinition>
-                <RowDefinition></RowDefinition>
-                <RowDefinition></RowDefinition>
-            </Grid.RowDefinitions>
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                </Grid.RowDefinitions>
-                <Button
-                    Margin="20,5"
-                    Command="{Binding AutoMode}"
-                    Content="自动模式"
-                    FontSize="32"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
-                <Button
-                    Grid.Column="1"
-                    Margin="20,5"
-                    Command="{Binding TestMode}"
-                    Content="测试模式"
-                    FontSize="32"
-                    Panel.ZIndex="0"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
-                <Grid Grid.Row="1" Grid.ColumnSpan="2">
-                    <StackPanel Orientation="Vertical">
-                        <WrapPanel Orientation="Horizontal">
-                            <TextBlock  Text="机器人正在运行程序号：" Foreground="#FF2AB2E7" FontSize="25" Margin="10" HorizontalAlignment="Left"></TextBlock>
-                            <TextBlock  Text="{Binding IsRunProgramNum}" Foreground="#FF2AB2E7" FontSize="25" Margin="10" HorizontalAlignment="Left" TextAlignment="Center"></TextBlock>
-                        </WrapPanel>
-                        <WrapPanel Orientation="Horizontal" VerticalAlignment="Center">
-                            <TextBlock   Text="机器人需要运行程序号：" Foreground="#FF2AB2E7" FontSize="25" Margin="10" HorizontalAlignment="Left"></TextBlock>
-                            <TextBox  Text="{Binding SetProgramNum}" Width="50" Foreground="#FF2AB2E7" FontSize="25" Margin="10" HorizontalAlignment="Left" TextAlignment="Center"></TextBox>
-                            <Button  FontSize="20" Height="40" Command="{Binding SetProgramNumCommand}" Content="设置" Style="{StaticResource ImageButtonStyle}"></Button>
-                        </WrapPanel>
-                    </StackPanel>
-                </Grid>
-                <Button
-                    Grid.Row="2"
-                    Margin="20,5"
-                    Command="{Binding TestRobotRun}"
-                    Content="测试抓桶程序"
-                    FontSize="32"
-                    Style="{StaticResource ImageButtonStyle}"></Button>
-            </Grid>
-            --><!--<ListView
-                Grid.Row="1"
-                Background="Transparent"
-                BorderBrush="#00BEFA"
-                BorderThickness="0"
-                ItemsSource="{Binding cylinderModels}"
-                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-                <ListView.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <UniformGrid
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Top"
-                            Columns="8" />
-                    </ItemsPanelTemplate>
-                </ListView.ItemsPanel>
-
-                <ListView.ItemTemplate>
-                    <DataTemplate>
-                        <Grid
-                            Width="200"
-                            Height="100"
-                            Margin="0,0,0,15"
-                            Background="Transparent">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="30" />
-                                <RowDefinition />
-                                <RowDefinition Height="30" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="0.5*" />
-                                <ColumnDefinition />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-
-                            <TextBlock
-                                Grid.Column="1"
-                                Grid.ColumnSpan="2"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Foreground="Aqua"
-                                Text="{Binding Name}" />
-
-                            <pry:Cylinder
-                                Grid.Row="1"
-                                Grid.ColumnSpan="3"
-                                Width="200"
-                                Height="50"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                LeftTogIsChecked="{Binding LeftTog}"
-                                RightTogIsChecked="{Binding RightTog}" />
-
-                            <RadioButton
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                Command="{Binding DataContext.Open, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
-                                CommandParameter="{Binding Name}"
-                                Content="伸出"
-                                Foreground="Aqua"
-                                IsChecked="True"
-                                Style="{StaticResource radioButtonStyle}" />
-
-                            <RadioButton
-                                Grid.Row="2"
-                                Grid.Column="2"
-                                Command="{Binding DataContext.Close, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
-                                CommandParameter="{Binding Name}"
-                                Content="缩回"
-                                Foreground="Aqua"
-                                IsChecked="False"
-                                Style="{StaticResource radioButtonStyle}" />
-                        </Grid>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>--><!--
-            <Grid Grid.Row="1" Visibility="Hidden">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                </Grid.RowDefinitions>
-                <Grid Grid.Row="0">
-                    <Button
-                        Margin="20,5"
-                        Command="{Binding RobotGetEmptyBarrel}"
-                        Content="允许机器人抓空桶"
-                        Style="{StaticResource ImageButtonStyle}"></Button>
-                </Grid>
-                <Grid Grid.Column="1">
-                    <Button
-                        Margin="20,5"
-                        Command="{Binding RobotPutEmptyBarrel}"
-                        Content="允许机器人放空桶"
-                        Style="{StaticResource ImageButtonStyle}"></Button>
-                </Grid>
-                <Grid Grid.Row="1">
-                    <Button
-                        Margin="20,5"
-                        Command="{Binding RobotGetFullBarrel}"
-                        Content="允许机器人抓满桶"
-                        Style="{StaticResource ImageButtonStyle}"></Button>
-                </Grid>
-                <Grid Grid.Row="1" Grid.Column="1">
-                    <Button
-                        Margin="20,5"
-                        Command="{Binding RobotPutFullBarrel}"
-                        Content="允许机器人放满桶"
-                        Style="{StaticResource ImageButtonStyle}"></Button>
-                </Grid>
-            </Grid>
-        </Grid>-->
-    </Grid>
-</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/RobotView.xaml.cs b/BPASmartClient.FoodStationTest/View/RobotView.xaml.cs
deleted file mode 100644
index 89f2b7b4..00000000
--- a/BPASmartClient.FoodStationTest/View/RobotView.xaml.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Windows.Controls;
-
-namespace BPASmartClient.FoodStationTest.View
-{
-    /// <summary>
-    /// HKPlcCommMonitor.xaml 的交互逻辑
-    /// </summary>
-    public partial class RobotView : UserControl
-    {
-        public RobotView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/BPASmartClient.FoodStationTest/View/SystemParView.xaml b/BPASmartClient.FoodStationTest/View/SystemParView.xaml
index 9cf29ee0..b72c39fc 100644
--- a/BPASmartClient.FoodStationTest/View/SystemParView.xaml
+++ b/BPASmartClient.FoodStationTest/View/SystemParView.xaml
@@ -159,22 +159,8 @@
             Margin="10,0,10,0"
             HorizontalAlignment="Left"
             Orientation="Vertical">
-            <CheckBox
-                Margin="0,10,10,0"
-                VerticalAlignment="Center"
-                Content="西门子设备连接"
-                FontFamily="楷体"
-                FontSize="20"
-                Foreground="Aqua"
-                IsChecked="{Binding SiemensConnect}" />
-            <CheckBox
-                Margin="0,10,10,0"
-                VerticalAlignment="Center"
-                Content="粉料仓设备连接"
-                FontFamily="楷体"
-                FontSize="20"
-                Foreground="Aqua"
-                IsChecked="{Binding WindSendConnect}" />
+            
+            
             <CheckBox
                 Margin="0,10,10,0"
                 VerticalAlignment="Center"
diff --git a/BPASmartClient.FoodStationTest/View/WindSendParView.xaml b/BPASmartClient.FoodStationTest/View/WindSendParView.xaml
deleted file mode 100644
index 888c7992..00000000
--- a/BPASmartClient.FoodStationTest/View/WindSendParView.xaml
+++ /dev/null
@@ -1,218 +0,0 @@
-<UserControl
-    x:Class="BPASmartClient.FoodStationTest.View.WindSendParView"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:con="clr-namespace:BPASmartClient.FoodStationTest.Converter"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:BPASmartClient.FoodStationTest.View"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-    xmlns:vm="clr-namespace:BPASmartClient.FoodStationTest.ViewModel"
-    d:DesignHeight="1080"
-    d:DesignWidth="1920"
-    mc:Ignorable="d">
-
-    <UserControl.DataContext>
-        <vm:WindSendParViewModel />
-    </UserControl.DataContext>
-
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/BPASmartClient.FoodStationTest;component/Resource/MyStyle.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
-
-    <Grid Margin="10">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="60" />
-            <RowDefinition Height="40" />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <!--#region 表格标题栏设置-->
-        <Grid>
-            <StackPanel
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
-                Orientation="Horizontal">
-                <!--<pry:IcoButton
-                    Margin="10"
-                    Command="{Binding UpdateRawMaterial}"
-                    Content="新增数据"
-                    FontSize="28"
-                    Foreground="Aqua"
-                    Style="{StaticResource IcoButtonStyle}" />-->
-                <Button
-                    Width="150"
-                    Height="50"
-                    Margin="5"
-                    Command="{Binding SaveRawMaterialPara}"
-                    Content="保存参数"
-                    FontSize="28"
-                    Foreground="DeepSkyBlue"
-                    Style="{StaticResource ImageButtonStyle}" />
-                <!--<pry:IcoButton
-                    Margin="10"
-                    Command="{Binding SaveRawMaterialPara}"
-                    Content="保存参数"
-                    FontSize="28"
-                    Foreground="Aqua"
-                    Style="{StaticResource IcoButtonStyle}" />-->
-            </StackPanel>
-
-        </Grid>
-        <Grid
-            Grid.Row="1"
-            Margin="0,10,0,0"
-            Background="#ff0C255F">
-
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition />
-                <ColumnDefinition />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock
-                Grid.Column="0"
-                FontSize="24"
-                Style="{StaticResource TitleTextblockStyle}"
-                Text="序号" />
-
-            <TextBlock
-                Grid.Column="1"
-                FontSize="24"
-                Style="{StaticResource TitleTextblockStyle}"
-                Text="料仓位置" />
-
-            <TextBlock
-                Grid.Column="2"
-                FontSize="24"
-                Style="{StaticResource TitleTextblockStyle}"
-                Text="原料编号" />
-
-            <TextBlock
-                Grid.Column="3"
-                FontSize="24"
-                Style="{StaticResource TitleTextblockStyle}"
-                Text="原料名称" />
-
-            <Border
-                Grid.Column="0"
-                Grid.ColumnSpan="4"
-                BorderBrush="{StaticResource bordColor}"
-                BorderThickness="1,1,1,1" />
-            <Border
-                Grid.Column="1"
-                BorderBrush="{StaticResource bordColor}"
-                BorderThickness="1,0,1,0" />
-            <Border
-                Grid.Column="3"
-                BorderBrush="{StaticResource bordColor}"
-                BorderThickness="1,0,1,0" />
-        </Grid>
-        <Grid Grid.Row="2">
-            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
-                <ItemsControl Foreground="DeepSkyBlue" ItemsSource="{Binding WindSendRawMaterial}">
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <Grid Name="gr">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition />
-                                    <ColumnDefinition />
-                                    <ColumnDefinition />
-                                    <ColumnDefinition />
-                                </Grid.ColumnDefinitions>
-
-                                <TextBlock
-                                    Grid.Column="0"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    FontSize="16"
-                                    Text="{Binding Location}" />
-
-                                <TextBlock
-                                    Grid.Column="1"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    FontSize="16"
-                                    Text="{Binding Location}" />
-
-                                <TextBox
-                                    Grid.Column="2"
-                                    Style="{StaticResource InputTextboxStyle}"
-                                    Text="{Binding RawMaterialName}" />
-
-                                <TextBlock
-                                    Grid.Column="3"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    FontSize="16"
-                                    Text="{Binding RawMaterialChineseName}" />
-
-                                <Border
-                                    Grid.Column="0"
-                                    Grid.ColumnSpan="4"
-                                    BorderBrush="{StaticResource bordColor}"
-                                    BorderThickness="1,0,1,1" />
-                                <Border
-                                    Grid.Column="1"
-                                    BorderBrush="{StaticResource bordColor}"
-                                    BorderThickness="1,0,1,0" />
-                                <Border
-                                    Grid.Column="3"
-                                    BorderBrush="{StaticResource bordColor}"
-                                    BorderThickness="1,0,1,0" />
-
-                                <!--<Grid Grid.Column="0" Margin="5">
-                                    <TextBlock
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        FontSize="16"
-                                        Text="{Binding Location}" />
-                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
-
-                                </Grid>
-                                <Grid Grid.Column="1" Margin="5">
-                                    <TextBlock
-                                        Width="50"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        FontSize="16"
-                                        Text="{Binding Location}"
-                                        TextAlignment="Center" />
-                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
-
-                                </Grid>
-                                <Grid Grid.Column="2" Margin="5">
-                                    <TextBox
-                                        Name="name"
-                                        Width="50"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        FontSize="16"
-                                        Text="{Binding RawMaterialName}" />
-                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
-                                </Grid>
-                                <Grid Grid.Column="3" Margin="5">
-                                    <TextBlock
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        FontSize="16"
-                                        Text="{Binding RawMaterialChineseName}" />
-                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
-                                </Grid>-->
-                            </Grid>
-                            <DataTemplate.Triggers>
-                                <Trigger Property="IsMouseOver" Value="true">
-                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
-                                </Trigger>
-                            </DataTemplate.Triggers>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
-            </ScrollViewer>
-        </Grid>
-    </Grid>
-</UserControl>
diff --git a/BPASmartClient.FoodStationTest/View/WindSendParView.xaml.cs b/BPASmartClient.FoodStationTest/View/WindSendParView.xaml.cs
deleted file mode 100644
index f6f0e048..00000000
--- a/BPASmartClient.FoodStationTest/View/WindSendParView.xaml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Windows.Controls;
-
-namespace BPASmartClient.FoodStationTest.View
-{
-    /// <summary>
-    /// DeviceMaterialParView.xaml 的交互逻辑
-    /// </summary>
-    public partial class WindSendParView : UserControl
-    {
-        public WindSendParView()
-        {
-            InitializeComponent();
-
-        }
-    }
-}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/ChangeDeviceNameViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/ChangeDeviceNameViewModel.cs
index 7dbb9ad8..a5fe3b8f 100644
--- a/BPASmartClient.FoodStationTest/ViewModel/ChangeDeviceNameViewModel.cs
+++ b/BPASmartClient.FoodStationTest/ViewModel/ChangeDeviceNameViewModel.cs
@@ -39,11 +39,11 @@ namespace BPASmartClient.FoodStationTest.ViewModel
                             res.RawMaterialName = DeviceName;
                             DeviceInquire.GetInstance.devices.ElementAt(index).DeviceName = DeviceName;
                             DeviceInquire.GetInstance.GetDevice(IpAddress).SetDeviceName(DeviceName);//设置PLC名称
-                            for (int i = 0; i < Json<LocaPar>.Data.Recipes.Count; i++)
+                            for (int i = 0; i < Json<LocalPar>.Data.Recipes.Count; i++)
                             {
-                                for (int m = 0; m < Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.Count; m++)
+                                for (int m = 0; m < Json<LocalPar>.Data.Recipes.ElementAt(i).RawMaterials.Count; m++)
                                 {
-                                    Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).RawMaterialName = DeviceName;
+                                    Json<LocalPar>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).RawMaterialName = DeviceName;
                                 }
                             }
                             ActionManage.GetInstance.Send("ChangeDeviceNameViewClose");
diff --git a/BPASmartClient.FoodStationTest/ViewModel/ManualControlViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/ManualControlViewModel.cs
index 5af1d1e0..30d88485 100644
--- a/BPASmartClient.FoodStationTest/ViewModel/ManualControlViewModel.cs
+++ b/BPASmartClient.FoodStationTest/ViewModel/ManualControlViewModel.cs
@@ -161,9 +161,9 @@ namespace BPASmartClient.FoodStationTest.ViewModel
                 }
                 Thread.Sleep(200);
             }), "获取系统状态", true);
-            if (cylinderModels.Count < 15)
+            if (cylinderModels.Count < Json<LocalPar>.Data.RawMaterialDeviceNum)
             {
-                for (int i = 0; i < 15; i++)
+                for (int i = 0; i < Json<LocalPar>.Data.RawMaterialDeviceNum; i++)
                 {
                     cylinderModels.Add(new CylinderModel()
                     {
diff --git a/BPASmartClient.FoodStationTest/ViewModel/NewRecipeViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/NewRecipeViewModel.cs
index 72431cfb..00e28f3e 100644
--- a/BPASmartClient.FoodStationTest/ViewModel/NewRecipeViewModel.cs
+++ b/BPASmartClient.FoodStationTest/ViewModel/NewRecipeViewModel.cs
@@ -76,9 +76,9 @@ p:
 
                 if (RecipeCode.Length <= 0)//新建配方
                 {
-                    var res = Array.FindIndex(Json<LocaPar>.Data.Recipes.ToArray(), p => p.RecipeName == RecipeName);
+                    var res = Array.FindIndex(Json<LocalPar>.Data.Recipes.ToArray(), p => p.RecipeName == RecipeName);
 
-                    if (res >= 0 && res < Json<LocaPar>.Data.Recipes.Count)
+                    if (res >= 0 && res < Json<LocalPar>.Data.Recipes.Count)
                     {
                         ErrorInfo = "该配方已存在，请重新输入";
                     }
@@ -89,14 +89,14 @@ p:
                 }
                 else//修改配方
                 {
-                    var res = Array.FindIndex(Json<LocaPar>.Data.Recipes.ToArray(), p => p.RecipCode == RecipeCode);
-                    if (res >= 0 && res < Json<LocaPar>.Data.Recipes.Count)
+                    var res = Array.FindIndex(Json<LocalPar>.Data.Recipes.ToArray(), p => p.RecipCode == RecipeCode);
+                    if (res >= 0 && res < Json<LocalPar>.Data.Recipes.Count)
                     {
-                        Json<LocaPar>.Data.Recipes.ElementAt(res).RecipeName = RecipeName;
-                        Json<LocaPar>.Data.Recipes.ElementAt(res).RawMaterials.Clear();
+                        Json<LocalPar>.Data.Recipes.ElementAt(res).RecipeName = RecipeName;
+                        Json<LocalPar>.Data.Recipes.ElementAt(res).RawMaterials.Clear();
                         foreach (var item in RawMaterials)
                         {
-                            Json<LocaPar>.Data.Recipes.ElementAt(res).RawMaterials.Add(item);
+                            Json<LocalPar>.Data.Recipes.ElementAt(res).RawMaterials.Add(item);
                         }
                     }
                 }
@@ -155,9 +155,9 @@ p:
             var dates = date.Split("-").ToList();
             StringBuilder sb = new StringBuilder();
             dates?.ForEach((item) => { sb.Append(item); });
-            Json<LocaPar>.Data.Recipes.Add(new RecipeModel()
+            Json<LocalPar>.Data.Recipes.Add(new RecipeModel()
             {
-                SerialNum = Json<LocaPar>.Data.Recipes.Count + 1,
+                SerialNum = Json<LocalPar>.Data.Recipes.Count + 1,
                 RawMaterials = RawMaterials,
                 RecipCode = sb.ToString(),
                 RecipeName = RecipeName,
diff --git a/BPASmartClient.FoodStationTest/ViewModel/RecipeControlViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/RecipeControlViewModel.cs
index d06ef9e6..adb38a41 100644
--- a/BPASmartClient.FoodStationTest/ViewModel/RecipeControlViewModel.cs
+++ b/BPASmartClient.FoodStationTest/ViewModel/RecipeControlViewModel.cs
@@ -166,7 +166,7 @@ namespace BPASmartClient.FoodStationTest.ViewModel
 
         public RelayCommand<object> ChangeRecipeStateCommand { get; set; }
 
-        public static ObservableCollection<RecipeModel> Recipes { get; set; } = Json<LocaPar>.Data.Recipes;
+        public static ObservableCollection<RecipeModel> Recipes { get; set; } = Json<LocalPar>.Data.Recipes;
 
         public string CurrentRecipeName { get { return _RecipeName; } set { _RecipeName = value; OnPropertyChanged(); } }
         private static string _RecipeName;
diff --git a/BPASmartClient.FoodStationTest/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/RecipeReceiveViewModel.cs
index b455ddc6..de9c66c2 100644
--- a/BPASmartClient.FoodStationTest/ViewModel/RecipeReceiveViewModel.cs
+++ b/BPASmartClient.FoodStationTest/ViewModel/RecipeReceiveViewModel.cs
@@ -19,7 +19,6 @@ namespace BPASmartClient.FoodStationTest.ViewModel
         {
             NotUseSmallDosing = GVL_SmallStation.GetInstance.NotUseSmallStation;
             IsUseLocalRecipe = GVL_SmallStation.GetInstance.IsUseLocalRecipe;
-            IsUseWindSendDosing = GVL_SmallStation.GetInstance.IsUseWindSend;
             Recipes = Json<LocalRecipeDataColl>.Data.Recipes;
 
             NewRecipe = new RelayCommand(() =>
@@ -116,7 +115,7 @@ go:
                         RawMaterialLocation = i,
                     });
                 }
-                if (GVL_SmallStation.GetInstance.IsUseWindSend && trayCode == 1)
+                if (/*GVL_SmallStation.GetInstance.IsUseWindSend &&*/ trayCode == 1)
                 {
                     for (int i = 1; i < 6; i++)
                     {
diff --git a/BPASmartClient.FoodStationTest/ViewModel/RecipeSettingsViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/RecipeSettingsViewModel.cs
index 57c7fcde..44321559 100644
--- a/BPASmartClient.FoodStationTest/ViewModel/RecipeSettingsViewModel.cs
+++ b/BPASmartClient.FoodStationTest/ViewModel/RecipeSettingsViewModel.cs
@@ -15,7 +15,7 @@ namespace BPASmartClient.FoodStationTest.ViewModel
     {
         public RecipeSettingsViewModel()
         {
-            Recipes = Json<LocaPar>.Data.Recipes;
+            Recipes = Json<LocalPar>.Data.Recipes;
 
             NewMaterital = new RelayCommand(() =>
             {
@@ -30,7 +30,7 @@ namespace BPASmartClient.FoodStationTest.ViewModel
             });
             SaveRecipe = new RelayCommand(() =>
             {
-                Json<LocaPar>.Save();
+                Json<LocalPar>.Save();
                 MessageNotify.GetInstance.ShowUserLog("保存配方");
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"配方保存成功!");
             });
@@ -38,9 +38,9 @@ namespace BPASmartClient.FoodStationTest.ViewModel
             {
                 if (o is string str)
                 {
-                    var res = Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipCode == str);
+                    var res = Json<LocalPar>.Data.Recipes.FirstOrDefault(p => p.RecipCode == str);
                     if (res != null)
-                        Json<LocaPar>.Data.Recipes.Remove(res);
+                        Json<LocalPar>.Data.Recipes.Remove(res);
                     MessageNotify.GetInstance.ShowUserLog($"删除名称——{res.RecipeName}");
                 }
             });
@@ -51,7 +51,7 @@ namespace BPASmartClient.FoodStationTest.ViewModel
                 {
                     ActionManage.GetInstance.CancelRegister("Details");
                     NewRecipeView nrv = new NewRecipeView();
-                    var res = Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipCode == str);
+                    var res = Json<LocalPar>.Data.Recipes.FirstOrDefault(p => p.RecipCode == str);
                     ActionManage.GetInstance.Send("Details", res);
                     nrv.ShowDialog();
                     MessageNotify.GetInstance.ShowUserLog($"编辑配方名称——{res.RecipeName}");
diff --git a/BPASmartClient.FoodStationTest/ViewModel/RobotViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/RobotViewModel.cs
deleted file mode 100644
index 3824d07d..00000000
--- a/BPASmartClient.FoodStationTest/ViewModel/RobotViewModel.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using BPASmartClient.CustomResource.Pages.Model;
-using BPASmartClient.CustomResource.UserControls;
-using BPASmartClient.CustomResource.UserControls.MessageShow;
-using BPASmartClient.FoodStationTest.Model;
-using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.Input;
-using System;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using System.Threading;
-
-namespace BPASmartClient.FoodStationTest.ViewModel
-{
-    public class RobotViewModel : ObservableObject
-    {
-        public RobotViewModel()
-        {
-            ThreadManage.GetInstance().StartLong(() =>
-            {
-                IsRunProgramNum = GVL_SmallStation.GetInstance.RobotProgramNum;
-                RobotIsAutoMode = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(2);
-                RobotIsAutoRun = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(3);
-                RobotIsStop = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(4);
-                RobotIsRun = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(5);
-                RobotIsAlarm = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(6);
-                RobotIsHomed = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(7);
-                //RobotGetEmptyBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(8);
-                //RobotPutEmptyBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(9);
-                //RobotGetFullBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(10);
-                //RobotPutFullBarrelComplete = GVL_SmallStation.GetInstance.RobotStatus.GetBitValue(11);
-
-                Thread.Sleep(10);
-
-            }, "机器人状态", true);
-            SystemStart = new RelayCommand(() =>
-            {
-                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX0.1");
-                MessageNotify.GetInstance.ShowUserLog($"手动控制，机器人启动");
-                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"机器人启动，操作完成!");
-            });
-            SystemStop = new RelayCommand(() =>
-            {
-                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX0.2");
-                MessageNotify.GetInstance.ShowUserLog($"手动控制，机器人停止");
-                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"机器人停止，操作完成!");
-            });
-            EStopReset = new RelayCommand(() =>
-            {
-                ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX0.3");
-                MessageNotify.GetInstance.ShowUserLog($"手动控制，机器人急停复位");
-                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"机器人急停复位，操作完成!");
-            });
-
-            //TestRobotRun = new RelayCommand(() => {
-            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.4");
-            //});
-            //AutoMode = new RelayCommand(() => {
-            //    ActionManage.GetInstance.Send("RobotSendFalseCommand", "DB4.DBX100.3");
-            //});
-            //TestMode = new RelayCommand(() => {
-            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.3");
-            //});
-
-            //RobotGetEmptyBarrel = new RelayCommand(() => {
-            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX100.7");
-            //});
-            //RobotPutEmptyBarrel = new RelayCommand(() => {
-            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.0");
-            //});
-            //RobotGetFullBarrel = new RelayCommand(() => {
-            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.1");
-            //});
-            //RobotPutFullBarrel = new RelayCommand(() => {
-            //    ActionManage.GetInstance.Send("RobotSendTrueCommand", "DB4.DBX101.2");
-            //});
-            //SetProgramNumCommand = new RelayCommand(() =>{
-            //    ActionManage.GetInstance.Send("RobotSetProgramNum", SetProgramNum);
-            //});
-        }
-        public RelayCommand SystemStart { get; set; }
-        public RelayCommand SystemStop { get; set; }
-        public RelayCommand EStopReset { get; set; }
-
-        public RelayCommand TestRobotRun { get; set; }
-        public RelayCommand AutoMode { get; set; }
-        public RelayCommand TestMode { get; set; }
-
-        public RelayCommand RobotGetEmptyBarrel { get; set; }
-        public RelayCommand RobotPutEmptyBarrel { get; set; }
-        public RelayCommand RobotGetFullBarrel { get; set; }
-        public RelayCommand RobotPutFullBarrel { get; set; }
-        public RelayCommand SetProgramNumCommand { get; set; }
-
-        public static short IsRunProgramNum { get { return _runProgramNum; } set { _runProgramNum = value; OnStaticPropertyChanged(); } }
-        private static short _runProgramNum;
-        public short SetProgramNum { get { return _SetProgramNum; } set { _SetProgramNum = value; OnPropertyChanged(); } }
-        private short _SetProgramNum;
-
-        public static bool RobotIsAutoMode { get { return _RobotIsAutoMode; } set { _RobotIsAutoMode = value; OnStaticPropertyChanged(); } }
-        private static bool _RobotIsAutoMode;
-        public static bool RobotIsAutoRun { get { return _RobotIsAutoRun; } set { _RobotIsAutoRun = value; OnStaticPropertyChanged(); } }
-        private static bool _RobotIsAutoRun;
-        public static bool RobotIsStop { get { return _RobotIsStop; } set { _RobotIsStop = value; OnStaticPropertyChanged(); } }
-        private static bool _RobotIsStop;
-        public static bool RobotIsRun { get { return _RobotIsRun; } set { _RobotIsRun = value; OnStaticPropertyChanged(); } }
-        private static bool _RobotIsRun;
-        public static bool RobotIsAlarm { get { return _RobotIsAlarm; } set { _RobotIsAlarm = value; OnStaticPropertyChanged(); } }
-        private static bool _RobotIsAlarm;
-        public static bool RobotIsHomed { get { return _RobotIsHomed; } set { _RobotIsHomed = value; OnStaticPropertyChanged(); } }
-        private static bool _RobotIsHomed;
-        public bool RobotGetEmptyBarrelComplete { get { return _RobotGetEmptyBarrelComplete; } set { _RobotGetEmptyBarrelComplete = value; OnPropertyChanged(); } }
-        private bool _RobotGetEmptyBarrelComplete;
-        public bool RobotPutEmptyBarrelComplete { get { return _RobotPutEmptyBarrelComplete; } set { _RobotPutEmptyBarrelComplete = value; OnPropertyChanged(); } }
-        private bool _RobotPutEmptyBarrelComplete;
-        public bool RobotGetFullBarrelComplete { get { return _RobotGetFullBarrelComplete; } set { _RobotGetFullBarrelComplete = value; OnPropertyChanged(); } }
-        private bool _RobotGetFullBarrelComplete;
-
-        public bool RobotPutFullBarrelComplete { get { return _RobotPutFullBarrelComplete; } set { _RobotPutFullBarrelComplete = value; OnPropertyChanged(); } }
-        private bool _RobotPutFullBarrelComplete;
-
-
-        public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
-        public static void OnStaticPropertyChanged([CallerMemberName] string PropName = "")
-        {
-            StaticPropertyChanged?.Invoke(null, new PropertyChangedEventArgs(PropName));
-        }
-    }
-}
diff --git a/BPASmartClient.FoodStationTest/ViewModel/SystemParViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/SystemParViewModel.cs
index 89778fbc..4cd37af0 100644
--- a/BPASmartClient.FoodStationTest/ViewModel/SystemParViewModel.cs
+++ b/BPASmartClient.FoodStationTest/ViewModel/SystemParViewModel.cs
@@ -13,8 +13,6 @@ namespace BPASmartClient.FoodStationTest.ViewModel
     {
         public SystemParViewModel()
         {
-            SiemensConnect = Json<DevicePar>.Data.deviceConnectPar.SiemensConnect;
-            WindSendConnect = Json<DevicePar>.Data.deviceConnectPar.WindSendConnect;
             HKPlcConnect = Json<DevicePar>.Data.deviceConnectPar.HKPlcConnect;
             ShieldStockbinAlarm = Json<DevicePar>.Data.deviceConnectPar.ShieldStockbinAlarm;
 
@@ -26,8 +24,6 @@ namespace BPASmartClient.FoodStationTest.ViewModel
             Axis2Speed = Json<DevicePar>.Data.deviceConnectPar.Axis2Speed;
             SaveCommand = new RelayCommand(() =>
             {
-                Json<DevicePar>.Data.deviceConnectPar.SiemensConnect = SiemensConnect;
-                Json<DevicePar>.Data.deviceConnectPar.WindSendConnect = WindSendConnect;
                 Json<DevicePar>.Data.deviceConnectPar.HKPlcConnect = HKPlcConnect;
                 Json<DevicePar>.Data.deviceConnectPar.ShieldStockbinAlarm = ShieldStockbinAlarm;
 
@@ -59,10 +55,6 @@ namespace BPASmartClient.FoodStationTest.ViewModel
 
         public ConnectParMode CommBaseParModel { get { return Json<DevicePar>.Data.deviceConnectPar; } set { Json<DevicePar>.Data.deviceConnectPar = value; OnPropertyChanged(); } }
 
-        public bool SiemensConnect { get { return _mSiemensConnect; } set { _mSiemensConnect = value; OnPropertyChanged(); } }
-        private bool _mSiemensConnect;
-        public bool WindSendConnect { get { return _mWindSendConnect; } set { _mWindSendConnect = value; OnPropertyChanged(); } }
-        private bool _mWindSendConnect;
         public bool HKPlcConnect { get { return _mHKPlcConnect; } set { _mHKPlcConnect = value; OnPropertyChanged(); } }
         private bool _mHKPlcConnect;
         public bool ShieldStockbinAlarm { get { return _mShieldStockbinAlarm; } set { _mShieldStockbinAlarm = value; OnPropertyChanged(); } }
diff --git a/BPASmartClient.FoodStationTest/ViewModel/WindSendParViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/WindSendParViewModel.cs
deleted file mode 100644
index 165f7821..00000000
--- a/BPASmartClient.FoodStationTest/ViewModel/WindSendParViewModel.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using BPASmartClient.FoodStationTest.Model;
-using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.Input;
-
-namespace BPASmartClient.FoodStationTest.ViewModel
-{
-    public class WindSendParViewModel : ObservableObject
-    {
-        public WindSendParViewModel()
-        {
-
-            SaveRawMaterialPara = new RelayCommand(() =>
-            {
-                Json<DevicePar>.Save();
-            });
-        }
-
-        public RelayCommand SaveRawMaterialPara { get; set; }
-
-    }
-}

From 10d55b7d4268a77f76ec58c1620aa6243b0d5ad7 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Sat, 10 Jun 2023 11:26:20 +0800
Subject: [PATCH 93/96] =?UTF-8?q?1.=20=E5=AE=8C=E5=96=84=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E3=80=822.=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=96=B0=E5=A2=9E=E9=85=8D=E6=96=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E4=B8=BA=E5=B7=B2=E7=AD=9B=E9=80=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.JXJFoodBigStation/App.xaml     |   2 +-
 .../View/BomOfMaterialView.xaml               | 101 ++++++++----
 .../View/DeviceManageView.xaml                |  26 +--
 .../View/HardwareStatusView.xaml              | 150 ++++++++++--------
 .../ViewModel/BomOfMaterialViewModel.cs       |   2 +
 .../ViewModel/ChangeDeviceNameViewModel.cs    |   4 +-
 .../ViewModel/ManualFlowViewModel.cs          |   8 +-
 .../ViewModel/RecipeInfosViewModel.cs         |   8 +-
 .../ViewModel/RecipeReceiveViewModel.cs       |   6 +-
 .../ViewModel/RecipeSendDownViewModel.cs      |   3 +-
 .../ViewModel/SelectRecipesViewModel.cs       |   4 +-
 .../Model/ProcessControl.cs                   |  66 ++++----
 .../View/HardwareStatusView.xaml              |   2 +-
 .../View/ManualCommView.xaml                  | 110 +++++++------
 .../View/RecipeInfosView.xaml                 |   4 +-
 .../ViewModel/BomOfMaterialViewModel.cs       |   9 +-
 .../ViewModel/ChangeDeviceNameViewModel.cs    |   1 +
 .../ViewModel/DeviceMaterialParViewModel.cs   |   9 +-
 .../ViewModel/ManualControlViewModel.cs       |   1 +
 .../ViewModel/NewLocalRecipeViewModel.cs      |   9 +-
 .../ViewModel/NewRecipeViewModel.cs           |  11 +-
 .../ViewModel/RecipeReceiveViewModel.cs       |  13 +-
 .../ViewModel/StockBinRawMaterialViewModel.cs |   2 +
 .../ViewModel/SystemParViewModel.cs           |   7 +-
 .../ViewModel/WindSendParViewModel.cs         |   3 +
 25 files changed, 350 insertions(+), 211 deletions(-)

diff --git a/BPASmartClient.JXJFoodBigStation/App.xaml b/BPASmartClient.JXJFoodBigStation/App.xaml
index 8b368652..1871f7ee 100644
--- a/BPASmartClient.JXJFoodBigStation/App.xaml
+++ b/BPASmartClient.JXJFoodBigStation/App.xaml
@@ -59,7 +59,7 @@
                 </Setter>
             </Style>
 
-            
+
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml b/BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml
index cebe958f..868e00af 100644
--- a/BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml
@@ -1,16 +1,18 @@
-<UserControl x:Class="BPASmartClient.JXJFoodBigStation.View.BomOfMaterialView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
-             mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920">
+<UserControl
+    x:Class="BPASmartClient.JXJFoodBigStation.View.BomOfMaterialView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
     <UserControl.DataContext>
         <vm:BomOfMaterialViewModel />
     </UserControl.DataContext>
-    
+
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
@@ -19,7 +21,10 @@
         </Grid.RowDefinitions>
         <!--#region 表格标题栏设置-->
         <Grid>
-            <StackPanel HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
+            <StackPanel
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
                 <pry:IcoButton
                     Margin="5"
                     Command="{Binding AddMaterial}"
@@ -35,32 +40,55 @@
                     Foreground="Aqua"
                     Style="{StaticResource IcoButtonStyle}" />
             </StackPanel>
-            
+
         </Grid>
         <Grid
             Grid.Row="1"
             Margin="0,10,0,0"
             Background="#ff0C255F">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="1*" />
             </Grid.ColumnDefinitions>
             <Grid Grid.Column="0">
-                <TextBlock  Text="序号" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"/>
-                <Border BorderThickness="1,1,1,1" Cursor="SizeWE"   />
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="24"
+                    Foreground="Aqua"
+                    Text="序号" />
+                <Border BorderThickness="1,1,1,1" Cursor="SizeWE" />
             </Grid>
-            <TextBlock  Grid.Column="1" FontSize="24" Text="原料编号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
-            <TextBlock  Grid.Column="2" FontSize="24" Text="原料名称" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
-            <TextBlock  Grid.Column="3" FontSize="24" Text="操作" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <TextBlock
+                Grid.Column="1"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="24"
+                Foreground="Aqua"
+                Text="原料编号" />
+            <TextBlock
+                Grid.Column="2"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="24"
+                Foreground="Aqua"
+                Text="原料名称" />
+            <TextBlock
+                Grid.Column="3"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="24"
+                Foreground="Aqua"
+                Text="操作" />
         </Grid>
         <Grid Grid.Row="2">
-            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Visible"  >
-                <ItemsControl ItemsSource="{Binding RawMaterialInfo}" Foreground="Aqua">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Visible">
+                <ItemsControl Foreground="Aqua" ItemsSource="{Binding RawMaterialInfo}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <Grid Name="gr" >
+                            <Grid Name="gr">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition />
                                     <ColumnDefinition />
@@ -69,28 +97,33 @@
                                 </Grid.ColumnDefinitions>
                                 <Grid Grid.Column="0" Margin="5">
                                     <TextBlock
-                                        FontSize="16"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
-                                        Text="{Binding  RawMaterialCount}" />
+                                        FontSize="16"
+                                        Text="{Binding RawMaterialCount}" />
                                 </Grid>
                                 <Grid Grid.Column="1" Margin="5">
                                     <TextBox
-                                        FontSize="16"
                                         HorizontalAlignment="Center"
-                                        VerticalAlignment="Center" 
-                                        Text="{Binding  RawMaterialName}" />
+                                        VerticalAlignment="Center"
+                                        HorizontalContentAlignment="Center"
+                                        VerticalContentAlignment="Center"
+                                        Width="200"
+                                        FontSize="16"
+                                        Text="{Binding RawMaterialName}" />
                                 </Grid>
                                 <Grid Grid.Column="2">
                                     <TextBox
                                         Width="200"
-                                        FontSize="16"
                                         HorizontalAlignment="Center"
-                                        VerticalAlignment="Center" 
-                                        Text="{Binding  RawMaterialChineseName}" />
+                                        VerticalAlignment="Center"
+                                        HorizontalContentAlignment="Center"
+                                        VerticalContentAlignment="Center"
+                                        FontSize="16"
+                                        Text="{Binding RawMaterialChineseName}" />
                                 </Grid>
                                 <Grid Grid.Column="3">
-                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                    <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                                         <pry:IcoButton
                                             Margin="3,4,4,0"
                                             HorizontalAlignment="Center"
@@ -107,7 +140,7 @@
                                     </StackPanel>
                                 </Grid>
                             </Grid>
-                            
+
                             <DataTemplate.Triggers>
                                 <Trigger Property="IsMouseOver" Value="true">
                                     <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
diff --git a/BPASmartClient.JXJFoodBigStation/View/DeviceManageView.xaml b/BPASmartClient.JXJFoodBigStation/View/DeviceManageView.xaml
index c296e260..b0c1aea0 100644
--- a/BPASmartClient.JXJFoodBigStation/View/DeviceManageView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/DeviceManageView.xaml
@@ -1,14 +1,16 @@
-<UserControl x:Class="BPASmartClient.JXJFoodBigStation.View.DeviceManageView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:BPASmartClient.JXJFoodBigStation.View"
-             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="BPASmartClient.JXJFoodBigStation.View.DeviceManageView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.JXJFoodBigStation.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <UserControl.DataContext>
-        <vm:DeviceManageViewModel/>
+        <vm:DeviceManageViewModel />
     </UserControl.DataContext>
     <Grid Margin="-5,0,5,0">
 
@@ -43,10 +45,10 @@
                             ClipToBounds="True"
                             CornerRadius="0">
                             <Border.Background>
-                                <ImageBrush Stretch="Fill" ImageSource="/BPASmartClient.CustomResource;component/Image/蓝色背景.png" />
+                                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/蓝色背景.png" Stretch="Fill" />
                             </Border.Background>
 
-                            <Grid Margin="20 0">
+                            <Grid Margin="20,0">
 
                                 <!--<Grid.RowDefinitions>
                                     <RowDefinition />
diff --git a/BPASmartClient.JXJFoodBigStation/View/HardwareStatusView.xaml b/BPASmartClient.JXJFoodBigStation/View/HardwareStatusView.xaml
index e0d3a366..6e5015fc 100644
--- a/BPASmartClient.JXJFoodBigStation/View/HardwareStatusView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/HardwareStatusView.xaml
@@ -16,56 +16,67 @@
         <vm:HardwareStatusViewModel />
     </UserControl.DataContext>
     <UserControl.Resources>
-        <PathGeometry x:Key="move" Figures="M 0,0  L 0,20"/>
-        <Storyboard x:Key="Open" >
-            <DoubleAnimationUsingPath Duration="0:0:1" PathGeometry="{StaticResource move}"  RepeatBehavior="Forever" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[1].(Y)" Source="Y"></DoubleAnimationUsingPath>
+        <PathGeometry x:Key="move" Figures="M 0,0  L 0,20" />
+        <Storyboard x:Key="Open">
+            <DoubleAnimationUsingPath
+                PathGeometry="{StaticResource move}"
+                RepeatBehavior="Forever"
+                Source="Y"
+                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[1].(Y)"
+                Duration="0:0:1" />
         </Storyboard>
-        <SolidColorBrush x:Key="ListBox.Static.Background" Color="#FFFFFFFF"/>
-        <SolidColorBrush x:Key="ListBox.Static.Border" Color="#FFABADB3"/>
-        <SolidColorBrush x:Key="ListBox.Disabled.Background" Color="#FFFFFFFF"/>
-        <SolidColorBrush x:Key="ListBox.Disabled.Border" Color="#FFD9D9D9"/>
+        <SolidColorBrush x:Key="ListBox.Static.Background" Color="#FFFFFFFF" />
+        <SolidColorBrush x:Key="ListBox.Static.Border" Color="#FFABADB3" />
+        <SolidColorBrush x:Key="ListBox.Disabled.Background" Color="#FFFFFFFF" />
+        <SolidColorBrush x:Key="ListBox.Disabled.Border" Color="#FFD9D9D9" />
         <Style x:Key="ListViewStyle1" TargetType="{x:Type ListView}">
-            <Setter Property="Background" Value="{StaticResource ListBox.Static.Background}"/>
-            <Setter Property="BorderBrush" Value="{StaticResource ListBox.Static.Border}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-            <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
-            <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-            <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="Background" Value="{StaticResource ListBox.Static.Background}" />
+            <Setter Property="BorderBrush" Value="{StaticResource ListBox.Static.Border}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+            <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+            <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+            <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ListView}">
-                        <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="1" SnapsToDevicePixels="true">
-                            <ScrollViewer Focusable="false" Padding="{TemplateBinding Padding}">
-                                <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        <Border
+                            x:Name="Bd"
+                            Padding="1"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="true">
+                            <ScrollViewer Padding="{TemplateBinding Padding}" Focusable="false">
+                                <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </ScrollViewer>
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsEnabled" Value="false">
-                                <Setter Property="Background" TargetName="Bd" Value="{StaticResource ListBox.Disabled.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource ListBox.Disabled.Border}"/>
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource ListBox.Disabled.Background}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource ListBox.Disabled.Border}" />
                             </Trigger>
                             <MultiTrigger>
                                 <MultiTrigger.Conditions>
-                                    <Condition Property="IsGrouping" Value="true"/>
-                                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                                    <Condition Property="IsGrouping" Value="true" />
+                                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
                                 </MultiTrigger.Conditions>
-                                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                                <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
                             </MultiTrigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
         </Style>
-        
+
     </UserControl.Resources>
     <!--<UserControl.Triggers>
         <EventTrigger RoutedEvent="Loaded">
             <BeginStoryboard Storyboard="{StaticResource Open}"></BeginStoryboard>
-           
+
             </EventTrigger>
     </UserControl.Triggers>-->
     <!--<Grid>
@@ -360,14 +371,15 @@
 
         <!--#region 顶部料仓-->
         <Grid Name="TopGrid">
-            <ListView Style="{DynamicResource ListViewStyle1}"
+            <ListView
                 x:Name="FListView"
                 Height="{Binding ElementName=TopGrid, Path=ActualHeight}"
                 VerticalAlignment="Center"
                 Background="Transparent"
                 BorderThickness="0"
                 ItemsSource="{Binding TopDeviceCurrentStatuses}"
-                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                Style="{DynamicResource ListViewStyle1}">
                 <ListView.ItemsPanel>
                     <ItemsPanelTemplate>
                         <!--<WrapPanel Orientation="Horizontal" IsItemsHost="True"/>-->
@@ -395,7 +407,7 @@
                                     VerticalAlignment="Bottom"
                                     FontSize="25"
                                     Text="{Binding DeviceName}">
-                                    
+
                                 </TextBox>-->
                                 <TextBlock
                                     Margin="0,0,0,35"
@@ -403,28 +415,31 @@
                                     VerticalAlignment="Bottom"
                                     FontSize="25"
                                     Foreground="#ffccd61f"
-                                    Text="{Binding DeviceName}"
-                                     />
+                                    Text="{Binding DeviceName}" />
                                 <StackPanel
                                     Grid.RowSpan="2"
-                                    Panel.ZIndex="1"
                                     Margin="55,100,0,0"
-                                    HorizontalAlignment="Center">
+                                    HorizontalAlignment="Center"
+                                    Panel.ZIndex="1">
 
-                                    <Path x:Name="path" Tag="{Binding DeviceName}" Visibility="Hidden"   Data="M -15,8 L 17,17 C 17,17 19,18 17,19 L 17,19 L -15,28 C -15,28 -17,28.2 -16,26 L -16,26 L -5,18 L -16,10 C -16,10 -17,8.5 -15,8 Z">
+                                    <Path
+                                        x:Name="path"
+                                        Data="M -15,8 L 17,17 C 17,17 19,18 17,19 L 17,19 L -15,28 C -15,28 -17,28.2 -16,26 L -16,26 L -5,18 L -16,10 C -16,10 -17,8.5 -15,8 Z"
+                                        Tag="{Binding DeviceName}"
+                                        Visibility="Hidden">
                                         <Path.RenderTransform>
                                             <TransformGroup>
-                                                <RotateTransform Angle="90"/>
-                                                <TranslateTransform  Y="0"/>
+                                                <RotateTransform Angle="90" />
+                                                <TranslateTransform Y="0" />
                                             </TransformGroup>
                                         </Path.RenderTransform>
                                         <Path.Fill>
                                             <LinearGradientBrush>
                                                 <LinearGradientBrush.RelativeTransform>
-                                                    <RotateTransform Angle="-15"/>
+                                                    <RotateTransform Angle="-15" />
                                                 </LinearGradientBrush.RelativeTransform>
-                                                <GradientStop Color="LightGreen" Offset="0"/>
-                                                <GradientStop Color="LightSeaGreen" Offset="0.6"/> 
+                                                <GradientStop Offset="0" Color="LightGreen" />
+                                                <GradientStop Offset="0.6" Color="LightSeaGreen" />
                                             </LinearGradientBrush>
                                         </Path.Fill>
                                     </Path>
@@ -446,9 +461,9 @@
                                         FontSize="20"
                                         Foreground="#FF0084FF"
                                         Text=" kg" />
-                                   
+
                                 </StackPanel>
-                                
+
 
                                 <StackPanel
                                     Grid.Row="1"
@@ -484,7 +499,7 @@
 
                                 <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="2">
                                     <pry:IcoButton
-                                 
+
                                 Width="80"
                                 Height="{Binding ElementName=gr, Path=ActualHeight}"
                                 Margin="5,0,10,0"
@@ -495,7 +510,7 @@
                                 Command="{Binding DataContext.StartCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
                                 CommandParameter="{Binding DeviceName}"
                                         Tag="{Binding DeviceName}"
-                              
+
                                 Content="启动"
                                 EnterBackground="#222AB2E7"
                                 Foreground="#FF2AB2E7"
@@ -503,7 +518,7 @@
                                  Style="{StaticResource IcoButtonStyle}"
                                   />
                                     <pry:IcoButton
-                                 
+
                                 Width="80"
                                 Height="{Binding ElementName=gr, Path=ActualHeight}"
                                 HorizontalAlignment="Center"
@@ -513,7 +528,7 @@
                                 Command="{Binding DataContext.StopCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
                                 CommandParameter="{Binding DeviceName}"
                                         Tag="{Binding DeviceName}"
-                                        
+
                                 Content="停止"
                                 EnterBackground="#22F53F62"
                                 Foreground="#FFF53F62"
@@ -529,7 +544,10 @@
         </Grid>
         <!--#endregion-->
 
-        <Grid x:Name="gr" Grid.Row="1" Margin="0,50,0,0">
+        <Grid
+            x:Name="gr"
+            Grid.Row="1"
+            Margin="0,50,0,0">
             <pry:ConveyorBelt
                 Grid.Row="1"
                 Width="{Binding ElementName=gr, Path=ActualWidth}"
@@ -540,19 +558,19 @@
                 StrokeBrush="#00BEFA"
                 StrokeDashArray="1.5 1.5"
                 StrokeFillBrush="#00BEFA"
-                StrokeThickness="2"  />
+                StrokeThickness="2" />
         </Grid>
 
         <!--#region 底部料仓-->
         <Grid Grid.Row="2">
             <ListView
-                Style="{DynamicResource ListViewStyle1}"
                 x:Name="buttonListView"
                 VerticalAlignment="Top"
                 Background="Transparent"
                 BorderThickness="0"
                 ItemsSource="{Binding BottomDeviceCurrentStatuses}"
-                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                Style="{DynamicResource ListViewStyle1}">
                 <ListView.ItemsPanel>
                     <ItemsPanelTemplate>
                         <UniformGrid
@@ -568,8 +586,8 @@
                         <Border Margin="5" Background="Transparent">
                             <Grid Height="220">
                                 <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
+                                    <RowDefinition />
+                                    <RowDefinition />
                                     <!--<RowDefinition  Height="0.1*"/>-->
                                 </Grid.RowDefinitions>
 
@@ -582,24 +600,28 @@
                                     Text="{Binding DeviceName}" />
                                 <StackPanel
                                     Grid.RowSpan="2"
-                                    Panel.ZIndex="1"
                                     Margin="55,100,0,0"
-                                    HorizontalAlignment="Center">
+                                    HorizontalAlignment="Center"
+                                    Panel.ZIndex="1">
 
-                                    <Path x:Name="path1" Tag="{Binding DeviceName}" Visibility="Collapsed"   Data="M -15,8 L 17,17 C 17,17 19,18 17,19 L 17,19 L -15,28 C -15,28 -17,28.2 -16,26 L -16,26 L -5,18 L -16,10 C -16,10 -17,8.5 -15,8 Z">
+                                    <Path
+                                        x:Name="path1"
+                                        Data="M -15,8 L 17,17 C 17,17 19,18 17,19 L 17,19 L -15,28 C -15,28 -17,28.2 -16,26 L -16,26 L -5,18 L -16,10 C -16,10 -17,8.5 -15,8 Z"
+                                        Tag="{Binding DeviceName}"
+                                        Visibility="Collapsed">
                                         <Path.RenderTransform>
                                             <TransformGroup>
-                                                <RotateTransform Angle="90"/>
-                                                <TranslateTransform  Y="0"/>
+                                                <RotateTransform Angle="90" />
+                                                <TranslateTransform Y="0" />
                                             </TransformGroup>
                                         </Path.RenderTransform>
                                         <Path.Fill>
                                             <LinearGradientBrush>
                                                 <LinearGradientBrush.RelativeTransform>
-                                                    <RotateTransform Angle="-15"/>
+                                                    <RotateTransform Angle="-15" />
                                                 </LinearGradientBrush.RelativeTransform>
-                                                <GradientStop Color="LightGreen" Offset="0"/>
-                                                <GradientStop Color="LightSeaGreen" Offset="0.5"/>
+                                                <GradientStop Offset="0" Color="LightGreen" />
+                                                <GradientStop Offset="0.5" Color="LightSeaGreen" />
                                             </LinearGradientBrush>
                                         </Path.Fill>
                                     </Path>
@@ -651,7 +673,7 @@
                                     Stretch="Fill" />
                                 <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="2">
                                     <pry:IcoButton
-                                 
+
                                 Width="80"
                                 Height="{Binding ElementName=gr, Path=ActualHeight}"
                                 Margin="5,0,10,0"
@@ -662,7 +684,7 @@
                                 Command="{Binding DataContext.StartCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
                                 CommandParameter="{Binding DeviceName}"
                                         Tag="{Binding DeviceName}"
-                               
+
                                 Content="启动"
                                 EnterBackground="#222AB2E7"
                                 Foreground="#FF2AB2E7"
@@ -670,7 +692,7 @@
                                  Style="{StaticResource IcoButtonStyle}"
                                   />
                                     <pry:IcoButton
-                                 
+
                                 Width="80"
                                 Height="{Binding ElementName=gr, Path=ActualHeight}"
                                 HorizontalAlignment="Center"
@@ -680,7 +702,7 @@
                                 Command="{Binding DataContext.StopCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
                                 CommandParameter="{Binding DeviceName}"
                                         Tag="{Binding DeviceName}"
-                                        
+
                                 Content="停止"
                                 EnterBackground="#22F53F62"
                                 Foreground="#FFF53F62"
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/BomOfMaterialViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/BomOfMaterialViewModel.cs
index 81339514..83026ba4 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/BomOfMaterialViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/BomOfMaterialViewModel.cs
@@ -40,6 +40,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                 {
                     RawMaterialCount = Json<BomMaterial>.Data.RawMaterials.Count +1 ,
                 });
+                MessageNotify.GetInstance.ShowUserLog("新增一条物料数据。");
             });
             SaveMaterials = new RelayCommand(() =>
             {
@@ -61,6 +62,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                         {
                             RawMaterialInfo.Remove(res);
                             NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"删除成功");
+                            MessageNotify.GetInstance.ShowUserLog($"删除一条物料数据，物料为：【{res.RawMaterialName}】：{res.RawMaterialChineseName}。");
                         }
                     }
                 }
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/ChangeDeviceNameViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/ChangeDeviceNameViewModel.cs
index 4d02f77e..36a70bbb 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/ChangeDeviceNameViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/ChangeDeviceNameViewModel.cs
@@ -1,4 +1,5 @@
-using BPASmartClient.Helper;
+using BPASmartClient.CustomResource.Pages.Model;
+using BPASmartClient.Helper;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
@@ -41,6 +42,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                     return;
                 }
                 ActionManage.GetInstance.Send("UpdateDeviceName", DeviceName);
+                MessageNotify.GetInstance.ShowUserLog($"修改了设备名称为【{DeviceName}】。");
                 ActionManage.GetInstance.Send("ChangeDeviceNameViewClose");
             });
         }
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
index 951df57b..569f1408 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs
@@ -30,6 +30,8 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                 {
                     byte loc = Convert.ToByte(o);
                     GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(loc, true);
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"操作成功");
+                    MessageNotify.GetInstance.ShowUserLog($"手动点击AGV到达工位{loc}。");
                 }
             });
             TrayLeave = new RelayCommand<object>((o) => 
@@ -38,11 +40,15 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                 {
                     byte loc = Convert.ToByte(o);
                     GVL_BigStation.AGVPutTray = GVL_BigStation.AGVPutTray.SetBitValue(loc, false);
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"操作成功");
+                    MessageNotify.GetInstance.ShowUserLog($"手动点击AGV离开工位{loc}。");
                 }
             });
             ClearTrayInPlace = new RelayCommand(() =>
             {
                 GVL_BigStation.AGVPutTray = 0;
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"操作成功");
+                MessageNotify.GetInstance.ShowUserLog($"手动点击清除AGV到位信号按钮。");
             });
             ClearAllRecipe = new RelayCommand(() => 
             {
@@ -52,7 +58,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                 }
                 Json<RemoteRecipe>.Data.Recipes.Clear();
                 GVL_BigStation.SiemensSendRecipeStatus = 0;
-                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"清楚所有配方完成");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"清除所有配方完成");
                 MessageNotify.GetInstance.ShowUserLog($"手动清除所有西门子配方。");
             });
             CancelRecipeCommand = new RelayCommand(() => 
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
index 67d5b677..35e40295 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs
@@ -75,13 +75,17 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                         {
                             if (IsWashingBarrel)
                             {
-                                Json<LocalRecipe>.Data.Recipes.Add(new RecipeData { RecipeCode = recipeCode,RecipeName = RecipeName, TrayCode = TrayCode, IsWashingBarrel = IsWashingBarrel, OrderType="洗桶",RecipeCategory=RecipeCategory});
+                                var newRecipeData = new RecipeData { RecipeCode = recipeCode, RecipeName = RecipeName, TrayCode = TrayCode, IsWashingBarrel = IsWashingBarrel, OrderType = "洗桶", RecipeCategory = RecipeCategory };
+                                Json<LocalRecipe>.Data.Recipes.Add(newRecipeData);
+                                Json<LocalRecipe>.Data.SelectedRecipes.Add(newRecipeData);
                                 if (RawMaterialsInfo.Count > 0)
                                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Info, App.MainWindow, "提示", $"订单类型为洗桶，不保存原料信息");
                             }
                             else
                             {
-                                Json<LocalRecipe>.Data.Recipes.Add(new RecipeData { RecipeCode = recipeCode, RawMaterial = RawMaterialsInfo, RecipeName = RecipeName, TrayCode = TrayCode, IsWashingBarrel = IsWashingBarrel, OrderType = "配料", RecipeCategory = RecipeCategory });
+                                var newRecipeData = new RecipeData { RecipeCode = recipeCode, RawMaterial = RawMaterialsInfo, RecipeName = RecipeName, TrayCode = TrayCode, IsWashingBarrel = IsWashingBarrel, OrderType = "配料", RecipeCategory = RecipeCategory };
+                                Json<LocalRecipe>.Data.Recipes.Add(newRecipeData);
+                                Json<LocalRecipe>.Data.SelectedRecipes.Add(newRecipeData) ;
                             }
                             Json<LocalRecipe>.Save();
                             NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"配方保存完成");
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs
index 3a0eae43..e257ddd8 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs
@@ -38,7 +38,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                     var res = Json<LocalRecipe>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == num);
                     ActionManage.GetInstance.Send("RecipeInfo", res);
                     nrv.Show();
-                    MessageNotify.GetInstance.ShowUserLog($"查看配方——{res.RecipeName}");
+                    MessageNotify.GetInstance.ShowUserLog($"编辑配方，配方名称：【{res.RecipeName}】");
                 }
             });
             NewRecipe = new RelayCommand(() => 
@@ -114,7 +114,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
 
                 Json<LocalRecipe>.Data.Recipes.Clear();
                 Json<LocalRecipe>.Save();
-
+                Json<LocalRecipe>.Data.SelectedRecipes.Clear();
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"本地配方已全部删除！");
                 MessageNotify.GetInstance.ShowUserLog($"手动清除所有配方。");
             });
@@ -131,7 +131,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                     Recipes.Remove(res);
                     Json<LocalRecipe>.Save();
                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"配方删除完成");
-                    MessageNotify.GetInstance.ShowUserLog($"手动删除【{res.RecipeName}】配方：【{recipeCode}】,");
+                    MessageNotify.GetInstance.ShowUserLog($"手动删除【{res.RecipeName}】配方，编号：【{recipeCode}】,");
                 }
             });
         }
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
index 51b7f08b..58ddc7d3 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs
@@ -66,7 +66,8 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
                             {
                                 res.RecipesSource = RecipeSource.本地;
                                 Json<RemoteRecipe>.Data.Recipes.Add(res);
-                                MessageNotify.GetInstance.ShowRunLog($"手动下发配方:{recipeName}完成");
+                                MessageNotify.GetInstance.ShowRunLog($"接收手动下发配方:【{recipeName}】");
+                                MessageNotify.GetInstance.ShowUserLog($"手动下发配方:【{recipeName}】完成");
                                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"配方下发完成");
                             }
                             else
diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/SelectRecipesViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/SelectRecipesViewModel.cs
index 88be8341..a223edad 100644
--- a/BPASmartClient.JXJFoodBigStation/ViewModel/SelectRecipesViewModel.cs
+++ b/BPASmartClient.JXJFoodBigStation/ViewModel/SelectRecipesViewModel.cs
@@ -97,7 +97,9 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
         /// </summary>
         public RelayCommand ConfirmCommand { get; set; }
 
-
+        /// <summary>
+        /// 一个配方数据的包装类。
+        /// </summary>
         internal class RecipeDataWithCheck:ObservableObject
         {
             public RecipeData Recipe { get; set; }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index a7a6fbdf..e4ccfa2e 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -1116,7 +1116,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
                             if (index == 8) address = "DB5.DBX0.7";
                             HKDevice.HK_PLC_S7.Write<bool>(address, true);
-                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：true");
+                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：true。");
                         }
                     }
                     else if (o.ToString().Contains("阻挡气缸"))
@@ -1141,43 +1141,48 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             if (index == 14) address = "DB5.DBX3.4";
                             if (index == 15) address = "DB5.DBX3.5";
                             HKDevice.HK_PLC_S7.Write<bool>(address, true);
+                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：true。");
                         }
                     }
                     else if (o.ToString().Contains("进料桶顶升气缸"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX3.6", false);//默认顶升
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：false");
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：false。");
                     }
                     else if (o.ToString().Contains("出料桶顶升气缸1"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX3.7", true);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：true");
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：true。");
                     }
                     else if (o.ToString().Contains("出料桶顶升气缸2"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.0", true);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：true");
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：true。");
                     }
                     else if (o.ToString().Contains("出料桶顶升气缸3"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.1", true);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：true");
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：true。");
                     }
                     else if (o.ToString().Contains("托盘气缸1_1"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.2", false);//默认伸出
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.2，值：false。");
                     }
                     else if (o.ToString().Contains("托盘气缸1_2"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.3", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.3，值：false。");
                     }
                     else if (o.ToString().Contains("托盘气缸2_1"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.4", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.4，值：false。");
                     }
                     else if (o.ToString().Contains("托盘气缸2_2"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.5", false);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.5，值：false。");
                     }
                 }
             }), "ManualOpen", true);//根据下发的配方ID将 托盘的位置信息添加到配方中
@@ -1193,7 +1198,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             string address = "DB5.DBX" + (index / 8) + "." + (index % 8 - 1);
                             if (index == 8) address = "DB5.DBX0.7";
                             HKDevice.HK_PLC_S7.Write<bool>(address, false);
-                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：false");
+                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：false。");
                         }
                     }
                     else if (o.ToString().Contains("阻挡气缸"))
@@ -1218,57 +1223,62 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             if (index == 14) address = "DB5.DBX3.4";
                             if (index == 15) address = "DB5.DBX3.5";
                             HKDevice.HK_PLC_S7.Write<bool>(address, false);
+                            MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：{address}，值：false。");
                         }
                     }
                     else if (o.ToString().Contains("进料桶顶升气缸"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX3.6", true);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：true");
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.6，值：true。");
                     }
                     else if (o.ToString().Contains("出料桶顶升气缸1"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX3.7", false);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：false");
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX3.7，值：false。");
                     }
                     else if (o.ToString().Contains("出料桶顶升气缸2"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.0", false);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：false");
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.0，值：false。");
                     }
                     else if (o.ToString().Contains("出料桶顶升气缸3"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.1", false);
-                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：false");
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.1，值：false。");
                     }
                     else if (o.ToString().Contains("托盘气缸1_1"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.2", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.2，值：true。");
                     }
                     else if (o.ToString().Contains("托盘气缸1_2"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.3", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.3，值：true。");
                     }
                     else if (o.ToString().Contains("托盘气缸2_1"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.4", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.4，值：true。");
                     }
                     else if (o.ToString().Contains("托盘气缸2_2"))
                     {
                         HKDevice.HK_PLC_S7.Write("DB5.DBX4.5", true);
+                        MessageNotify.GetInstance.ShowUserLog($"手动操作气缸,地址：DB5.DBX4.5，值：true。");
                     }
                 }
             }), "ManualClose", true);//根据下发的配方ID将 托盘的位置信息添加到配方中
             //手动控制电机轴 DB5.DBX4.6~DB5.DBX5.2
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", true); }), "StartAxisLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", false); }), "StopAxisLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", true); }), "StartAxisMidCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", false); }), "StopAxisMidCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", true); }), "StartAxisUnLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", false); }), "StopAxisUnLoadCommand", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", true); }), "StartAxis1Command", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", false); }), "StopAxis1Command", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", true); }), "StartAxis2Command", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", false); }), "StopAxis2Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", true); MessageNotify.GetInstance.ShowUserLog($"手动控制电机轴，地址：DB5.DBX4.6，值：true。"); }), "StartAxisLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.6", false); MessageNotify.GetInstance.ShowUserLog($"手动控制电机轴，地址：DB5.DBX4.6，值：false。"); }), "StopAxisLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", true); MessageNotify.GetInstance.ShowUserLog($"手动控制电机轴，地址：DB5.DBX4.7，值：true。"); }), "StartAxisMidCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX4.7", false); MessageNotify.GetInstance.ShowUserLog($"手动控制电机轴，地址：DB5.DBX4.7，值：false。"); }), "StopAxisMidCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", true); MessageNotify.GetInstance.ShowUserLog($"手动控制电机轴，地址：DB5.DBX5.0，值：true。"); }), "StartAxisUnLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.0", false); MessageNotify.GetInstance.ShowUserLog($"手动控制电机轴，地址：DB5.DBX5.0，值：false。"); }), "StopAxisUnLoadCommand", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", true); MessageNotify.GetInstance.ShowUserLog($"手动控制电机轴，地址：DB5.DBX5.1，值：true。"); }), "StartAxis1Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.1", false); MessageNotify.GetInstance.ShowUserLog($"手动控制电机轴，地址：DB5.DBX5.1，值：false。"); }), "StopAxis1Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", true); MessageNotify.GetInstance.ShowUserLog($"手动控制电机轴，地址：DB5.DBX5.2，值：true。"); }), "StartAxis2Command", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", false); MessageNotify.GetInstance.ShowUserLog($"手动控制电机轴，地址：DB5.DBX5.2，值：false。"); }), "StopAxis2Command", true);
 
             //西门子配方处理
             ActionManage.GetInstance.Register(new Action<object>((res) =>
@@ -1382,15 +1392,15 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             }), "LocalSimulationRecipeIssue", true);
 
             //手动控制系统模式
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", true); }), "SystemStart", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", false); }), "SystemStop", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.2", true); }), "SystemPause", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.2", false); }), "SystemReset", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.1", false); }), "SystemAutoMode", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.1", true); }), "SystemDebugMode", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", true); MessageNotify.GetInstance.ShowUserLog($"手动控制系统启动，地址：DB44.DBX0.0，值：true。"); }), "SystemStart", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.0", false); MessageNotify.GetInstance.ShowUserLog($"手动控制系统停止，地址：DB44.DBX0.0，值：false。"); }), "SystemStop", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.2", true); MessageNotify.GetInstance.ShowUserLog($"手动控制系统暂停，地址：DB44.DBX0.2，值：true。"); }), "SystemPause", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.2", false); MessageNotify.GetInstance.ShowUserLog($"手动控制系统复位，地址：DB44.DBX0.2，值：false。"); }), "SystemReset", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.1", false); MessageNotify.GetInstance.ShowUserLog($"手动切换为自动模式，地址：DB44.DBX0.1，值：false。"); }), "SystemAutoMode", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.1", true); MessageNotify.GetInstance.ShowUserLog($"手动切换为手动模式，地址：DB44.DBX0.1，值：true。"); }), "SystemDebugMode", true);
             //流程控制
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.3", true); }), "ManualSystemReset", true);
-            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.4", true); }), "CLearRecipeInfo", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.3", true);}), "ManualSystemReset", true);
+            ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB44.DBX0.4", true);}), "CLearRecipeInfo", true);
             ActionManage.GetInstance.Register(new Action(() =>
             {
                 Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
diff --git a/BPASmartClient.JXJFoodSmallStation/View/HardwareStatusView.xaml b/BPASmartClient.JXJFoodSmallStation/View/HardwareStatusView.xaml
index a23db287..46ea2a00 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/HardwareStatusView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/HardwareStatusView.xaml
@@ -91,7 +91,7 @@
                                         Foreground="#FF0084FF"
                                         Text=" 号仓" />
                                 </StackPanel>
-                                
+
                                 <StackPanel
                                     Grid.Row="1"
                                     Margin="0,70,0,0"
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualCommView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ManualCommView.xaml
index 5763c30c..a874f211 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualCommView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualCommView.xaml
@@ -65,99 +65,115 @@
             Background="#ff0C255F">
 
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="3*"/>
-                <ColumnDefinition Width="4*"/>
-                <ColumnDefinition Width="2*"/>
-                <ColumnDefinition Width="2*"/>
-                <ColumnDefinition Width="2*"/>
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="3*" />
+                <ColumnDefinition Width="4*" />
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="2*" />
             </Grid.ColumnDefinitions>
             <Grid Grid.Column="0">
-                <TextBlock Text="序号"  HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"/>
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="Aqua"
+                    Text="序号" />
                 <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
             </Grid>
-            <TextBlock  Grid.Column="1" Text="地址" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <TextBlock
+                Grid.Column="1"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Foreground="Aqua"
+                Text="地址" />
             <Grid Grid.Column="2">
-                <TextBlock Text="描述"  HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="Aqua"
+                    Text="描述" />
                 <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
             </Grid>
-            <TextBlock Grid.Column="3" Text="当前值" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"  />
+            <TextBlock
+                Grid.Column="3"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Foreground="Aqua"
+                Text="当前值" />
             <Grid Grid.Column="4">
-                <TextBlock  Text="设定值" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
-                <Border BorderThickness="1,0,1,0"  Cursor="SizeWE" />
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="Aqua"
+                    Text="设定值" />
+                <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
             </Grid>
-            <TextBlock Grid.Column="5" Text="功能操作" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" />
+            <TextBlock
+                Grid.Column="5"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Foreground="Aqua"
+                Text="功能操作" />
             <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,0" />
         </Grid>
         <Grid Grid.Row="1">
-            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"  >
-                <ItemsControl ItemsSource="{Binding PlcInfo}" Foreground="Aqua">
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                <ItemsControl Foreground="Aqua" ItemsSource="{Binding PlcInfo}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <Grid Name="gr" >
+                            <Grid Name="gr">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="3*"/>
-                                    <ColumnDefinition Width="4*"/>
-                                    <ColumnDefinition Width="2*"/>
-                                    <ColumnDefinition Width="2*"/>
-                                    <ColumnDefinition Width="2*"/>
+                                    <ColumnDefinition Width="1*" />
+                                    <ColumnDefinition Width="3*" />
+                                    <ColumnDefinition Width="4*" />
+                                    <ColumnDefinition Width="2*" />
+                                    <ColumnDefinition Width="2*" />
+                                    <ColumnDefinition Width="2*" />
                                 </Grid.ColumnDefinitions>
                                 <Grid Grid.Column="0">
                                     <TextBlock
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Text="{Binding SerialNum}" />
-                                    <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                 </Grid>
                                 <TextBlock
                                     Grid.Column="1"
                                     HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                    Text="{Binding Address }" />
+                                    VerticalAlignment="Center"
+                                    Text="{Binding Address}" />
 
                                 <Grid Grid.Column="2">
                                     <TextBlock
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Text="{Binding Describe}" />
-                                    <Border
-                                        BorderThickness="1,0,1,0"
-                                        Cursor="SizeWE" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                 </Grid>
 
                                 <TextBlock
-                                    HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
                                     Grid.Column="3"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
                                     Text="{Binding NowValue}" />
                                 <Grid Grid.Column="4">
-                                    <TextBox
-                                        Text="{Binding SetValue}" />
-                                    <Border
-                                            BorderThickness="1,0,1,0"
-                                            Cursor="SizeWE" />
+                                    <TextBox Text="{Binding SetValue}" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                 </Grid>
                                 <Grid Grid.Column="5">
-                                    <pry:IcoButton 
-                                        Command="{Binding DataContext.SetParCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                        CommandParameter="{Binding Address}"
+                                    <pry:IcoButton
                                         Grid.Column="0"
                                         Margin="40,5,40,5"
+                                        Command="{Binding DataContext.SetParCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding Address}"
                                         Content="设置"
                                         FontSize="20"
                                         Foreground="Aqua"
-                                        Style="{StaticResource IcoButtonStyle}" /> 
-                                    <Border
-                                            BorderThickness="1,0,1,0"
-                                            Cursor="SizeWE" />
+                                        Style="{StaticResource IcoButtonStyle}" />
+                                    <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                 </Grid>
 
-                                <Border
-                                    Grid.ColumnSpan="10"
-                                    BorderThickness="1,0,1,1" />
+                                <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,1" />
 
                             </Grid>
                             <DataTemplate.Triggers>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml
index 3338ebca..d11cb5b8 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RecipeInfosView.xaml
@@ -141,7 +141,7 @@
                         </Grid.RowDefinitions>
                         <Grid Grid.Row="0">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="2*" />
+                                <ColumnDefinition Width="2.5*" />
                                 <ColumnDefinition Width="2*" />
                                 <ColumnDefinition Width="2*" />
                                 <ColumnDefinition Width="2*" />
@@ -189,7 +189,7 @@
                                     <DataTemplate>
                                         <Grid x:Name="grb" Height="25">
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="2*" />
+                                                <ColumnDefinition Width="2.5*" />
                                                 <ColumnDefinition Width="2*" />
                                                 <ColumnDefinition Width="2*" />
                                                 <ColumnDefinition Width="2*" />
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs
index 6d957daf..f4b0ac47 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs
@@ -30,6 +30,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 {
                     Count = Json<DevicePar>.Data.BomMaterial.Count +1 ,
                 });
+                MessageNotify.GetInstance.ShowUserLog("新增一条物料数据。");
             });
             SaveMaterials = new RelayCommand(() =>
             {
@@ -48,14 +49,15 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 {
                     Json<DevicePar>.Data.BomMaterial.Add(new BomMaterial() { Count = Json<DevicePar>.Data.BomMaterial.Count + 1, MaterialCode = item.Key, MaterialName = item.Value });
                 }
+                MessageNotify.GetInstance.ShowUserLog("西门子物料数据拉取了本地数据。");
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"读取程序的Bom清单");
             });
             DeleteAllMaterial = new RelayCommand(() =>
             {
-                if (MessageNotify.GetInstance.ShowDialog("请确认是否删除所有原料数据！") == true)
+                if (MessageNotify.GetInstance.ShowDialog("请确认，是否删除所有原料数据！") == true)
                 {
                     Json<DevicePar>.Data.BomMaterial.Clear();
-                    MessageNotify.GetInstance.ShowUserLog($"西门子物料清单删除完成");
+                    MessageNotify.GetInstance.ShowUserLog($"手动点击西门子物料清单全部清除。");
                 }
             });
             RemoveCommand = new RelayCommand<int>((Count) =>
@@ -65,10 +67,11 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     var res = RawMaterialInfo.FirstOrDefault(p => p.Count == cnt);
                     if (res != null)
                     {
-                        if (MessageNotify.GetInstance.ShowDialog($"请确认是否删除[{res.MaterialCode}]，[{res.MaterialName}]！") == true)
+                        if (MessageNotify.GetInstance.ShowDialog($"请确认是否删除物料编码：【{res.MaterialCode}】，物料名称：【{res.MaterialName}】的信息？") == true)
                         {
                             RawMaterialInfo.Remove(res);
                             NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "成功", $"删除成功");
+                            MessageNotify.GetInstance.ShowUserLog($"删除一条物料数据，物料编码：【{res.MaterialCode}】，物料名称：{res.MaterialName}。");
                         }
                     }
                 }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ChangeDeviceNameViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ChangeDeviceNameViewModel.cs
index 6a22651e..6ad49a2f 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ChangeDeviceNameViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ChangeDeviceNameViewModel.cs
@@ -48,6 +48,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                                     Json<LocaPar>.Data.Recipes.ElementAt(i).RawMaterials.ElementAt(m).RawMaterialName = DeviceName;
                                 }
                             }
+                            MessageNotify.GetInstance.ShowUserLog($"修改设备名称为【{DeviceName}】");
                             ActionManage.GetInstance.Send("ChangeDeviceNameViewClose");
                         }
                     }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceMaterialParViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceMaterialParViewModel.cs
index e00d5083..16e4623d 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceMaterialParViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceMaterialParViewModel.cs
@@ -11,6 +11,7 @@ using Microsoft.Toolkit.Mvvm.Input;
 using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.CustomResource.UserControls;
 using System.Diagnostics;
+using BPASmartClient.CustomResource.Pages.Model;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -23,10 +24,13 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             {
                 var res = deviceParModels.FirstOrDefault(p => p.MaterialName == o?.ToString());
                 if (res != null) deviceParModels.Remove(res);
-                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{o.ToString()}：原料删除成功!");
+                MessageNotify.GetInstance.ShowUserLog($"删除一条味魔方原料参数设置。原料名称：{o.ToString()}");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"原料：【{o.ToString()}】删除成功!");
             });
 
-            AddCommand = new RelayCommand(() => { deviceParModels.Add(new DeviceParMode()); });
+            AddCommand = new RelayCommand(() => { deviceParModels.Add(new DeviceParMode());
+                MessageNotify.GetInstance.ShowUserLog($"新增一条味魔方原料参数设置。");
+            });
             SaveCommand = new RelayCommand(() =>
             {
                 if (deviceParModels == null || deviceParModels.Count <= 0)
@@ -55,6 +59,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 });
                 Json<DevicePar>.Save();
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"原料参数保存成功!");
+                MessageNotify.GetInstance.ShowUserLog("保存味魔法原料参数设置。");
             });
         }
 
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
index 5f35d0e9..0d7db138 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs
@@ -222,6 +222,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             Open = new RelayCommand<object>((o) =>
             {
                 ActionManage.GetInstance.Send("ManualOpen", o);
+
             });
             Close = new RelayCommand<object>((o) =>
             {
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
index 8acdb26e..f42963ee 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs
@@ -201,6 +201,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     Json<LocalRecipeDataColl>.Data.Recipes.ElementAt(index).RawMaterial = RawMaterials;
                     Json<LocalRecipeDataColl>.Data.Recipes.ElementAt(index).WindSend = WindSendRawMaterials;
                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"修改配方完成!");
+                    MessageNotify.GetInstance.ShowUserLog($"修改配方名称：【{RecipeName}】，配方编号：【{RecipeCode}】。");
                 }
                 else
                 {
@@ -229,15 +230,19 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                             });
                         }
                     }
-                    Json<LocalRecipeDataColl>.Data.Recipes.Add(new RemoteRecipeData()
+                    var newRemoteRecipeData = new RemoteRecipeData()
                     {
                         RecipeName = RecipeName,
                         RecipeCode = RecipeCode,
                         TrayCode = TrayNum,
                         RawMaterial = RawMaterials,
                         WindSend = WindSendRawMaterials,
-                    });
+                    };
+                    Json<LocalRecipeDataColl>.Data.Recipes.Add(newRemoteRecipeData);
+                    //新增一条配方应该默认显示出来。
+                    Json<LocalRecipeDataColl>.Data.SelectedRecipes.Add(newRemoteRecipeData);
                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"自定义配方添加完成!");
+                    MessageNotify.GetInstance.ShowUserLog($"添加一个自定义配方，配方名称：【{RecipeName}】，配方编号：【{RecipeCode}】。");
                 }
                 ActionManage.GetInstance.Send("CloseNewRemoteRecipeView");
             });
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewRecipeViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewRecipeViewModel.cs
index e8295899..a0bd5286 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewRecipeViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewRecipeViewModel.cs
@@ -11,6 +11,8 @@ using BPASmartClient.JXJFoodSmallStation.Model;
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.Model;
 using BPASmartClient.JXJFoodSmallStation.Model.RawMaterial;
+using System.Windows.Controls;
+using Renci.SshNet.Messages;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -42,6 +44,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     {
                         RawMaterialId = guid
                     });
+                    MessageNotify.GetInstance.ShowUserLog($"添加一条原料：{guid}");
                 }
                 else goto p;
             });
@@ -51,7 +54,11 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 if (obj is string rm)
                 {
                     var res = RawMaterials.FirstOrDefault(p => p.RawMaterialId == rm);
-                    if (res != null) Global.DeviceRawMaterials.Remove(res);
+                    if (res != null)
+                    {
+                        Global.DeviceRawMaterials.Remove(res);
+                        MessageNotify.GetInstance.ShowUserLog($"删除一条原料，原料名称：【{res.RawMaterialName}】");
+                    }
                 }
             });
 
@@ -98,6 +105,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                         {
                             Json<LocaPar>.Data.Recipes.ElementAt(res).RawMaterials.Add(item);
                         }
+                        MessageNotify.GetInstance.ShowUserLog($"修改了一条配方，配方编号：【{RecipeCode}】");
                     }
                 }
                 ActionManage.GetInstance.Send("CloseNewRecipeView");
@@ -160,6 +168,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 RecipCode = sb.ToString(),
                 RecipeName = RecipeName,
             });
+            MessageNotify.GetInstance.ShowUserLog($"新增了一条配方，配方名称：【{RecipeName}】，配方编号：【{RecipeCode}】");
         }
 
         public string RecipeCode { get { return _mRecipeCode; } set { _mRecipeCode = value; OnPropertyChanged(); } }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
index 0b012811..08ccd6a3 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
@@ -95,7 +95,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                             {
                                 ActionManage.GetInstance.Send("LocalSimulationRecipeIssue", res);
                                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{res.RecipeName}配方下发成功!");
-                                MessageNotify.GetInstance.ShowUserLog($"下发本地模拟配方——{res.RecipeName}");
+                                MessageNotify.GetInstance.ShowUserLog($"下发本地模拟配方，配方名称：【{res.RecipeName}】");
                             }
                             GVL_SmallStation.GetInstance.LatestIssueRecipe=DateTime.Now;
                         }
@@ -144,13 +144,18 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 var res = Array.FindIndex(Json<LocalRecipeDataColl>.Data.Recipes.ToArray(), p => p.RecipeCode == recipeCode);
                 if (res < 0)
                 {
-                    Json<LocalRecipeDataColl>.Data.Recipes.Add(new RemoteRecipeData()
+                    var newRemoteRecipedata = new RemoteRecipeData()
                     {
                         RecipeName = recipeName,
                         RecipeCode = recipeCode,
                         TrayCode = trayCode,
                         RawMaterial = RawMaterials,
-                    });
+                    };
+                    Json<LocalRecipeDataColl>.Data.Recipes.Add(newRemoteRecipedata);
+
+                    //新增了配方之后应该默认显示出来。
+                    Json<LocalRecipeDataColl>.Data.SelectedRecipes.Add(newRemoteRecipedata);
+                    MessageNotify.GetInstance.ShowUserLog("新增一条本地模拟配方。");
                 }
 
             });
@@ -159,6 +164,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 if (MessageNotify.GetInstance.ShowDialog("请确认，是否清除所有本地配方？", DialogType.Warning))
                 {
                     Json<LocalRecipeDataColl>.Data.Recipes.Clear();
+                    Json<LocalRecipeDataColl>.Data.SelectedRecipes.Clear();
                     NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"本地配方清空成功。");
                     MessageNotify.GetInstance.ShowUserLog("手动清除所有本地配方");
                 }
@@ -181,6 +187,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 }
                 //不保存会导致下次打开本地配方下发页面，会重新读取之前存储的文件。
                 Json<LocalRecipeDataColl>.Save();
+                MessageNotify.GetInstance.ShowUserLog("筛选了一次配方。");
             });
         }
 
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs
index 67ede639..f37aa81f 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs
@@ -29,6 +29,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 {
                     var res = RawMaterialInfo.FirstOrDefault(p => p.RawMaterialLocation == pos);
                     if (res != null) RawMaterialInfo.Remove(res);
+                    MessageNotify.GetInstance.ShowUserLog($"删除一条料仓物料配置信息，原料料仓位置：【{res.RawMaterialLocation}】，原料编号：【{res.RawMaterialName}】");
                 }
             });
             SaveRawMaterialPara = new RelayCommand(() => 
@@ -45,6 +46,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             UpdateRawMaterial = new RelayCommand(() =>
             {
                 RawMaterialInfo.Add(new RawMaterialStockBin() { RawMaterialCount = (short)(RawMaterialInfo.Count + 1)});
+                MessageNotify.GetInstance.ShowUserLog($"新增一条料仓物料配置信息。");
             });
         }
         public ObservableCollection<RawMaterialStockBin> RawMaterialInfo { get; set; } = new ObservableCollection<RawMaterialStockBin>();
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs
index 5cc76574..d8a0b763 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs
@@ -14,6 +14,7 @@ using System.Diagnostics;
 using BPASmartClient.JXJFoodSmallStation.Model.WindSend;
 using BPASmartClient.JXJFoodSmallStation.Model.Par;
 using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC;
+using BPASmartClient.CustomResource.Pages.Model;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -46,7 +47,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 Json<DevicePar>.Data.deviceConnectPar.Axis1Speed = Axis1Speed;
                 Json<DevicePar>.Data.deviceConnectPar.Axis2Speed = Axis2Speed;
                 Json<DevicePar>.Save();
-                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"参数保存成功!");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"系统设置参数保存成功!");
+                MessageNotify.GetInstance.ShowUserLog("保存系统设置参数。");
             });
             SetParCommand = new RelayCommand(() =>
             {
@@ -61,7 +63,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                 //ActionManage.GetInstance.Send("AxisUnLoadSpeedSet", AxisUnLoadSpeed);
                 //ActionManage.GetInstance.Send("Axis1SpeedSet", Axis1Speed);
                 //ActionManage.GetInstance.Send("Axis2SpeedSet", Axis2Speed);
-                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"参数设置成功!");
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"电机参数设置成功!");
+                MessageNotify.GetInstance.ShowUserLog("电机设置参数下发成功。");
             });
         }
 
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs
index bcd9a7f0..05cea152 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs
@@ -13,6 +13,7 @@ using BPASmartClient.CustomResource.UserControls;
 using System.Diagnostics;
 using BPASmartClient.JXJFoodSmallStation.Model.WindSend;
 using System.Threading;
+using BPASmartClient.CustomResource.Pages.Model;
 
 namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 {
@@ -34,6 +35,8 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             SaveRawMaterialPara = new RelayCommand(() =>
             {
                 Json<DevicePar>.Save();
+                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"风送料仓原料信息参数保存成功!");
+                MessageNotify.GetInstance.ShowUserLog("风送料仓原料信息参数保存成功。");
             });
         }
 

From 47097ed0960713765e8166b632e38fb76aa155a0 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Tue, 13 Jun 2023 11:02:57 +0800
Subject: [PATCH 94/96] =?UTF-8?q?1.=20=E5=A4=A7=E6=96=99=E7=AB=99=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E3=80=822.=20=E5=B0=8F=E6=96=99=E7=AB=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=98=BE=E7=A4=BA=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/GVL/PlcInfos.cs                     |  22 ++-
 .../Model/GVL/VarCommAttribute.cs             |   6 +
 .../Model/{ => GVL}/VarMonitor.cs             |   0
 .../Model/Par/ConnectParMode.cs               |  26 +++-
 .../Model/Par/LocaPar.cs                      |   7 +-
 .../Model/ProcessControl.cs                   |  78 +++++++---
 .../Model/RawMaterial/AlarmInfo.cs            |   3 +
 .../Model/RawMaterial/DeviceCurrentStatus.cs  |   3 +
 .../Model/Recipe/LocalRecipeDataColl.cs       |   3 +
 .../View/ManualFlowView.xaml                  |  86 +++--------
 .../View/RecipeInfosView.xaml                 |   4 +-
 .../ViewModel/ManualFlowViewModel.cs          |  81 +---------
 BPASmartClient.JXJFoodBigStation/App.xaml.cs  |   7 +
 .../View/BomOfMaterialView.xaml               |   2 +-
 .../View/ManualFlowView.xaml                  |   2 +-
 .../View/ManualFlowView.xaml                  |  20 ++-
 .../View/RobotView.xaml                       | 142 +++++++++++++-----
 .../View/SystemParView.xaml                   |   8 +-
 18 files changed, 275 insertions(+), 225 deletions(-)
 rename BPASmartClient.FoodStationTest/Model/{ => GVL}/VarMonitor.cs (100%)

diff --git a/BPASmartClient.FoodStationTest/Model/GVL/PlcInfos.cs b/BPASmartClient.FoodStationTest/Model/GVL/PlcInfos.cs
index f5ff018d..dd463ec8 100644
--- a/BPASmartClient.FoodStationTest/Model/GVL/PlcInfos.cs
+++ b/BPASmartClient.FoodStationTest/Model/GVL/PlcInfos.cs
@@ -2,19 +2,39 @@
 
 namespace BPASmartClient.FoodStationTest.Model.GVL
 {
+    /// <summary>
+    /// PLC变量信息
+    /// </summary>
     public class PlcInfos : ObservableObject
     {
+        /// <summary>
+        /// 变量序号
+        /// </summary>
         public int Count { get { return _Count; } set { _Count = value; OnPropertyChanged(); } }
         private int _Count { get; set; }
-
+        /// <summary>
+        /// 变量名称
+        /// </summary>
         public string Name { get { return _Name; } set { _Name = value; OnPropertyChanged(); } }
         private string _Name { get; set; }
+        /// <summary>
+        /// 变量地址
+        /// </summary>
         public string Address { get { return _Address; } set { _Address = value; OnPropertyChanged(); } }
         private string _Address { get; set; }
+        /// <summary>
+        /// 变量类型
+        /// </summary>
         public string Type { get { return _Type; } set { _Type = value; OnPropertyChanged(); } }
         private string _Type { get; set; }
+        /// <summary>
+        /// 变量描述
+        /// </summary>
         public string Describe { get { return _Describe; } set { _Describe = value; OnPropertyChanged(); } }
         private string _Describe { get; set; }
+        /// <summary>
+        /// 变量值
+        /// </summary>
         public string Value { get { return _Value; } set { _Value = value; OnPropertyChanged(); } }
         private string _Value { get; set; }
 
diff --git a/BPASmartClient.FoodStationTest/Model/GVL/VarCommAttribute.cs b/BPASmartClient.FoodStationTest/Model/GVL/VarCommAttribute.cs
index 6e43e369..c0bd98f1 100644
--- a/BPASmartClient.FoodStationTest/Model/GVL/VarCommAttribute.cs
+++ b/BPASmartClient.FoodStationTest/Model/GVL/VarCommAttribute.cs
@@ -10,7 +10,13 @@ namespace BPASmartClient.FoodStationTest.Model.GVL
             Address = address;
             Describe = des;
         }
+        /// <summary>
+        /// 变量信息描述。
+        /// </summary>
         public string Describe { get; set; }
+        /// <summary>
+        /// 变量地址
+        /// </summary>
         public string Address { get; set; }
     }
 }
diff --git a/BPASmartClient.FoodStationTest/Model/VarMonitor.cs b/BPASmartClient.FoodStationTest/Model/GVL/VarMonitor.cs
similarity index 100%
rename from BPASmartClient.FoodStationTest/Model/VarMonitor.cs
rename to BPASmartClient.FoodStationTest/Model/GVL/VarMonitor.cs
diff --git a/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs b/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs
index 05580961..70a4b703 100644
--- a/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs
+++ b/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs
@@ -2,23 +2,45 @@
 
 namespace BPASmartClient.FoodStationTest.Model.Par
 {
+    /// <summary>
+    /// 连接参数设置。
+    /// </summary>
     public class ConnectParMode : ObservableObject
     {
-        
+        /// <summary>
+        /// 海科PLC是否连接
+        /// </summary>
         public bool HKPlcConnect { get { return _mHKPlcConnect; } set { _mHKPlcConnect = value; OnPropertyChanged(); } }
         private bool _mHKPlcConnect;
+        /// <summary>
+        /// 是否屏蔽料仓报警
+        /// </summary>
         public bool ShieldStockbinAlarm { get { return _mShieldStockbinAlarm; } set { _mShieldStockbinAlarm = value; OnPropertyChanged(); } }
         private bool _mShieldStockbinAlarm;
 
-
+        /// <summary>
+        /// 进桶侧调速电机速度
+        /// </summary>
         public short AxisLoadSpeed { get { return _mAxisLoadSpeed; } set { _mAxisLoadSpeed = value; OnPropertyChanged(); } }
         private short _mAxisLoadSpeed;
+        /// <summary>
+        /// 过度侧调速电机速度
+        /// </summary>
         public short AxisMidSpeed { get { return _mAxisMidSpeed; } set { _mAxisMidSpeed = value; OnPropertyChanged(); } }
         private short _mAxisMidSpeed;
+        /// <summary>
+        /// 出桶侧调速电机速度
+        /// </summary>
         public short AxisUnLoadSpeed { get { return _mAxisUnLoadSpeed; } set { _mAxisUnLoadSpeed = value; OnPropertyChanged(); } }
         private short _mAxisUnLoadSpeed;
+        /// <summary>
+        /// 进桶侧伺服电机速度
+        /// </summary>
         public float Axis1Speed { get { return _mAxis1Speed; } set { _mAxis1Speed = value; OnPropertyChanged(); } }
         private float _mAxis1Speed;
+        /// <summary>
+        /// 出桶侧伺服电机速度
+        /// </summary>
         public float Axis2Speed { get { return _mAxis2Speed; } set { _mAxis2Speed = value; OnPropertyChanged(); } }
         private float _mAxis2Speed;
     }
diff --git a/BPASmartClient.FoodStationTest/Model/Par/LocaPar.cs b/BPASmartClient.FoodStationTest/Model/Par/LocaPar.cs
index 9728d0d8..19ea4624 100644
--- a/BPASmartClient.FoodStationTest/Model/Par/LocaPar.cs
+++ b/BPASmartClient.FoodStationTest/Model/Par/LocaPar.cs
@@ -4,6 +4,9 @@ namespace BPASmartClient.FoodStationTest.Model
 {
     public class LocalPar
     {
+        /// <summary>
+        /// 本地模拟配方列表。
+        /// </summary>
         public ObservableCollection<RecipeModel> Recipes { get; set; } = new ObservableCollection<RecipeModel>();
 
         /// <summary>
@@ -15,7 +18,9 @@ namespace BPASmartClient.FoodStationTest.Model
         /// 味魔方数量，每个项目应该固定的。
         /// </summary>
         public int RawMaterialDeviceNum { get; } = 6;
-
+        /// <summary>
+        /// 海科PLC的IP地址。
+        /// </summary>
         public string HK_PLC_IP { get; }
     }
 }
diff --git a/BPASmartClient.FoodStationTest/Model/ProcessControl.cs b/BPASmartClient.FoodStationTest/Model/ProcessControl.cs
index 8b7ecaeb..c408a214 100644
--- a/BPASmartClient.FoodStationTest/Model/ProcessControl.cs
+++ b/BPASmartClient.FoodStationTest/Model/ProcessControl.cs
@@ -8,8 +8,8 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Configuration;
 using System.Linq;
+using System.Printing;
 using System.Reflection;
 using System.Threading;
 
@@ -17,31 +17,34 @@ namespace BPASmartClient.FoodStationTest.Model
 {
     public class ProcessControl
     {
-        private volatile static ProcessControl _Instance;
+        private static volatile ProcessControl _Instance;
         public static ProcessControl GetInstance => _Instance ?? (_Instance = new ProcessControl());
-        private ProcessControl() { }
+
+        private ProcessControl()
+        { }
 
         /// <summary>
         /// 配方数据
         /// </summary>
         public ObservableCollection<RemoteRecipeData> RemoteRecipes = new ObservableCollection<RemoteRecipeData>();
+
         /// <summary>
         /// 原料的名称和料仓的位置对应
         /// </summary>
         public Dictionary<string, short> RawMaterialsNamePos = new Dictionary<string, short>();
+
         public ObservableCollection<RawMaterialStockBin> RawMaterialsInfo => Json<DevicePar>.Data.rawMaterialStockBin;
+
         /// <summary>
         /// 配方队列
         /// </summary>
         public ConcurrentQueue<string> RecipeQueueTray1 = new ConcurrentQueue<string>();
 
-
         /// <summary>
         /// 物料集合
         /// </summary>
         public Dictionary<int, ConcurrentQueue<string>> RecipeQueueTray { get; set; } = new Dictionary<int, ConcurrentQueue<string>>();
 
-
         public HKDeviceStatus HKDevice = new HKDeviceStatus();
 
         public ObservableCollection<PlcInfos> CommData { get; set; } = new ObservableCollection<PlcInfos>();
@@ -49,8 +52,7 @@ namespace BPASmartClient.FoodStationTest.Model
 
         public DateTime StockBinAlarmTime = DateTime.Now;
 
-        //public string? HK_PLC_IP = ConfigurationManager.AppSettings["HKPlc_IP"];
-        public string? HK_PLC_IP = Json<LocalPar>.Data.HK_PLC_IP;
+        public string? HK_PLC_IP => Json<LocalPar>.Data.HK_PLC_IP;
 
         public void Init()
         {
@@ -115,6 +117,7 @@ namespace BPASmartClient.FoodStationTest.Model
                 Thread.Sleep(10);
             }), "海科PLC实时数据", true);
         }
+
         /// <summary>
         /// 气缸的传感器值
         /// </summary>
@@ -138,6 +141,7 @@ namespace BPASmartClient.FoodStationTest.Model
             GVL_SmallStation.GetInstance.Cylinder_JackInfo[26] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.4").Content;//托盘2_1气缸
             GVL_SmallStation.GetInstance.Cylinder_JackInfo[27] = HKDevice.HK_PLC_S7.Read<bool>("DB5.DBX4.5").Content;//托盘2_2气缸
         }
+
         /// <summary>
         /// DB块的变量实时值
         /// </summary>
@@ -198,6 +202,7 @@ namespace BPASmartClient.FoodStationTest.Model
                 }
             }
         }
+
         /// <summary>
         /// 小料站和西门子PLC之间的实时数据
         /// </summary>
@@ -235,6 +240,7 @@ namespace BPASmartClient.FoodStationTest.Model
                 GVL_SmallStation.GetInstance.RobotProgramNum = HKDevice.HK_PLC_S7.Read<byte>("DB3.DBB1").Content;
             }
         }
+
         public void CancelOrder()
         {
             if (GVL_SmallStation.GetInstance.Order_Cancel) //订单取消
@@ -289,6 +295,7 @@ namespace BPASmartClient.FoodStationTest.Model
                                 GVL_SmallStation.GetInstance.OrderCancelStep = 3;
                             }
                             break;
+
                         case 2:
                             if (HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX42." + index1).Content)
                             {
@@ -299,10 +306,12 @@ namespace BPASmartClient.FoodStationTest.Model
                                 }
                             }
                             break;
+
                         case 3:
                             // SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", true);
                             GVL_SmallStation.GetInstance.OrderCancelStep = 4;
                             break;
+
                         case 4:
 
                             // SiemensDevice.Siemens_PLC_S7.Write("DB2201.DBX450.1", false);
@@ -310,6 +319,7 @@ namespace BPASmartClient.FoodStationTest.Model
                             MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
 
                             break;
+
                         case 9:
                             App.Current.Dispatcher.Invoke(() =>
                             {
@@ -321,15 +331,18 @@ namespace BPASmartClient.FoodStationTest.Model
                             GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
                             GVL_SmallStation.GetInstance.OrderCancelStep = 0;
                             break;
+
                         case 20:
                             GVL_SmallStation.GetInstance.OrderCancelStep = 21;
                             break;
+
                         case 21:
 
                             GVL_SmallStation.GetInstance.OrderCancelStep = 29;
                             MessageNotify.GetInstance.ShowRunLog($"队列1，西门子取消订单完成，订单号：{code}");
 
                             break;
+
                         case 29:
                             App.Current.Dispatcher.Invoke(() =>
                             {
@@ -345,12 +358,14 @@ namespace BPASmartClient.FoodStationTest.Model
                         case 30:
                             GVL_SmallStation.GetInstance.OrderCancelStep = 31;
                             break;
+
                         case 31:
 
                             GVL_SmallStation.GetInstance.OrderCancelStep = 39;
                             MessageNotify.GetInstance.ShowRunLog($"西门子取消订单完成，订单号：{code}");
 
                             break;
+
                         case 39:
                             GVL_SmallStation.GetInstance.Order_Cancel = false;
                             GVL_SmallStation.GetInstance.Order_CancelRecipeCode = "";
@@ -360,6 +375,7 @@ namespace BPASmartClient.FoodStationTest.Model
                 }
             }
         }
+
         /// <summary>
         /// 将配方添加到配方队列中
         /// </summary>
@@ -376,6 +392,7 @@ namespace BPASmartClient.FoodStationTest.Model
                         {
                             if (GVL_SmallStation.GetInstance.NotUseSmallStation)
                             {
+                                //查询都不包含此配方
                                 if (RecipeQueueTray[i].Count == 0 && !RecipeQueueTray[0].Contains(data.RecipeCode) && !RecipeQueueTray[1].Contains(data.RecipeCode) && !RecipeQueueTray[2].Contains(data.RecipeCode) && !RecipeQueueTray[3].Contains(data.RecipeCode) && !RecipeQueueTray[4].Contains(data.RecipeCode))
                                 {
                                     RecipeQueueTray[i].Enqueue(data.RecipeCode);
@@ -404,8 +421,8 @@ namespace BPASmartClient.FoodStationTest.Model
                 GVL_SmallStation.GetInstance.WindSendDosingStatus = 0;
                 GVL_SmallStation.GetInstance.WindSendDosing = false;
             }
-
         }
+
         /// <summary>
         /// 小料站配料
         /// </summary>
@@ -413,6 +430,7 @@ namespace BPASmartClient.FoodStationTest.Model
         {
             if (!GVL_SmallStation.GetInstance.NotUseSmallStation)
             {
+                //如果使用小料站配料，更新查询5个工位的AGV状态。
                 for (int i = 0; i < 5; i++)
                 {
                     switch (GVL_SmallStation.GetInstance.Tray_AGVLogic[i])
@@ -427,6 +445,7 @@ namespace BPASmartClient.FoodStationTest.Model
                                 MessageNotify.GetInstance.ShowRunLog("AGV到位 发送到位信号给plc");
                             }
                             break;
+
                         case 1:
                             if (GVL_SmallStation.GetInstance.Station1HaveTray)
 
@@ -436,6 +455,7 @@ namespace BPASmartClient.FoodStationTest.Model
                                 MessageNotify.GetInstance.ShowRunLog("托盘1有货架");
                             }
                             break;
+
                         case 2:
                             if (GVL_SmallStation.GetInstance.AGV_GetTray1Finish && GVL_SmallStation.GetInstance.RecipeProcessStatus[i] == 0)
                             {
@@ -445,6 +465,7 @@ namespace BPASmartClient.FoodStationTest.Model
                                 MessageNotify.GetInstance.ShowRunLog("AGV取托盘1完成,发送给海科信号后1s后复位");
                             }
                             break;
+
                         case 3:
                             if (HKDevice.HK_PLC_S7.Read<bool>("DB4.DBX10." + i).Content)
                             {
@@ -455,6 +476,7 @@ namespace BPASmartClient.FoodStationTest.Model
                                 MessageNotify.GetInstance.ShowRunLog("AGV取托盘1完成，信号复位");
                             }
                             break;
+
                         default:
                             break;
                     }
@@ -482,8 +504,6 @@ namespace BPASmartClient.FoodStationTest.Model
                                     var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
                                     if (/*SiemensDevice.IsConnected &&*/ !GVL_SmallStation.GetInstance.IsUseLocalRecipe)
                                     {
-
-
                                         MessageNotify.GetInstance.ShowRunLog($"托盘1，配方{res.RecipeName}，配料完成,数据反馈给西门子");
                                     }
                                     else
@@ -502,10 +522,9 @@ namespace BPASmartClient.FoodStationTest.Model
                             }
                             else
                             {
-                                //粉料仓下发配方
+                                //粉料仓下发配方并配料。
                                 if (/*GVL_SmallStation.GetInstance.IsUseWindSend &&*/ GVL_SmallStation.GetInstance.WindSendDosing == false /*&& GVL_SmallStation.GetInstance.Tray_AGVLogic[recipeNum] == 2*/)
                                 {
-
                                 }
                                 else
                                 {
@@ -516,6 +535,7 @@ namespace BPASmartClient.FoodStationTest.Model
                                     }
                                 }
                             }
+                            //上位机下发配方。并检测下发完成。
                             if (GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] == 0)
                             {
                                 GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] = 0;
@@ -525,6 +545,7 @@ namespace BPASmartClient.FoodStationTest.Model
                                 GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] = 1;
                                 MessageNotify.GetInstance.ShowRunLog($"托盘1,配方编号{code},配方号{recipeNum + 1}，下发完成");
                             }
+                            //需要等待下位机检测确认正确接收到配方。
                             bool recipeReceviceFinish = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX4." + recipeNum).Content;
                             if (recipeReceviceFinish && GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] == 1)
                             {
@@ -533,11 +554,14 @@ namespace BPASmartClient.FoodStationTest.Model
                                 GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] = 0;
                                 MessageNotify.GetInstance.ShowRunLog($"托盘1,配方编号{code},配方号{recipeNum + 1}，配方接收完成");
                             }
+                            //下面是配料流程。
                             if (GVL_SmallStation.GetInstance.RecipeProcessStatus[recipeNum] == 2)
                             {
-                                for (byte i = 1; i < 16; i++)
+                                //下面是味魔方配料。
+                                for (byte i = 1; i <= Json<LocalPar>.Data.RawMaterialDeviceNum; i++)
                                 {
                                     int indexArr = -1;
+                                    //获取配方每个配方的三个桶的位置。
                                     if (GVL_SmallStation.GetInstance.plcReadDataDB3.StockBinAllowIssue[i - 1])
                                     {
                                         switch (recipeNum)
@@ -545,23 +569,29 @@ namespace BPASmartClient.FoodStationTest.Model
                                             case 0:
                                                 indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe1BarrelPosReserve.ToArray(), p => p == i);
                                                 break;
+
                                             case 1:
                                                 indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe2BarrelPosReserve.ToArray(), p => p == i);
                                                 break;
+
                                             case 2:
                                                 indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe3BarrelPosReserve.ToArray(), p => p == i);
                                                 break;
+
                                             case 3:
                                                 indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe4BarrelPosReserve.ToArray(), p => p == i);
                                                 break;
+
                                             case 4:
                                                 indexArr = Array.FindIndex(GVL_SmallStation.GetInstance.plcReadDataDB3.Recipe5BarrelPosReserve.ToArray(), p => p == i);
                                                 break;
                                         }
                                         if (indexArr >= 0 && GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum].Get16bitValue((byte)i) == false)
                                         {
+                                            //查找每个料仓对应的重量。
                                             int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
                                             float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight * 1000;//单位g转换kg
+                                            //小于等于0代表这个料仓不需要配料。
                                             if (weight <= 0)
                                             {
                                                 if (i >= 1 && i <= 8)
@@ -577,6 +607,7 @@ namespace BPASmartClient.FoodStationTest.Model
                                                 GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] = GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum].SetBitValue((byte)i, false);//配料完成设备写成false
                                                 GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] = GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum].SetBitValue((byte)i, true);//配料完成设备写成false
                                             }
+                                            //写入重量并开始配料
                                             else
                                             {
                                                 if (loc_index >= 0)
@@ -597,10 +628,10 @@ namespace BPASmartClient.FoodStationTest.Model
                                         }
                                         if ((DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3) && indexArr >= 0 && GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum].Get16bitValue((byte)i))
                                         {
+                                            //配料完成处理。
                                             int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
                                             if (res < 0)
                                             {
-
                                             }
                                             else
                                             {
@@ -608,10 +639,12 @@ namespace BPASmartClient.FoodStationTest.Model
                                                 RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.NowWeightFeedback;
                                                 bool info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
                                                 MessageNotify.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成,下料完成重量：{RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight}");
+                                                //查找配料完成的味魔方的报警偏差限值。
                                                 float AlarmRange = Math.Abs(RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight - RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).RawMaterialWeight * 1000);
                                                 int iIndex = Array.FindIndex(Json<DevicePar>.Data.deviceParModels.ToArray(), p => p.MaterialName == DeviceInquire.GetInstance.GetDevice(i).DeviceName);
                                                 if (iIndex >= 0)
                                                 {
+                                                    //如果偏差过大则报警。
                                                     if (Math.Abs(Json<DevicePar>.Data.deviceParModels.ElementAt(iIndex).ErrorRange) < AlarmRange)
                                                     {
                                                         HKDevice.HK_PLC_S7.Write("DB44.DBX3.0", true);
@@ -622,6 +655,7 @@ namespace BPASmartClient.FoodStationTest.Model
                                                         });
                                                     }
                                                 }
+                                                //对海科PLC写入味魔方配料完成。
                                                 if (i >= 1 && i <= 8)
                                                 {
                                                     string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX12." + (i - 1), true).IsSuccess.ToString();
@@ -638,10 +672,13 @@ namespace BPASmartClient.FoodStationTest.Model
                                         }
                                     }
                                 }
+                                //配方整体配料完成处理。
                                 bool DosingComple = HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX6." + recipeNum).Content;
                                 if ((RTrig.GetInstance("配方配料完成").Start(DosingComple)) || (GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] > 0 && DosingComple))
                                 {
+                                    //配方制作完成数量+1
                                     GVL_SmallStation.GetInstance.RecipeDosingCompleNum = GVL_SmallStation.GetInstance.RecipeDosingCompleNum + 1;
+
                                     GVL_SmallStation.GetInstance.StockBinDosingIssue[recipeNum] = 0;
                                     if (GVL_SmallStation.GetInstance.RecipeStockBinDosing[recipeNum] > 0)
                                     {
@@ -661,6 +698,7 @@ namespace BPASmartClient.FoodStationTest.Model
                                     }
 
                                     GVL_SmallStation.GetInstance.WindSendDosing = false;
+                                    //移除配方。
                                     App.Current.Dispatcher.Invoke(() =>
                                     {
                                         Json<RemoteRecipeDataColl>.Data.Recipes.Remove(res);
@@ -689,6 +727,7 @@ namespace BPASmartClient.FoodStationTest.Model
                 }
             }
         }
+
         /// <summary>
         /// 料仓的位置和原料名称的对应
         /// </summary>
@@ -706,6 +745,7 @@ namespace BPASmartClient.FoodStationTest.Model
                 }
             }
         }
+
         /// <summary>
         /// PLC的DB3变量列表。初始化PLC读取DB块变量以及流程变量数据。
         /// </summary>
@@ -728,8 +768,6 @@ namespace BPASmartClient.FoodStationTest.Model
                 }
             }
 
-
-
             foreach (PropertyInfo item in typeof(GVL_SmallStation).GetProperties())
             {
                 if (Attribute.IsDefined(item, typeof(VarCommAttribute)))
@@ -747,6 +785,7 @@ namespace BPASmartClient.FoodStationTest.Model
                 }
             }
         }
+
         /// <summary>
         /// 注册需要用到的委托，主要是用于手动控制的。
         /// </summary>
@@ -951,8 +990,6 @@ namespace BPASmartClient.FoodStationTest.Model
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", true); }), "StartAxis2Command", true);
             ActionManage.GetInstance.Register(new Action(() => { HKDevice.HK_PLC_S7.Write<bool>("DB5.DBX5.2", false); }), "StopAxis2Command", true);
 
-
-
             //将本地配方发送到西门子配方里，执行配料
             ActionManage.GetInstance.Register(new Action<Object>((res) =>
             {
@@ -1112,8 +1149,8 @@ namespace BPASmartClient.FoodStationTest.Model
                     HKDevice.HK_PLC_S7.Write("DB4.DBB1", (byte)Value);
                 }
             }), "RobotSetProgramNum", true);
-
         }
+
         /// <summary>
         /// 连接海科PLC，并开启重连线程。
         /// </summary>
@@ -1154,7 +1191,6 @@ namespace BPASmartClient.FoodStationTest.Model
                 {
                 }
 
-
                 Thread.Sleep(50);
             }), "设备连接", true);
         }
@@ -1243,4 +1279,4 @@ namespace BPASmartClient.FoodStationTest.Model
             GVL_SmallStation.GetInstance.RawMaterialsNameCode.TryAdd("0060", "孜然油");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/AlarmInfo.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/AlarmInfo.cs
index e6581741..1fe9b0d7 100644
--- a/BPASmartClient.FoodStationTest/Model/RawMaterial/AlarmInfo.cs
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/AlarmInfo.cs
@@ -2,6 +2,9 @@
 
 namespace BPASmartClient.FoodStationTest.Model
 {
+    /// <summary>
+    /// 料仓报警信息。
+    /// </summary>
     public class AlarmInfo
     {
         /// <summary>
diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceCurrentStatus.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceCurrentStatus.cs
index 0c9f3dab..3185c514 100644
--- a/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceCurrentStatus.cs
+++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceCurrentStatus.cs
@@ -2,6 +2,9 @@
 
 namespace BPASmartClient.FoodStationTest.Model
 {
+    /// <summary>
+    /// 味魔方当前状态。
+    /// </summary>
     public class DeviceCurrentStatus : ObservableObject
     {
 
diff --git a/BPASmartClient.FoodStationTest/Model/Recipe/LocalRecipeDataColl.cs b/BPASmartClient.FoodStationTest/Model/Recipe/LocalRecipeDataColl.cs
index 608fa8c9..fd4f6d76 100644
--- a/BPASmartClient.FoodStationTest/Model/Recipe/LocalRecipeDataColl.cs
+++ b/BPASmartClient.FoodStationTest/Model/Recipe/LocalRecipeDataColl.cs
@@ -2,6 +2,9 @@
 
 namespace BPASmartClient.FoodStationTest.Model
 {
+    /// <summary>
+    /// 本地模拟配方集合。
+    /// </summary>
     internal class LocalRecipeDataColl
     {
         public ObservableCollection<RemoteRecipeData> Recipes { get; set; } = new ObservableCollection<RemoteRecipeData>();
diff --git a/BPASmartClient.FoodStationTest/View/ManualFlowView.xaml b/BPASmartClient.FoodStationTest/View/ManualFlowView.xaml
index 6ab605a5..fb1d5c24 100644
--- a/BPASmartClient.FoodStationTest/View/ManualFlowView.xaml
+++ b/BPASmartClient.FoodStationTest/View/ManualFlowView.xaml
@@ -26,55 +26,6 @@
                 HorizontalAlignment="left"
                 VerticalAlignment="Center"
                 Orientation="Horizontal">
-                <Button
-                    Name="test1"
-                    Width="200"
-                    Height="40"
-                    Margin="5"
-                    Panel.ZIndex="0"
-                    Command="{Binding Test1Command}"
-                    Content="AGV送托盘完成"
-                    FontSize="20"
-                    Style="{StaticResource ImageButtonStyle}"
-                    Visibility="{Binding VisibilityBtn1}" />
-                <Button
-                    Name="test2"
-                    Width="200"
-                    Height="40"
-                    Margin="5"
-                    Panel.ZIndex="0"
-                    Command="{Binding Test2Command}"
-                    Content="粉料仓配料完成"
-                    FontSize="20"
-                    Style="{StaticResource ImageButtonStyle}"
-                    Visibility="{Binding VisibilityBtn2}" />
-                <Button
-                    Name="test3"
-                    Width="200"
-                    Height="40"
-                    Margin="5"
-                    Panel.ZIndex="0"
-                    Command="{Binding Test3Command}"
-                    Content="AGV取托盘完成"
-                    FontSize="20"
-                    Style="{StaticResource ImageButtonStyle}"
-                    Visibility="{Binding VisibilityBtn3}" />
-                <TextBlock
-                    Width="100"
-                    Margin="10"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    FontSize="25"
-                    Foreground="#FF2AB2E7" />
-                <!--<Button
-                    Width="200"
-                    Height="40"
-                    Margin="5"
-                    Panel.ZIndex="0"
-                    Command="{Binding Test5Command}"
-                    Content="粉料仓提升到位"
-                    FontSize="20"
-                    Style="{StaticResource ImageButtonStyle}" />-->
                 <Button
                     Width="200"
                     Height="40"
@@ -151,13 +102,32 @@
                 </Grid.RowDefinitions>
 
                 <StackPanel Grid.Column="1" Orientation="Vertical">
+                    
+                </StackPanel>
+                <WrapPanel Grid.Row="0">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock
+                        Margin="10,0,5,0"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="海科PLC连接状态：" />
+                        <TextBlock
+                        Margin="10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="25"
+                        Foreground="#FF2AB2E7"
+                        Text="{Binding HKPlcIsConnect}" />
+                    </StackPanel>
+                    
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             Margin="10,0,5,0"
                             VerticalAlignment="Center"
                             FontSize="25"
                             Foreground="#FF2AB2E7"
-                            Text="海科plc心跳：" />
+                            Text="海科PLC心跳：" />
                         <TextBlock
                             Margin="10"
                             HorizontalAlignment="Center"
@@ -166,22 +136,6 @@
                             Foreground="#FF2AB2E7"
                             Text="{Binding Heartbeat}" />
                     </StackPanel>
-                </StackPanel>
-                <WrapPanel Grid.Row="0">
-                    
-                    <TextBlock
-                        Margin="10,0,5,0"
-                        VerticalAlignment="Center"
-                        FontSize="25"
-                        Foreground="#FF2AB2E7"
-                        Text="海科plc连接状态：" />
-                    <TextBlock
-                        Margin="10"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        FontSize="25"
-                        Foreground="#FF2AB2E7"
-                        Text="{Binding HKPlcIsConnect}" />
                     
                 </WrapPanel>
                 <WrapPanel Grid.Row="2">
diff --git a/BPASmartClient.FoodStationTest/View/RecipeInfosView.xaml b/BPASmartClient.FoodStationTest/View/RecipeInfosView.xaml
index c8606936..99f18ff9 100644
--- a/BPASmartClient.FoodStationTest/View/RecipeInfosView.xaml
+++ b/BPASmartClient.FoodStationTest/View/RecipeInfosView.xaml
@@ -141,7 +141,7 @@
                         </Grid.RowDefinitions>
                         <Grid Grid.Row="0">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="2*" />
+                                <ColumnDefinition Width="2.5*" />
                                 <ColumnDefinition Width="2*" />
                                 <ColumnDefinition Width="2*" />
                                 <ColumnDefinition Width="2*" />
@@ -189,7 +189,7 @@
                                     <DataTemplate>
                                         <Grid x:Name="grb" Height="25">
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="2*" />
+                                                <ColumnDefinition Width="2.5*" />
                                                 <ColumnDefinition Width="2*" />
                                                 <ColumnDefinition Width="2*" />
                                                 <ColumnDefinition Width="2*" />
diff --git a/BPASmartClient.FoodStationTest/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/ManualFlowViewModel.cs
index 98b54bd6..90a8f320 100644
--- a/BPASmartClient.FoodStationTest/ViewModel/ManualFlowViewModel.cs
+++ b/BPASmartClient.FoodStationTest/ViewModel/ManualFlowViewModel.cs
@@ -20,54 +20,7 @@ namespace BPASmartClient.FoodStationTest.ViewModel
         public ManualFlowViewModel()
         {
             time = GVL_SmallStation.GetInstance.Time;
-            Test1Command = new RelayCommand(() =>
-            {
-                if (DateTime.Now.Subtract(GVL_SmallStation.GetInstance.LatestIssueRecipe).TotalSeconds <= 10)
-                {
-                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "提示", $"最后一次手动下发订单间隔不足10秒，请稍后再点击。");
-                    return;
-                }
-
-                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX8.0", PlcVarType = PlcVarType.Bool, Value = true });
-                //Thread.Sleep(200);
-                //ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX8.0", PlcVarType = PlcVarType.Bool, Value = false });
-                //GVL_SmallStation.GetInstance.AGV_PutTray1Finish = true;
-                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV送托盘完成");
-
-                VisibilityBtn1 = Visibility.Hidden;
-                VisibilityBtn2 = Visibility.Visible;
-                VisibilityBtn3 = Visibility.Hidden;
-                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV送托盘完成");
-
-            });
-
-            Test2Command = new RelayCommand(() =>
-            {
-                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX4.0", PlcVarType = PlcVarType.Bool, Value = true });
-                //Thread.Sleep(200);
-                //ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX4.0", PlcVarType = PlcVarType.Bool, Value = false });
-                //GVL_SmallStation.GetInstance.WindSendDosingComple = true;
-                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，粉料仓配料完成");
-
-                VisibilityBtn1 = Visibility.Hidden;
-                VisibilityBtn2 = Visibility.Hidden;
-                VisibilityBtn3 = Visibility.Visible;
-                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，粉料仓配料完成");
-            });
-            Test3Command = new RelayCommand(() =>
-            {
-                ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX10.0", PlcVarType = PlcVarType.Bool, Value = true });
-                //Thread.Sleep(200);
-                //ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX10.0", PlcVarType = PlcVarType.Bool, Value = false });
-                //GVL_SmallStation.GetInstance.AGV_GetTray1Finish = true;
-                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV取托盘完成");
-
-                VisibilityBtn1 = Visibility.Visible;
-                VisibilityBtn2 = Visibility.Hidden;
-                VisibilityBtn3 = Visibility.Hidden;
-                NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，AGV取托盘完成");
-            });
-
+            
             Test4Command = new RelayCommand(() =>
             {
                 ActionManage.GetInstance.Send("PLCWrite", new HKDeviceWrite() { Address = "DB4.DBX1.5", PlcVarType = PlcVarType.Bool, Value = true });
@@ -75,16 +28,7 @@ namespace BPASmartClient.FoodStationTest.ViewModel
                 MessageNotify.GetInstance.ShowUserLog("手动点击按钮，气缸收紧错位复位");
                 NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"手动点击按钮，气缸收紧错位复位");
             });
-            //Test5Command = new RelayCommand(() =>
-            //{
-            //    GVL_SmallStation.GetInstance.WindSendAllowAGVPutGet = true;
-            //    MessageNotify.GetInstance.ShowUserLog("手动点击按钮，粉料仓提升到位");
-            //});
-            Test6Command = new RelayCommand(() =>
-            {
-                ActionManage.GetInstance.Send("AGVPutTrayFinish");
-                MessageNotify.GetInstance.ShowUserLog("手动点击按钮，AGV放货架流程完成");
-            });
+            
             CLearRecipeInfo = new RelayCommand(() =>
             {
                 App.Current.Dispatcher.Invoke(() =>
@@ -143,12 +87,7 @@ namespace BPASmartClient.FoodStationTest.ViewModel
             });
             StockbinDosingCompleClear = new RelayCommand(() =>
             {
-                //for (int i = 0; i < GVL_SmallStation.GetInstance.StockInDosingComple.Length; i++) 
-                //{
-                //    GVL_SmallStation.GetInstance.StockInDosingComple[i] = false;
-                //}
-                //MessageNotify.GetInstance.ShowUserLog($"手动点击按钮，清除所有手动配料完成信号");
-                //NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"清除所有手动配料完成信号");
+                
             });
             CancelRecipeCommand = new RelayCommand(() =>
             {
@@ -297,12 +236,9 @@ namespace BPASmartClient.FoodStationTest.ViewModel
             });
             HKPlcIsConnect = ProcessControl.GetInstance.HKDevice.IsConnected;
         }
-        public RelayCommand Test1Command { get; set; }
-        public RelayCommand Test2Command { get; set; }
-        public RelayCommand Test3Command { get; set; }
+       
         public RelayCommand Test4Command { get; set; }
-        public RelayCommand Test5Command { get; set; }
-        public RelayCommand Test6Command { get; set; }
+
         public RelayCommand TimeSet { get; set; }
         public RelayCommand CompletedNumResetCommand { get; set; }
         public static bool Heartbeat { get { return _mHeartbeat; } set { _mHeartbeat = value; OnStaticPropertyChanged(); } }
@@ -364,16 +300,9 @@ namespace BPASmartClient.FoodStationTest.ViewModel
         private static int _RecipeDosingCompleNum { get; set; }
         public static int RecipeDosingCompleNum { get { return _RecipeDosingCompleNum; } set { _RecipeDosingCompleNum = value; OnStaticPropertyChanged(); } }
 
-        public static Visibility VisibilityBtn1 { get { return _VisibilityBtn1; } set { _VisibilityBtn1 = value; OnStaticPropertyChanged(); } }
-        private static Visibility _VisibilityBtn1 = Visibility.Visible;
-        public static Visibility VisibilityBtn2 { get { return _VisibilityBtn2; } set { _VisibilityBtn2 = value; OnStaticPropertyChanged(); } }
-        private static Visibility _VisibilityBtn2 = Visibility.Hidden;
-        public static Visibility VisibilityBtn3 { get { return _VisibilityBtn3; } set { _VisibilityBtn3 = value; OnStaticPropertyChanged(); } }
-
         public string CancelRecipeCode { get { return _CancelRecipeCode; } set { _CancelRecipeCode = value; OnPropertyChanged(); } }
         public string _CancelRecipeCode { get; set; }
 
-        private static Visibility _VisibilityBtn3 = Visibility.Hidden;
 
 
     }
diff --git a/BPASmartClient.JXJFoodBigStation/App.xaml.cs b/BPASmartClient.JXJFoodBigStation/App.xaml.cs
index 4dac73f7..d801614e 100644
--- a/BPASmartClient.JXJFoodBigStation/App.xaml.cs
+++ b/BPASmartClient.JXJFoodBigStation/App.xaml.cs
@@ -214,6 +214,13 @@ namespace BPASmartClient.JXJFoodBigStation
                 AssemblyName = "BPASmartClient.CustomResource",
                 ToggleWindowPath = "Pages.View.PasswordChangeView"
             });
+            UserManager.Add(new SubMenumodel()
+            {
+                SubMenuName = "用户管理",
+                SubMenuPermission = new Permission[] { Permission.管理员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.UserManagerView"
+            });
 
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
             {
diff --git a/BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml b/BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml
index 868e00af..1910cdb6 100644
--- a/BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/BomOfMaterialView.xaml
@@ -104,11 +104,11 @@
                                 </Grid>
                                 <Grid Grid.Column="1" Margin="5">
                                     <TextBox
+                                        Width="200"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         HorizontalContentAlignment="Center"
                                         VerticalContentAlignment="Center"
-                                        Width="200"
                                         FontSize="16"
                                         Text="{Binding RawMaterialName}" />
                                 </Grid>
diff --git a/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
index cf489b84..a549cea8 100644
--- a/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/ManualFlowView.xaml
@@ -174,7 +174,7 @@
                         VerticalAlignment="Center"
                         FontSize="25"
                         Foreground="#FF2AB2E7"
-                        Text="plc心跳：" />
+                        Text="PLC心跳：" />
                     <TextBlock
                         Margin="10"
                         HorizontalAlignment="Center"
diff --git a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
index da0223a4..5c1c48cd 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/ManualFlowView.xaml
@@ -108,7 +108,7 @@
                     Content="PLC配方清零"
                     FontSize="20"
                     Style="{StaticResource ImageButtonStyle}" />
-                <WrapPanel Margin="400,0">
+                <WrapPanel Margin="10,0">
                     <TextBlock
                         Margin="10,0,5,0"
                         VerticalAlignment="Center"
@@ -116,8 +116,7 @@
                         Foreground="#FF2AB2E7"
                         Text="订单号：" />
                     <TextBox
-                        Width="300"
-                        Margin="5"
+                        Width="241"
                         VerticalAlignment="Center"
                         FontSize="24"
                         Text="{Binding CancelRecipeCode}" />
@@ -157,7 +156,7 @@
                             VerticalAlignment="Center"
                             FontSize="25"
                             Foreground="#FF2AB2E7"
-                            Text="海科plc心跳：" />
+                            Text="海科PLC心跳：" />
                         <TextBlock
                             Margin="10"
                             HorizontalAlignment="Center"
@@ -173,7 +172,7 @@
                         VerticalAlignment="Center"
                         FontSize="25"
                         Foreground="#FF2AB2E7"
-                        Text="西门子 连接状态：" />
+                        Text="西门子PLC连接状态：" />
                     <TextBlock
                         Margin="10"
                         HorizontalAlignment="Center"
@@ -186,7 +185,7 @@
                         VerticalAlignment="Center"
                         FontSize="25"
                         Foreground="#FF2AB2E7"
-                        Text="海科plc连接状态：" />
+                        Text="海科PLC连接状态：" />
                     <TextBlock
                         Margin="10"
                         HorizontalAlignment="Center"
@@ -199,7 +198,7 @@
                         VerticalAlignment="Center"
                         FontSize="25"
                         Foreground="#FF2AB2E7"
-                        Text="风送plc连接状态：" />
+                        Text="风送PLC连接状态：" />
                     <TextBlock
                         Margin="10"
                         HorizontalAlignment="Center"
@@ -246,9 +245,8 @@
                         Foreground="#FF2AB2E7"
                         Text="ms" />
                     <Button
-                        Width="100"
+                        Width="179"
                         Height="40"
-                        Margin="5,0,5,0"
                         Panel.ZIndex="0"
                         Command="{Binding TimeSet}"
                         Content="设置"
@@ -449,7 +447,7 @@
                         Foreground="#FF2AB2E7"
                         Text="料仓号:" />
                     <TextBox
-                        Width="50"
+                        Width="90"
                         Margin="10"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
@@ -497,7 +495,7 @@
                         Margin="5,0,5,0"
                         Panel.ZIndex="0"
                         Command="{Binding CompletedNumResetCommand}"
-                        Content="完成数目清零"
+                        Content="配方完成数目清零"
                         FontSize="20"
                         Style="{StaticResource ImageButtonStyle}" />
                 </WrapPanel>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
index ce2708f4..74105ca4 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RobotView.xaml
@@ -1,12 +1,14 @@
-<UserControl x:Class="BPASmartClient.JXJFoodSmallStation.View.RobotView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
-             mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920">
+<UserControl
+    x:Class="BPASmartClient.JXJFoodSmallStation.View.RobotView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.JXJFoodSmallStation.ViewModel"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
     <UserControl.Resources>
         <Style x:Key="radioButtonStyle" TargetType="RadioButton">
             <Setter Property="Template">
@@ -45,45 +47,101 @@
         </Style>
     </UserControl.Resources>
     <UserControl.DataContext>
-        <vm:RobotViewModel/>
+        <vm:RobotViewModel />
     </UserControl.DataContext>
 
     <Grid Margin="10">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="4*"/>
-            <ColumnDefinition Width="4*"/>
-            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="4*" />
+            <ColumnDefinition Width="4*" />
+            <ColumnDefinition Width="4*" />
         </Grid.ColumnDefinitions>
         <!--#region 表格标题栏设置-->
         <Grid>
             <StackPanel>
                 <WrapPanel>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="机器人自动运行模式："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsAutoMode}"></TextBlock>
+                    <TextBlock
+                        Margin="5"
+                        FontSize="22"
+                        Foreground="Aqua"
+                        Text="机器人自动运行模式：" />
+                    <TextBlock
+                        Margin="5"
+                        FontSize="22"
+                        Foreground="Aqua"
+                        Text="{Binding RobotIsAutoMode}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人正在自动运行："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsAutoRun}"></TextBlock>
+                    <TextBlock
+                        Margin="5"
+                        FontSize="22"
+                        Foreground="Aqua"
+                        Text="机器人正在自动运行：" />
+                    <TextBlock
+                        Margin="5"
+                        FontSize="22"
+                        Foreground="Aqua"
+                        Text="{Binding RobotIsAutoRun}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人停止状态："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsStop}"></TextBlock>
+                    <TextBlock
+                        Margin="5"
+                        FontSize="22"
+                        Foreground="Aqua"
+                        Text="机器人停止状态：" />
+                    <TextBlock
+                        Margin="49,5"
+                        FontSize="22"
+                        Foreground="Aqua"
+                        Text="{Binding RobotIsStop}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人运行正常："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsRun}"></TextBlock>
+                    <TextBlock
+                        Margin="5"
+                        FontSize="22"
+                        Foreground="Aqua"
+                        Text="机器人运行正常：" />
+                    <TextBlock
+                        Margin="49,5"
+                        FontSize="22"
+                        Foreground="Aqua"
+                        Text="{Binding RobotIsRun}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人运行故障："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsAlarm}"></TextBlock>
+                    <TextBlock
+                        Margin="5"
+                        FontSize="22"
+                        Foreground="Aqua"
+                        Text="机器人运行故障：" />
+                    <TextBlock
+                        Margin="49,5"
+                        FontSize="22"
+                        Foreground="Aqua"
+                        Text="{Binding RobotIsAlarm}" /> 
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人在Home点："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding RobotIsHomed}"></TextBlock>
+                    <TextBlock
+                        Margin="5"
+                        FontSize="22"
+                        Foreground="Aqua"
+                        Text="机器人在Home点：" />
+                    <TextBlock
+                        Margin="30,5"
+                        FontSize="22"
+                        Foreground="Aqua"
+                        Text="{Binding RobotIsHomed}" />
                 </WrapPanel>
                 <WrapPanel>
-                    <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="机器人运行的程序号："></TextBlock>
-                    <TextBlock Margin="5" FontSize="22" Foreground="Aqua" Text="{Binding IsRunProgramNum}"></TextBlock>
+                    <TextBlock
+                        Margin="5"
+                        FontSize="22"
+                        Foreground="Aqua"
+                        Text="机器人运行的程序号：" />
+                    <TextBlock
+                        Margin="5"
+                        FontSize="22"
+                        Foreground="Aqua"
+                        Text="{Binding IsRunProgramNum}" />
                 </WrapPanel>
                 <!--<WrapPanel>
                     <TextBlock Margin="5"  FontSize="22" Foreground="Aqua" Text="抓空桶完成："></TextBlock>
@@ -105,37 +163,37 @@
         </Grid>
         <Grid Grid.Column="1">
             <Grid.RowDefinitions>
-                <RowDefinition Height="1*"></RowDefinition>
-                <RowDefinition Height="7*"></RowDefinition>
+                <RowDefinition Height="1*" />
+                <RowDefinition Height="7*" />
             </Grid.RowDefinitions>
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Button
                     Margin="20,15"
+                    Background="LightGreen"
                     Command="{Binding SystemStart}"
                     Content="启动"
-                    FontSize="40"
-                    Background="LightGreen"></Button>
+                    FontSize="40" />
                 <Button
                     Grid.Column="1"
                     Margin="20,15"
+                    Background="OrangeRed"
                     Command="{Binding SystemStop}"
                     Content="停止"
-                    FontSize="40"
-                    Background="OrangeRed"></Button>
+                    FontSize="40" />
                 <Button
                     Grid.Column="2"
                     Grid.ColumnSpan="2"
                     Margin="20,15"
+                    Background="DodgerBlue"
                     Command="{Binding EStopReset}"
                     Content="急停复位"
-                    FontSize="40"
-                    Background="DodgerBlue"></Button>
+                    FontSize="40" />
             </Grid>
         </Grid>
         <!--<Grid Grid.Column="2">
@@ -190,7 +248,8 @@
                     FontSize="32"
                     Style="{StaticResource ImageButtonStyle}"></Button>
             </Grid>
-            --><!--<ListView
+        -->
+        <!--<ListView
                 Grid.Row="1"
                 Background="Transparent"
                 BorderBrush="#00BEFA"
@@ -264,7 +323,8 @@
                         </Grid>
                     </DataTemplate>
                 </ListView.ItemTemplate>
-            </ListView>--><!--
+            </ListView>-->
+        <!--
             <Grid Grid.Row="1" Visibility="Hidden">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition></ColumnDefinition>
diff --git a/BPASmartClient.JXJFoodSmallStation/View/SystemParView.xaml b/BPASmartClient.JXJFoodSmallStation/View/SystemParView.xaml
index 69d081ed..5e26a85a 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/SystemParView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/SystemParView.xaml
@@ -165,6 +165,7 @@
                 Content="西门子设备连接"
                 FontFamily="楷体"
                 FontSize="20"
+                VerticalContentAlignment="Center"
                 Foreground="Aqua"
                 IsChecked="{Binding SiemensConnect}" />
             <CheckBox
@@ -173,6 +174,7 @@
                 Content="粉料仓设备连接"
                 FontFamily="楷体"
                 FontSize="20"
+                VerticalContentAlignment="Center"
                 Foreground="Aqua"
                 IsChecked="{Binding WindSendConnect}" />
             <CheckBox
@@ -181,6 +183,7 @@
                 Content="小料站产线PLC设备连接"
                 FontFamily="楷体"
                 FontSize="20"
+                VerticalContentAlignment="Center"
                 Foreground="Aqua"
                 IsChecked="{Binding HKPlcConnect}" />
 
@@ -190,6 +193,7 @@
                 VerticalAlignment="Center"
                 Content="屏蔽小料仓数量读取报警"
                 FontFamily="楷体"
+                VerticalContentAlignment="Center"
                 FontSize="20"
                 Foreground="Aqua"
                 IsChecked="{Binding ShieldStockbinAlarm}" />
@@ -276,7 +280,7 @@
                     Text="伺服1速度(进桶侧)" />
                 <TextBox
                     Width="50"
-                    Margin="10"
+                    Margin="33,10"
                     FontSize="16"
                     Text="{Binding Axis1Speed}" />
                 <TextBlock
@@ -295,7 +299,7 @@
                     Text="伺服2速度(出桶侧)" />
                 <TextBox
                     Width="50"
-                    Margin="10"
+                    Margin="33,10"
                     FontSize="16"
                     Text="{Binding Axis2Speed}" />
                 <TextBlock

From 1e426e308bfb14aeae387f58b7a8ee70e4021d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Wed, 14 Jun 2023 09:51:21 +0800
Subject: [PATCH 95/96] 1

---
 DosingSystem/App.xaml.cs            | 2 +-
 DosingSystem/Model/DeviceInquire.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DosingSystem/App.xaml.cs b/DosingSystem/App.xaml.cs
index 11317a5d..9723072e 100644
--- a/DosingSystem/App.xaml.cs
+++ b/DosingSystem/App.xaml.cs
@@ -61,7 +61,7 @@ namespace BPASmartClient.DosingSystem
             BPASmartClient.Helper.SystemHelper.GetInstance.CreateDesktopShortcut();
             MenuInit();
             DataInit();
-            SiemensTest.GetInstance.Init();
+            //SiemensTest.GetInstance.Init();
             DeviceInquire.GetInstance.Init();//配料机设备上线监听，设备列表初始化
             MainView mv = new MainView();
             mv.TitleName = $"味魔方管理系统软件[简称：味魔方] V1.0.1";
diff --git a/DosingSystem/Model/DeviceInquire.cs b/DosingSystem/Model/DeviceInquire.cs
index 8b6902e7..ecb4eeea 100644
--- a/DosingSystem/Model/DeviceInquire.cs
+++ b/DosingSystem/Model/DeviceInquire.cs
@@ -143,7 +143,7 @@ namespace BPASmartClient.DosingSystem
         {
             if (!string.IsNullOrEmpty(Json<DevicePar>.Data.BaseParModel.NetworkSegAddress)) IPSegment = Json<DevicePar>.Data.BaseParModel.NetworkSegAddress;
             else Json<DevicePar>.Data.BaseParModel.NetworkSegAddress = IPSegment;
-            TestData();
+            //TestData();
             IpAddressLines();
             SiemensDevice.GetInstance.Connect(Json<DevicePar>.Data.BaseParModel.DeviceAddress);
             DeviceDataInit();

From b88868d099ec0d3c57b2e959de0fcee5969c2958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Thu, 15 Jun 2023 16:07:14 +0800
Subject: [PATCH 96/96] =?UTF-8?q?=E6=97=85=E6=B8=B8=E5=AD=A6=E9=99=A2?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.TourismCollege/App.xaml        |  42 +++
 BPASmartClient.TourismCollege/App.xaml.cs     | 297 ++++++++++++++++++
 BPASmartClient.TourismCollege/AssemblyInfo.cs |  10 +
 .../BPASmartClient.TourismCollege.csproj      |  24 ++
 BPASmartClient.TourismCollege/GlobalUsing.cs  |  21 ++
 BPASmartClient.Update/MainWindow.xaml         |  29 +-
 SmartClient.sln                               |  23 ++
 7 files changed, 438 insertions(+), 8 deletions(-)
 create mode 100644 BPASmartClient.TourismCollege/App.xaml
 create mode 100644 BPASmartClient.TourismCollege/App.xaml.cs
 create mode 100644 BPASmartClient.TourismCollege/AssemblyInfo.cs
 create mode 100644 BPASmartClient.TourismCollege/BPASmartClient.TourismCollege.csproj
 create mode 100644 BPASmartClient.TourismCollege/GlobalUsing.cs

diff --git a/BPASmartClient.TourismCollege/App.xaml b/BPASmartClient.TourismCollege/App.xaml
new file mode 100644
index 00000000..2a8fc2c4
--- /dev/null
+++ b/BPASmartClient.TourismCollege/App.xaml
@@ -0,0 +1,42 @@
+<Application
+    x:Class="BPASmartClient.TourismCollege.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:con="clr-namespace:BPASmartClient.CustomResource.Converters;assembly=BPASmartClient.CustomResource"
+    xmlns:local="clr-namespace:BPASmartClient.TourismCollege">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecCheckBox.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecTitleBarButton.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/GlobalStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecComboBox.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecIcoButtonStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecToggleButton.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/BeveledRadioButtonStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/DatePickeerDictionary.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecButtonStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/TextBoxStyle.xaml" />
+
+                <ResourceDictionary>
+                    <con:ColorConverter x:Key="ColorConverter" />
+                    <con:TextConverter x:Key="TextConverter" />
+                    <con:VisibleTypeConverter x:Key="VisibleTypeConverter" />
+                    <con:StatusConverter x:Key="StatusConverter" />
+                    <con:StringToIconConverter x:Key="StringToIconConverter" />
+                    <con:BoolToVisibilityConvert x:Key="BoolToVisibilityConvert" />
+                    <con:CountIsVisiableConvert x:Key="CountIsVisiableConvert" />
+                    <con:BoolToFillColorConverter x:Key="BoolToFillColorConverter" />
+                    <con:RecipeStatusConvert x:Key="RecipeStatusConvert" />
+                </ResourceDictionary>
+
+                <ResourceDictionary>
+                    <ImageBrush x:Key="hbl" ImageSource="/BPASmartClient.CustomResource;component/Image/HBL.png" />
+                    <ImageBrush x:Key="dbxt" ImageSource="/BPASmartClient.CustomResource;component/Image/顶部线条.png" />
+                </ResourceDictionary>
+
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/BPASmartClient.TourismCollege/App.xaml.cs b/BPASmartClient.TourismCollege/App.xaml.cs
new file mode 100644
index 00000000..346ddae7
--- /dev/null
+++ b/BPASmartClient.TourismCollege/App.xaml.cs
@@ -0,0 +1,297 @@
+using BPASmartClient.CustomResource.Pages.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace BPASmartClient.TourismCollege
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+        public static Window MainWindow;
+
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            bool createNew;
+            MessageLog.GetInstance.NotifyShow = new Action<string>(o =>
+            {
+                DebugLogViewModel.MessageModels.Add(new MessageModel()
+                {
+                    LogInfo = o,
+                    Forground = System.Windows.Media.Brushes.DeepSkyBlue
+                });
+            });
+            MessageLog.GetInstance.NotifyShowEx = new Action<string>(o =>
+            {
+                DebugLogViewModel.MessageModels.Add(new MessageModel()
+                {
+                    LogInfo = o,
+                    Forground = System.Windows.Media.Brushes.Red
+                });
+            });
+            new EventWaitHandle(false, EventResetMode.AutoReset, "BPASmartClient.TourismCollege", out createNew);
+            if (!createNew)
+            {
+                MessageBox.Show("程序已启动");
+                App.Current.Shutdown();
+                Environment.Exit(0);
+            }
+            base.OnStartup(e);
+            SystemHelper.GetInstance.CreateDesktopShortcut();
+            MenuInit();
+            DataInit();
+            MainView mv = new MainView();
+            mv.TitleName = $"智能炒锅控制系统";
+            LoginView lv = new LoginView();
+            var res = lv.ShowDialog();
+            if (res != null && res == true)
+            {
+                BPASmartClient.CustomResource.Pages.Model.MessageNotify.GetInstance.ShowUserLog("用户登录");
+                mv.Show();
+            }
+            else
+                mv.Close();
+            MainWindow = mv;
+        }
+
+        protected override void OnExit(ExitEventArgs e)
+        {
+            base.OnExit(e);
+            BPASmartClient.CustomResource.Pages.Model.MessageNotify.GetInstance.LogSave();
+            ThreadManage.GetInstance().Dispose();
+        }
+
+        private void MenuInit()
+        {
+            NfcServer.GetInstance.Init();
+
+            #region 配方管理菜单
+            ObservableCollection<SubMenumodel> RecipeManage = new ObservableCollection<SubMenumodel>();
+            RecipeManage.Add(new SubMenumodel()
+            {
+                SubMenuName = "配方管理",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.DosingSystem",
+                ToggleWindowPath = "View.RecipeSettingsView"
+            });
+
+            RecipeManage.Add(new SubMenumodel()
+            {
+                SubMenuName = "配方下发",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.DosingSystem",
+                ToggleWindowPath = "View.RecipeControlView"
+            });
+
+            MenuManage.GetInstance.menuModels.Add(new MenuModel()
+            {
+                MainMenuIcon = "&#xe683;",
+                MainMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                MainMenuName = "配方管理",
+                Alias = "Recipe Management",
+                subMenumodels = RecipeManage,
+            });
+            #endregion
+
+            #region 参数设置
+            ObservableCollection<SubMenumodel> ParSet = new ObservableCollection<SubMenumodel>();
+            ParSet.Add(new SubMenumodel()
+            {
+                SubMenuName = "原料参数设置",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.DosingSystem",
+                ToggleWindowPath = "View.DeviceMaterialParView"
+            });
+
+            ParSet.Add(new SubMenumodel()
+            {
+                SubMenuName = "设备参数设置",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.DosingSystem",
+                ToggleWindowPath = "View.CommParSetView"
+            });
+
+            //ParSet.Add(new SubMenumodel()
+            //{
+            //    SubMenuName = "出料口管理设置",
+            //    SubMenuPermission = new Permission[] { Permission.管理员 },
+            //    AssemblyName = "BPASmartClient.DosingSystem",
+            //    ToggleWindowPath = "View.OutletManagementView"
+            //});
+
+            MenuManage.GetInstance.menuModels.Add(new MenuModel()
+            {
+                MainMenuIcon = "&#xe62d;",
+                MainMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                MainMenuName = "参数设置",
+                Alias = "Parameter Set",
+                subMenumodels = ParSet,
+            });
+            #endregion
+
+            #region 手动控制
+            ObservableCollection<SubMenumodel> ManualControl = new ObservableCollection<SubMenumodel>();
+            ManualControl.Add(new SubMenumodel()
+            {
+                SubMenuName = "气缸手动控制",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.DosingSystem",
+                ToggleWindowPath = "View.ManualControlView"
+            });
+
+            ManualControl.Add(new SubMenumodel()
+            {
+                SubMenuName = "输送带手动控制",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.DosingSystem",
+                ToggleWindowPath = "View.ConveyerBeltManualView"
+            });
+
+            ManualControl.Add(new SubMenumodel()
+            {
+                SubMenuName = "配料输送带控制",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.DosingSystem",
+                ToggleWindowPath = "View.TempManageControlView"
+            });
+
+            //ManualControl.Add(new SubMenumodel()
+            //{
+            //    SubMenuName = "料仓控制",
+            //    SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员 },
+            //    AssemblyName = "BPASmartClient.DosingSystem",
+            //    ToggleWindowPath = "View.StockControlView"
+            //});
+            MenuManage.GetInstance.menuModels.Add(new MenuModel()
+            {
+                MainMenuIcon = "&#xe622;",
+                MainMenuName = "手动控制",
+                MainMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                Alias = "Parameter Set",
+                subMenumodels = ManualControl,
+            });
+            #endregion
+
+            #region 消息日志
+            ObservableCollection<SubMenumodel> InfoLog = new ObservableCollection<SubMenumodel>();
+            InfoLog.Add(new SubMenumodel()
+            {
+                SubMenuName = "操作日志",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.UserLogView"
+            });
+
+            InfoLog.Add(new SubMenumodel()
+            {
+                SubMenuName = "运行日志",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.RunLogView"
+            });
+
+            InfoLog.Add(new SubMenumodel()
+            {
+                SubMenuName = "报警记录",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.AlarmView"
+            });
+
+            InfoLog.Add(new SubMenumodel()
+            {
+                SubMenuName = "调试日志",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.DebugLogView"
+            });
+
+            MenuManage.GetInstance.menuModels.Add(new MenuModel()
+            {
+                MainMenuIcon = "&#xe668;",
+                MainMenuName = "消息日志",
+                MainMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                Alias = "Message Log",
+                subMenumodels = InfoLog,
+            });
+            #endregion
+
+            #region 硬件设备监控
+            ObservableCollection<SubMenumodel> DeviceMonitor = new ObservableCollection<SubMenumodel>();
+            DeviceMonitor.Add(new SubMenumodel()
+            {
+                SubMenuName = "原料设备列表",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.DosingSystem",
+                ToggleWindowPath = "View.DeviceListView"
+            });
+
+            DeviceMonitor.Add(new SubMenumodel()
+            {
+                SubMenuName = "设备状态",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.DosingSystem",
+                ToggleWindowPath = "View.HardwareStatusView"
+            });
+
+            MenuManage.GetInstance.menuModels.Add(new MenuModel()
+            {
+                MainMenuIcon = "&#xe603;",
+                MainMenuName = "设备监控",
+                MainMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                Alias = "Device Monitor",
+                subMenumodels = DeviceMonitor,
+            });
+            #endregion
+
+            #region 用户管理
+            ObservableCollection<SubMenumodel> UserManager = new ObservableCollection<SubMenumodel>();
+            UserManager.Add(new SubMenumodel()
+            {
+                SubMenuName = "用户登录",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.SubPagLoginView"
+            });
+
+            UserManager.Add(new SubMenumodel()
+            {
+                SubMenuName = "密码修改",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.PasswordChangeView"
+            });
+            UserManager.Add(new SubMenumodel()
+            {
+                SubMenuName = "用户管理",
+                SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                AssemblyName = "BPASmartClient.CustomResource",
+                ToggleWindowPath = "Pages.View.UserManagerView"
+            });
+
+            MenuManage.GetInstance.menuModels.Add(new MenuModel()
+            {
+                MainMenuIcon = "&#xe66d;",
+                MainMenuName = "用户管理",
+                MainMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 },
+                Alias = "User Management",
+                subMenumodels = UserManager,
+            });
+            #endregion
+        }
+
+        private void DataInit()
+        {
+
+        }
+
+    }
+}
diff --git a/BPASmartClient.TourismCollege/AssemblyInfo.cs b/BPASmartClient.TourismCollege/AssemblyInfo.cs
new file mode 100644
index 00000000..8b5504ec
--- /dev/null
+++ b/BPASmartClient.TourismCollege/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/BPASmartClient.TourismCollege/BPASmartClient.TourismCollege.csproj b/BPASmartClient.TourismCollege/BPASmartClient.TourismCollege.csproj
new file mode 100644
index 00000000..079995df
--- /dev/null
+++ b/BPASmartClient.TourismCollege/BPASmartClient.TourismCollege.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BPASmartClient.CustomResource\BPASmartClient.CustomResource.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Views\" />
+    <Folder Include="ViewModels\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BPA.Communication" Version="1.0.106" />
+    <PackageReference Include="BPA.Helper" Version="1.0.63" />
+  </ItemGroup>
+
+</Project>
diff --git a/BPASmartClient.TourismCollege/GlobalUsing.cs b/BPASmartClient.TourismCollege/GlobalUsing.cs
new file mode 100644
index 00000000..419dd12c
--- /dev/null
+++ b/BPASmartClient.TourismCollege/GlobalUsing.cs
@@ -0,0 +1,21 @@
+global using System;
+global using System.Collections.Generic;
+global using System.Collections.ObjectModel;
+global using System.Configuration;
+global using System.Data;
+global using System.Linq;
+global using System.Threading;
+global using System.Threading.Tasks;
+global using System.Windows;
+global using System.Diagnostics;
+global using System.IO;
+global using System.Drawing;
+global using System.Windows.Media;
+global using BPA.Helper;
+global using BPA.Communication;
+global using BPASmartClient.CustomResource.Pages.Enums;
+global using BPASmartClient.CustomResource.Pages.Model;
+global using BPASmartClient.CustomResource.Pages.View;
+global using BPASmartClient.CustomResource.Pages.ViewModel;
+
+
diff --git a/BPASmartClient.Update/MainWindow.xaml b/BPASmartClient.Update/MainWindow.xaml
index 004b2e85..0f8afdad 100644
--- a/BPASmartClient.Update/MainWindow.xaml
+++ b/BPASmartClient.Update/MainWindow.xaml
@@ -19,7 +19,7 @@
             <RowDefinition Height="40" />
             <RowDefinition Height="40" />
             <RowDefinition />
-            <RowDefinition Height="80"/>
+            <RowDefinition Height="80" />
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
 
@@ -30,13 +30,26 @@
             Text="{Binding um.UpdateDescription}"
             TextWrapping="Wrap" />
 
-        <Grid Name="grProgressbar" Margin="0 0 0 20"  Grid.Row="3">
+        <Grid
+            Name="grProgressbar"
+            Grid.Row="3"
+            Margin="0,0,0,20">
             <Grid.RowDefinitions>
-                <RowDefinition/>
-                <RowDefinition/>
+                <RowDefinition />
+                <RowDefinition />
             </Grid.RowDefinitions>
-            <TextBlock Name="tb" Text="当前更新进度：1/4" VerticalAlignment="Bottom"/>
-            <ProgressBar Name="progressbar" Grid.Row="1" Height="15" VerticalAlignment="Center" Minimum="0" Maximum="100" Value="10"/>
+            <TextBlock
+                Name="tb"
+                VerticalAlignment="Bottom"
+                Text="当前更新进度：1/4" />
+            <ProgressBar
+                Name="progressbar"
+                Grid.Row="1"
+                Height="15"
+                VerticalAlignment="Center"
+                Maximum="100"
+                Minimum="0"
+                Value="10" />
         </Grid>
 
         <Grid Grid.Row="4">
@@ -49,17 +62,17 @@
                 Grid.Column="0"
                 Width="100"
                 Background="DeepSkyBlue"
-                Click="cancel_Click"
                 BorderThickness="0"
+                Click="cancel_Click"
                 Content="取消更新"
                 Foreground="#272727" />
             <Button
                 Name="ok"
                 Grid.Column="1"
                 Width="100"
-                Click="ok_Click"
                 Background="DeepSkyBlue"
                 BorderThickness="0"
+                Click="ok_Click"
                 Content="开始更新"
                 Foreground="#272727" />
         </Grid>
diff --git a/SmartClient.sln b/SmartClient.sln
index 59658b17..39b4d934 100644
--- a/SmartClient.sln
+++ b/SmartClient.sln
@@ -218,6 +218,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkMV1", "B
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.FoodStationTest", "BPASmartClient.FoodStationTest\BPASmartClient.FoodStationTest.csproj", "{82D5C479-7C38-41D6-8B42-24D4EC32D94F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.TourismCollege", "BPASmartClient.TourismCollege\BPASmartClient.TourismCollege.csproj", "{BD44A67C-4069-4FBC-BDF2-895F286266A6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -2052,6 +2054,26 @@ Global
 		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Release|x64.Build.0 = Release|Any CPU
 		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Release|x86.ActiveCfg = Release|Any CPU
 		{82D5C479-7C38-41D6-8B42-24D4EC32D94F}.Release|x86.Build.0 = Release|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Debug|ARM.Build.0 = Debug|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Debug|x64.Build.0 = Debug|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Debug|x86.Build.0 = Debug|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Release|ARM.ActiveCfg = Release|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Release|ARM.Build.0 = Release|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Release|ARM64.Build.0 = Release|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Release|x64.ActiveCfg = Release|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Release|x64.Build.0 = Release|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Release|x86.ActiveCfg = Release|Any CPU
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2153,6 +2175,7 @@ Global
 		{CB3E9835-2FF2-4A76-A0EE-0819EEC8CAE7} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
 		{2D2200CF-7A66-40EA-998A-F0CE9BC2B3BB} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}
 		{82D5C479-7C38-41D6-8B42-24D4EC32D94F} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
+		{BD44A67C-4069-4FBC-BDF2-895F286266A6} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC}