morkf

BPASmartClient.MorkF/GVL_MorkF.cs

@@ -10,11 +10,6 @@ namespace BPASmartClient.MorkF
 {
     internal class GVL_MorkF
     {
-        /// <summary>
-        /// 小炒菜单集合
-        /// </summary>
-        public List<StirFryGoods> LocalstirFryGoods =new List<StirFryGoods>();
-
         /// <summary>
         /// 小炒队列
         /// </summary>
@@ -24,6 +19,10 @@ namespace BPASmartClient.MorkF
 
         #region 炒锅1
         /// <summary>
+        /// 炒锅是否在工作状态中
+        /// </summary>
+        public bool FryWorking { get; set; }
+        /// <summary>
         /// 炒锅自动模式
         /// </summary>
         public bool AutoMode { get; set; }

BPASmartClient.MorkF/View/DebugView.xaml

@@ -33,9 +33,13 @@
 
                 </Grid.RowDefinitions>
                 <WrapPanel Orientation="Horizontal">
+                    <TextBlock Text="炒锅选择：" Margin="10,0"/>
+                    <ComboBox ItemsSource="{Binding lstFry}" Width="80" Margin="10,0,10,0" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                  SelectedValue="{Binding FryGear}" SelectedIndex="0"/>
+                    <Button Content="设定" Margin="0,0,30,0" Command="{Binding SetFry}"/>
                     <Button Content="炒锅初始化" Command="{Binding PlcInite}" Cursor="Hand" Margin="10,0"/>
-                    <Button Content="炒锅1复位" Command="{Binding Plc1Reset}" Cursor="Hand" Margin="10,0"/>
-                    <TextBlock Text="菜单编号;" Margin="10,0"/>
+                    <Button Content="炒锅复位" Command="{Binding Plc1Reset}" Cursor="Hand" Margin="10,0"/>
+                    <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"/>
@@ -127,7 +131,7 @@
                 </WrapPanel>
             </GroupBox>
 
-            <GroupBox Header="炒锅1" FontSize="15" Foreground="Aqua" VerticalAlignment="Center" Height="140">
+            <GroupBox Header="炒锅" FontSize="15" Foreground="Aqua" VerticalAlignment="Center" Height="140">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="*"/>
@@ -159,7 +163,7 @@
                 </Grid>
 
             </GroupBox>
-            <GroupBox Header="炒锅2" FontSize="15" Foreground="Aqua"  VerticalAlignment="Center" Height="140">
+            <GroupBox Header="炒锅" FontSize="15" Foreground="Aqua"  VerticalAlignment="Center" Height="140">
                 <WrapPanel VerticalAlignment="Top" Margin="0,5,0,0">
                     <Button Content="注油" Command="{Binding SecAddOil}"   Margin="10,0,10,0"></Button>
                     <Button Content="加热关闭" Command="{Binding SecTempTurnOff}"   Margin="10,0,10,0"></Button>

BPASmartClient.MorkF/ViewModel/DebugViewModel.cs

@@ -118,11 +118,15 @@ namespace BPASmartClient.MorkF.ViewModel
         public RelayCommand HBOTGoWork { get; set; }
         public RelayCommand OutMeal { get; set; }
         public RelayCommand SetFire { get; set; }
+        public RelayCommand SetFry { get; set; }
         public RelayCommand SetStir { get; set; }
         public List<int> lstFire { get; set; } = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+        public List<int> lstFry { get; set; } = new List<int>() { 1, 2 };
         public List<int> lstStir { get; set; } = new List<int>() { 1, 2, 3 };
         public int FireGear { get { return _fireGear; } set { _fireGear = value; OnPropertyChanged(); } }
         private int _fireGear;
+        public int FryGear { get { return _fryeGear; } set { _fryeGear = value; OnPropertyChanged(); } }
+        private int _fryeGear;
         public int StirGear { get { return _stirGear; } set { _stirGear = value; OnPropertyChanged(); } }
         private int _stirGear;
         #region 模拟
@@ -193,7 +197,7 @@ namespace BPASmartClient.MorkF.ViewModel
             #endregion
 
             #region 配料仓控制
-            OutMaterials = new RelayCommand(() => { ActionManage.GetInstance.Send("OutMaterials" ,new List<int> { PassagePosition,Weight } ); });
+            OutMaterials = new RelayCommand(() => { ActionManage.GetInstance.Send("OutMaterials" ,new List<int> { PassagePosition + 1,Weight } ); });
             #endregion
 
             #region 炒锅1
@@ -210,6 +214,7 @@ namespace BPASmartClient.MorkF.ViewModel
             OutMeal = new RelayCommand(() => { ActionManage.GetInstance.Send("OutMeal"); });//出餐启动
             SetFire = new RelayCommand(() => { ActionManage.GetInstance.Send("SetFire", new List<int> { FireGear }); });//加热挡位设定
             SetStir = new RelayCommand(() => { ActionManage.GetInstance.Send("SetStir", new List<int> { StirGear }); });//搅拌挡位设定
+            SetFry = new RelayCommand(() => { ActionManage.GetInstance.Send("SetFry", new List<int> { FryGear }); });//炒锅选择
             #endregion
 
             #region 炒锅2